刘洋 1 سال پیش
والد
کامیت
78bd4ad568

+ 2 - 2
server.config.ts

@@ -3,11 +3,11 @@ import type { ServerOptions } from 'vite'
 const server: ServerOptions = {
   proxy: {
     '^/?(api|file)/': {
-      // target: 'http://192.168.10.41:8200',
+      target: 'http://192.168.10.41:8200',
       // target: 'http://192.168.10.178:8200',
       // target: 'http://192.168.10.108:8200',
       // target: 'http://cet-test.markingtool.cn',
-      target: 'http://192.168.10.136:80',
+      // target: 'http://192.168.10.136:80',
       // target: 'http://cet-dev.markingtool.cn:8200',
     },
   },

+ 0 - 31
src/components/shared/message/Message.vue

@@ -14,37 +14,6 @@
         </div>
       </el-tooltip>
     </div>
-    <!-- <el-popover
-      placement="bottom-start"
-      :width="'400px'"
-      :show-arrow="false"
-      :virtual-ref="messageIcon"
-      trigger="click"
-      virtual-triggering
-    >
-      <div class="message-popover-content">
-        <div class="title">最近消息</div>
-        <div class="message-list">
-          <div
-            v-for="message in unReadMessages?.messages?.slice(0, 2)"
-            :key="message.sendUserId"
-            class="message-row"
-            @click="onReceiveMessage(message)"
-          >
-            <div class="send-user truncate">{{ message.sendUserName }}</div>
-            <div class="send-content truncate">{{ transContent(message.content) }}</div>
-          </div>
-        </div>
-        <confirm-button
-          size="small"
-          between
-          ok-text="收消息"
-          cancel-text="发消息"
-          @confirm="onReceiveMessage"
-          @cancel="onSendMessage"
-        ></confirm-button>
-      </div>
-    </el-popover> -->
     <message-window
       v-model="visibleMessageWindow"
       v-model:type="messageWindowType"

+ 2 - 2
src/components/shared/message/MessageSend.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="flex overflow-hidden message-list-modal">
-    <template v-if="!!replyUserId">
+    <!-- <template v-if="!!replyUserId">
       <slot></slot>
-    </template>
+    </template> -->
     <div class="flex direction-column p-base fill-lighter tree-box">
       <el-input v-model="filterText" placeholder="输入评卷员账号或名称筛选" clearable></el-input>
       <div class="flex-1 m-t-base scroll-y-auto">

+ 35 - 10
src/modules/analysis/personnel-statistics/components/RightKeyMenu.vue

@@ -1,13 +1,31 @@
 // right-key-menu.vue
 <template>
   <div ref="rkm" class="right-key-menu">
-    <div class="rightKeyMenuItem" @click="emits('onSetWorkload', unref(curRow))">设置工作量</div>
-    <div class="rightKeyMenuItem" @click="emits('onSendMessage', unref(curRow))">发送消息</div>
-    <div class="rightKeyMenuItem" @click="emits('onShowScoreLines', curRow)">分数分布曲线</div>
+    <div
+      class="rightKeyMenuItem"
+      :class="{ disabled: !curRow.markerId }"
+      @click="curRow?.markerId && emits('onSetWorkload', unref(curRow))"
+    >
+      设置工作量
+    </div>
+    <div
+      class="rightKeyMenuItem"
+      :class="{ disabled: !curRow.markerId }"
+      @click="curRow?.markerId && emits('onSendMessage', unref(curRow))"
+    >
+      发送消息
+    </div>
+    <div
+      class="rightKeyMenuItem"
+      :class="{ disabled: !curRow.markerId }"
+      @click="curRow?.markerId && emits('onShowScoreLines', curRow)"
+    >
+      分数分布曲线
+    </div>
     <div
       v-if="curRow.markingStatus === '正评'"
       class="rightKeyMenuItem"
-      @click="emits('forceAssessment', unref(curRow))"
+      @click="curRow?.markerId && emits('forceAssessment', unref(curRow))"
     >
       强制考核分发
     </div>
@@ -41,7 +59,7 @@ defineExpose({
   onload,
 })
 </script>
-<style scoped>
+<style scoped lang="scss">
 .right-key-menu {
   display: block;
   line-height: 30px;
@@ -74,11 +92,18 @@ defineExpose({
 }
 .rightKeyMenuItem {
   padding: 5px 20px;
+  &.disabled {
+    cursor: not-allowed;
+    color: #999;
+  }
 }
-.rightKeyMenuItem:hover {
-  cursor: pointer;
-  background: #0091ff;
-  /* border-color: #66b1ff; */
-  color: #fff;
+.rightKeyMenuItem {
+  &:not(.disabled) {
+    &:hover {
+      cursor: pointer;
+      background: #0091ff;
+      color: #fff;
+    }
+  }
 }
 </style>