bug fix

server.config.ts

@@ -4,10 +4,10 @@ const server: ServerOptions = {
   proxy: {
     '^/?(api|file)/': {
       // target: 'http://192.168.10.41:8200',
-      // target: 'http://192.168.10.178:8200',
+      target: 'http://192.168.10.178:8200',
       // target: 'http://192.168.10.107: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',
     },
   },

src/assets/styles/element/custom.scss

@@ -171,8 +171,8 @@ button.el-button {
   }
 }
 .preview-clear-mask{
-  width:0;
-  height:0;
+  // width:0;
+  // height:0;
 }
 .no-mask,
 .no-mask .el-overlay-dialog {

src/components/shared/ImagePreview.vue

@@ -1,5 +1,5 @@
 <template>
-  <base-dialog
+  <!-- <base-dialog
     v-if="showDialog"
     v-model="visible"
     less
@@ -12,13 +12,32 @@
     <div class="preview-content" :class="{ 'is-big': isBig }">
       <img v-show="!!url" class="small-img" :src="url" alt="" />
     </div>
-  </base-dialog>
+  </base-dialog> -->
+  <div
+    v-if="visible"
+    v-customDialogResizeImg="resizeKey ? resizeKey : 'can-resize2'"
+    class="preview-custom-dialog"
+    :class="[resizeKey ? resizeKey : 'can-resize2']"
+  >
+    <div class="preview-head">
+      <span>试卷预览</span>
+      <div class="head-btn-box flex justify-center items-center" @click="closeDialog">
+        <el-icon><close /></el-icon>
+      </div>
+    </div>
+    <div class="preview-body">
+      <img v-show="!!url" class="small-img" :src="url" alt="" />
+    </div>
+    <!-- <div class="preview-foot"></div> -->
+  </div>
 </template>
 
 <script setup lang="ts" name="ImagePreview">
-import BaseDialog from '../element/BaseDialog.vue'
+// import BaseDialog from '../element/BaseDialog.vue'
 import useVModel from '@/hooks/useVModel'
 import { ref, watch } from 'vue'
+import { Close } from '@element-plus/icons-vue'
+import { ElIcon } from 'element-plus'
 
 const showDialog = ref(true)
 
@@ -29,6 +48,9 @@ const props = defineProps<{
   resizeKey?: string
 }>()
 const visible = useVModel(props)
+const closeDialog = () => {
+  visible.value = false
+}
 watch(
   () => props.url,
   () => {
@@ -39,53 +61,99 @@ watch(
   }
 )
 </script>
+//
 <style lang="scss">
-.preview-dialog {
+// .preview-dialog {
+//   display: flex;
+//   flex-direction: column;
+//   .el-dialog__body {
+//     flex: 1;
+//     padding: 2px !important;
+//     .preview-content {
+//       width: 100%;
+//       height: 100%;
+//     }
+//   }
+//   .el-dialog__footer {
+//     padding: 0 !important;
+//   }
+// }
+//
+</style>
+<style scoped lang="scss">
+.preview-custom-dialog {
   display: flex;
   flex-direction: column;
-  .el-dialog__body {
-    flex: 1;
-    padding: 2px !important;
-    .preview-content {
-      width: 100%;
-      height: 100%;
+  position: fixed;
+  z-index: 500;
+  // left: 50%;
+  // top: 50%;
+  // transform: translateX(-50%) translateY(-50%);
+  border-radius: 6px;
+  box-shadow: 0px 12px 32px 4px rgba(0, 0, 0, 0.04), 0px 8px 20px rgba(0, 0, 0, 0.08);
+  .preview-head {
+    background-color: #f8f8f8;
+    border-radius: 6px 6px 0 0;
+    color: #333;
+    font-size: 14px;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 10px;
+    position: relative;
+    .head-btn-box {
+      position: absolute;
+      right: 0;
+      top: 0;
+      width: 44px;
+      height: 44px;
+      z-index: 1;
+      cursor: pointer;
+      &:hover {
+        :deep(i) {
+          color: $color--primary;
+        }
+      }
     }
   }
-  .el-dialog__footer {
-    padding: 0 !important;
-  }
-}
-</style>
-<style scoped lang="scss">
-.preview-dialog {
-  // margin-left: 70%;
-  .preview-content {
-    width: 100%;
-    // min-width: 250px;
-    // max-width: 400px;
-    text-align: center;
-    // min-height: 40vh;
-    // max-height: 600px;
-    // max-height: calc(50vh - 50px);
-    // height: 50vh;
-    // width: 300px;
-    overflow: auto;
-    // &.is-big {
-    //   max-width: 50vw;
-    //   height: calc(100vh - 50px);
-    //   img {
-    //     width: auto;
-    //     height: 99%;
-    //   }
-    // }
+  .preview-body {
+    flex: 1;
+    padding: 2px;
     img {
       width: 100%;
-      // height: 100%;
-      // height: calc(50vh - 50px);
-      // width: auto;
       height: auto;
-      object-fit: contain;
     }
   }
 }
+
+// .preview-dialog {
+//   // margin-left: 70%;
+//   .preview-content {
+//     width: 100%;
+//     // min-width: 250px;
+//     // max-width: 400px;
+//     text-align: center;
+//     // min-height: 40vh;
+//     // max-height: 600px;
+//     // max-height: calc(50vh - 50px);
+//     // height: 50vh;
+//     // width: 300px;
+//     overflow: auto;
+//     // &.is-big {
+//     //   max-width: 50vw;
+//     //   height: calc(100vh - 50px);
+//     //   img {
+//     //     width: auto;
+//     //     height: 99%;
+//     //   }
+//     // }
+//     img {
+//       width: 100%;
+//       // height: 100%;
+//       // height: calc(50vh - 50px);
+//       // width: auto;
+//       height: auto;
+//       object-fit: contain;
+//     }
+//   }
+// }
 </style>

src/components/shared/message/Message.vue

@@ -126,9 +126,8 @@ watch(
           return new Date(item.sendTime).getTime()
         })
       )
-
       // let hasRecentSixSecondsMsg = new Date(newMsgs[0].sendTime).getTime() > Date.now() - 6000
-      let hasRecentSixSecondsMsg = newMsgTime > Date.now() - 6000
+      let hasRecentSixSecondsMsg = newMsgTime > Date.now() - 10000
       if (!lastMsgs.messages.length && hasRecentSixSecondsMsg) {
         messageWindowType.value = 'view'
         visibleMessageWindow.value = true

src/directives/customDialogResizeImg.ts

@@ -0,0 +1,303 @@
+function resetPosition(key: any) {
+  const keyboardResize = localStorage.getItem(key)
+  if (keyboardResize) {
+    const obj = JSON.parse(keyboardResize)
+    if (parseInt(obj.left) < 0) {
+      obj.left = 0
+    }
+    if (parseInt(obj.top) < 0) {
+      obj.top = 0
+    }
+    localStorage.setItem(key, JSON.stringify(obj))
+  }
+}
+export const customDialogResizeImg = {
+  mounted(el: any, binding: any, vnode: any) {
+    const bValue = binding.value
+    const localKeyMap: any = {
+      positions: {
+        'can-resize2': 'cet-preview-positions',
+        'can-resize22': 'cet-preview2-positions',
+      },
+      resize: {
+        'can-resize2': 'cet-preview-resize',
+        'can-resize22': 'cet-preview2-resize',
+      },
+    }
+    const resizeEvent = new CustomEvent('drag-resize', {
+      detail: '尺寸变化',
+      bubbles: false,
+    })
+    resetPosition(localKeyMap.positions[bValue])
+
+    const keyboardPositions = localStorage.getItem(localKeyMap.positions[bValue])
+    const keyboardResize = localStorage.getItem(localKeyMap.resize[bValue])
+    // 初始化不最大化
+    el.fullscreen = false
+    // 弹框可拉伸最小宽高
+    const minWidth = 290
+    const maxHeight = window.innerHeight
+    const winHeight = window.innerHeight
+    const winWidth = window.innerWidth
+
+    // 弹窗
+    const dragDom: any = document.querySelector('.' + binding.value)
+    const dialogHeaderEl = dragDom.querySelector('.preview-head')
+    const img = dragDom.querySelector('.small-img')
+    let imgError = false
+    const resizeEl = document.createElement('div')
+
+    if (!img.src) {
+      dragDom.style.width = minWidth + 'px'
+      dragDom.style.height = minWidth + 'px'
+      dragDom.style.left = winWidth / 2 - minWidth / 2
+      dragDom.style.top = winHeight / 2 - minWidth / 2
+    }
+
+    img.onload = function () {
+      // dragDom.style.width = img.clientWidth + 'px'
+      if (!keyboardResize) {
+        const compareHeight = bValue === 'can-resize22' ? parseInt(maxHeight * 0.97 + '') : parseInt(maxHeight / 2 + '')
+        const ratio = (img.clientWidth + 4) / (img.clientHeight + 48)
+        if (img.clientHeight + 48 > compareHeight) {
+          const dragDomH = compareHeight
+          // dragDom.style.height = dragDomH + 'px'
+          dragDom.style.width = dragDomH * ratio + 'px'
+        }
+      }
+      if (!keyboardPositions) {
+        dragDom.style.left = winWidth / 2 - img.clientWidth / 2 + 'px'
+        dragDom.style.top = winHeight / 2 - (img.clientHeight + 44) / 2 + 'px'
+      }
+    }
+    img.onerror = function () {
+      dragDom.style.width = minWidth + 'px'
+      dragDom.style.height = minWidth + 'px'
+      dragDom.style.left = winWidth / 2 - minWidth / 2
+      dragDom.style.top = winHeight / 2 - minWidth / 2
+      imgError = true
+      resizeEl.style.display = 'none'
+    }
+
+    // console.log('img', getComputedStyle(img).width)
+
+    el.style.overflow = 'initial'
+    dragDom.className += ' el-drag-dialog'
+    // 给弹窗加上overflow auto；不然缩小时框内的标签可能超出dialog；
+    // dragDom.style.overflow = 'auto'
+    dragDom.style.background = '#fff'
+
+    if (keyboardPositions && !!img.src) {
+      dragDom.style.left = JSON.parse(keyboardPositions).left || 0
+      dragDom.style.top = JSON.parse(keyboardPositions).top || 0
+    }
+    if (keyboardResize && !!img.src) {
+      const localW = JSON.parse(keyboardResize).width
+      const localH = JSON.parse(keyboardResize).height
+      localW && (dragDom.style.width = localW)
+      localH && (dragDom.style.height = localH)
+      //   dragDom.style.width = JSON.parse(keyboardResize).width || 'auto'
+      //   dragDom.style.height = JSON.parse(keyboardResize).height || 'auto'
+    } else {
+      //   dragDom.style.height = maxHeight / 2 + 'px'
+      // dragDom.style.width = '290px'
+    }
+
+    // 清除选择头部文字效果
+    // eslint-disable-next-line no-new-func
+    dialogHeaderEl.onselectstart = new Function('return false')
+    // 头部加上可拖动cursor
+    dialogHeaderEl.style.cursor = 'move'
+
+    // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
+    const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null)
+
+    // 头部插入最大化最小化元素
+    const maxMin = document.createElement('button')
+    maxMin.className += ' el-dialog__headerbtn el-dialog__minmax'
+    maxMin.style.right = '40px'
+    maxMin.style.color = '#ffffff'
+    maxMin.title = el.fullscreen ? '还原' : '最大化'
+    maxMin.innerHTML =
+      '<i class=' +
+      (el.fullscreen ? '"el-icon-crop"' : '"el-icon-full-screen"') +
+      ' onMouseOver="this.style.color=\'#409EFF\'" onMouseOut="this.style.color=\'inherit\'"></i>'
+    // dialogHeaderEl.insertBefore(maxMin, dialogHeaderEl.childNodes[1])
+    const moveDown = (e: any) => {
+      // 鼠标按下，计算当前元素距离可视区的距离
+      const disX = e.clientX - dialogHeaderEl.offsetLeft
+      const disY = e.clientY - dialogHeaderEl.offsetTop
+
+      // 获取到的值带px 正则匹配替换
+      let styL: any, styT: any
+
+      // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
+      if (sty.left.includes('%')) {
+        styL = +document.body.clientWidth * (+sty.left.replace(/\\%/g, '') / 100)
+        styT = +document.body.clientHeight * (+sty.top.replace(/\\%/g, '') / 100)
+      } else {
+        styL = +sty.left.replace(/\px/g, '')
+        styT = +sty.top.replace(/\px/g, '')
+      }
+
+      document.onmousemove = function (e) {
+        // 通过事件委托，计算移动的距离
+        const l = e.clientX - disX
+        const t = e.clientY - disY
+
+        // 移动当前元素
+        dragDom.style.left = `${
+          l + styL < 0 ? 0 : l + styL > winWidth - dragDom.clientWidth ? winWidth - dragDom.clientWidth : l + styL
+        }px`
+        dragDom.style.top = `${
+          t + styT < 0 ? 0 : t + styT > winHeight - dragDom.clientHeight ? winHeight - dragDom.clientHeight : t + styT
+        }px`
+
+        // 将此时的位置传出去
+        // binding.value({x:e.pageX,y:e.pageY})
+      }
+
+      document.onmouseup = function (e) {
+        document.onmousemove = null
+        document.onmouseup = null
+        console.log('dragDom.style.left:', dragDom.style.left, dragDom.style.top)
+        if (!imgError && !!img.src) {
+          localStorage.setItem(
+            localKeyMap.positions[bValue],
+            JSON.stringify({
+              left: dragDom.style.left || 0,
+              top: dragDom.style.top || 0,
+            })
+          )
+        }
+      }
+    }
+    dialogHeaderEl.onmousedown = moveDown
+    // const bodyHeight = 'auto'
+
+    // function setMaxMin() {
+    //   if (el.fullscreen) {
+    //     const i: any = maxMin.querySelector('.el-icon-crop')
+    //     i.classList.remove('el-icon-crop')
+    //     i.classList.add('el-icon-full-screen')
+    //     maxMin.innerHTML = '<i class="el-icon-full-screen"></i>'
+    //     maxMin.title = '最大化'
+    //     dragDom.style.height = nowHight + 'px'
+    //     dragDom.style.width = nowWidth + 'px'
+    //     dragDom.style.marginTop = window.innerHeight * 0.07 + 'px'
+    //     el.fullscreen = false
+    //     dialogHeaderEl.style.cursor = 'move'
+    //     dialogHeaderEl.onmousedown = moveDown
+    //     dragDom.querySelector('.el-dialog__body').style.height = bodyHeight
+    //     hasSetBodyHight = false
+    //   } else {
+    //     const i: any = maxMin.querySelector('.el-icon-full-screen')
+    //     i.classList.remove('el-icon-full-screen')
+    //     i.classList.add('el-icon-crop')
+    //     maxMin.title = '还原'
+    //     bodyHeight = dragDom.querySelector('.el-dialog__body').offsetHeight + 'px'
+    //     nowHight = dragDom.clientHeight
+    //     nowWidth = dragDom.clientWidth
+    //     nowMarginTop = dragDom.style.marginTop
+    //     dragDom.style.left = 0
+    //     dragDom.style.top = 0
+    //     dragDom.style.height = window.innerHeight + 'px'
+    //     dragDom.style.width = '100VW'
+    //     dragDom.style.marginTop = 0
+    //     el.fullscreen = true
+    //     dialogHeaderEl.style.cursor = 'initial'
+    //     dialogHeaderEl.onmousedown = null
+    //     if (!hasSetBodyHight) {
+    //       const footerHeight =
+    //         dragDom.querySelector('.el-dialog__footer') && dragDom.querySelector('.el-dialog__footer').offsetHeight
+    //       dragDom.querySelector('.el-dialog__body').style.height =
+    //         'calc(100% - ' + (dialogHeaderEl.offsetHeight + footerHeight) + 'px)'
+    //       /*          dragDom.querySelector('.el-dialog__body').style.height =
+    //           window.innerHeight*0.9
+    //            - (dialogHeaderEl.offsetHeight + footerHeight) + 'px'*/
+    //       hasSetBodyHight = true
+    //     }
+    //   }
+    //   el.dispatchEvent(resizeEvent)
+    // }
+
+    // 点击放大缩小效果
+    // maxMin.onclick = setMaxMin
+    // 双击头部效果
+    // dialogHeaderEl.ondblclick = setMaxMin
+    // 拉伸
+    dragDom.appendChild(resizeEl)
+    // 在弹窗右下角加上一个10-10px的控制块
+    resizeEl.style.cursor = 'se-resize'
+    resizeEl.style.position = 'absolute'
+    resizeEl.style.height = '10px'
+    resizeEl.style.width = '10px'
+    resizeEl.style.border = '3px solid transparent'
+    resizeEl.style.borderRightColor = '#333'
+    resizeEl.style.borderBottomColor = '#333'
+    resizeEl.style.right = '0px'
+    resizeEl.style.bottom = '0px'
+    resizeEl.style.zIndex = '99'
+    // 鼠标拉伸弹窗
+    if (!img.src) {
+      resizeEl.style.display = 'none'
+    }
+
+    resizeEl.onmousedown = (e) => {
+      // 记录初始x位置
+      const clientX = e.clientX
+      // 鼠标按下，计算当前元素距离可视区的距离
+      const disX = e.clientX - resizeEl.offsetLeft
+      const disY = e.clientY - resizeEl.offsetTop
+      console.log('2333', resizeEl.offsetLeft, resizeEl.offsetTop, disX, disY)
+
+      let maxWW = 0
+      document.onmousemove = function (e) {
+        e.preventDefault() // 移动时禁用默认事件
+        // 通过事件委托，计算移动的距离
+        // const x = e.clientX - disX + (e.clientX - clientX) // 这里 由于elementUI的dialog控制居中的，所以水平拉伸效果是双倍
+        const x = e.clientX - disX + (e.clientX - clientX) / 5
+        const y = e.clientY - disY
+
+        if (dragDom.clientHeight >= maxHeight && maxWW == 0) {
+          maxWW = dragDom.clientWidth
+        }
+        // 比较是否小于最小宽高
+        if (x > maxWW && maxWW > 0) {
+          return
+        }
+        dragDom.style.width = x > minWidth ? `${x}px` : minWidth + 'px'
+        // if (dragDom.clientHeight >= maxHeight && maxClientY == 0) {
+        //   console.log('到了')
+        //   maxClientY = e.clientY
+        // }
+        // dragDom.style.height = y > minHeight ? `${y}px` : minHeight + 'px'
+        // dragDom.style.width = `${x}px`
+        // dragDom.style.height = `${y}px`
+        // if (!hasSetBodyHight) {
+        //   const footerHeight =
+        //     dragDom.querySelector('.el-dialog__footer') && dragDom.querySelector('.el-dialog__footer').offsetHeight
+        //   dragDom.querySelector('.el-dialog__body').style.height =
+        //     'calc(100% - ' + (dialogHeaderEl.offsetHeight + footerHeight) + 'px)'
+        //   hasSetBodyHight = true
+        // }
+      }
+      // 拉伸结束
+      document.onmouseup = function (e) {
+        document.onmousemove = null
+        document.onmouseup = null
+        if (!imgError && !!img.src) {
+          localStorage.setItem(
+            localKeyMap.resize[bValue],
+            JSON.stringify({
+              width: dragDom.style.width || 'auto',
+              height: dragDom.style.height || 'auto',
+            })
+          )
+        }
+
+        el.dispatchEvent(resizeEvent)
+      }
+    }
+  },
+}

src/directives/index.ts

@@ -1,9 +1,11 @@
 import { dialogResize } from './dialogResize'
 import { dialogResizeImg } from './dialogResizeImg'
 import { dialogResizeStandard } from './dialogResizeStandard'
+import { customDialogResizeImg } from './customDialogResizeImg'
 
 export function setupDirectives(app: any) {
   app.directive('dialogResize', dialogResize)
   app.directive('dialogResizeImg', dialogResizeImg)
+  app.directive('customDialogResizeImg', customDialogResizeImg)
   app.directive('dialogResizeStandard', dialogResizeStandard)
 }

src/hooks/useSetImgBg.ts

@@ -160,23 +160,29 @@ export const useSetImgBg = (option: Ref<SetImgBgOption>, frontColor?: Ref<string
           dataUrl.value = ''
           return
         }
-        initImage({ image: opt.image, frontColor, setFrontColor }).then((image) => {
-          if (!image) return
-          createImageBitmap(image).then((imageBitMap) => {
-            imageWorker.postMessage(
-              {
-                type: 'init',
-                imageBitMap,
-                basePoint: opt.basePoint,
-                enableSharpen: opt.enableSharpen,
-                distance: opt.distance,
-                scale: opt.scale,
-                rotate: opt.rotate,
-              },
-              [imageBitMap]
-            )
+        initImage({ image: opt.image, frontColor, setFrontColor })
+          .then((image) => {
+            if (!image) return
+            createImageBitmap(image).then((imageBitMap) => {
+              imageWorker.postMessage(
+                {
+                  type: 'init',
+                  imageBitMap,
+                  basePoint: opt.basePoint,
+                  enableSharpen: opt.enableSharpen,
+                  distance: opt.distance,
+                  scale: opt.scale,
+                  rotate: opt.rotate,
+                },
+                [imageBitMap]
+              )
+            })
+          })
+          .catch((err: any) => {
+            // drawing.value = false
+            // dataUrl.value = ''
+            console.log('initImage catch err')
           })
-        })
       })
     },
     { immediate: true }

src/modules/analysis/personnel-compare/index.vue

@@ -36,7 +36,9 @@
           :columns="columns2"
           :data="allTableData"
           :height="multipleSelection.length ? 'calc(100vh - 520px)' : 'auto'"
+          highlight-current-row
           @selection-change="handleSelectionChange"
+          @row-dblclick="onDbClick"
         >
         </base-table>
       </div>
@@ -205,27 +207,58 @@ const rowChartOptions = computed(() => {
     return {}
   } else {
     console.log('curRow.value:', curRow.value)
-    const { dateItems } = curRow.value
-    const xData = dateItems.map((v: any) => v.date)
-    const yData = dateItems.map((v: any) => v[dataType.value])
-    return {
-      grid: {
-        left: 60,
-        right: 240,
-        bottom: 40,
-      },
-      tooltip: { show: true, trigger: 'axis' },
-      legend: { show: true },
-      xAxis: {
-        axisLine: { show: false },
-        axisTick: { show: false },
-        splitLine: { show: false },
-        data: xData,
-      },
-      yAxis: {
-        type: 'value',
-      },
-      series: [{ name: dataTypeLabelMap[dataType.value], type: 'line', data: yData }],
+    if (dataType.value !== 'segmentScores') {
+      const { dateItems } = curRow.value
+      const xData = dateItems.map((v: any) => v.date)
+      const yData = dateItems.map((v: any) => v[dataType.value])
+      return {
+        grid: {
+          left: 60,
+          right: 240,
+          bottom: 40,
+        },
+        tooltip: { show: true, trigger: 'axis' },
+        legend: { show: true },
+        xAxis: {
+          axisLine: { show: false },
+          axisTick: { show: false },
+          splitLine: { show: false },
+          data: xData,
+        },
+        yAxis: {
+          type: 'value',
+        },
+        series: [{ name: dataTypeLabelMap[dataType.value], type: 'line', data: yData }],
+      }
+    } else {
+      const { dateItems, segmentScores } = curRow.value
+      const xData = segmentScores.map((v: any) => v.scoreStart)
+
+      return {
+        grid: {
+          left: 60,
+          right: 60,
+          bottom: 40,
+        },
+        tooltip: { show: true, trigger: 'axis' },
+        legend: { show: true },
+        xAxis: {
+          axisLine: { show: false },
+          axisTick: { show: false },
+          splitLine: { show: false },
+          data: xData,
+        },
+        yAxis: {
+          type: 'value',
+        },
+        series: dateItems.map((item: any) => {
+          return {
+            name: item.date,
+            type: 'line',
+            data: item.segmentScores.map((v: any) => v.rate),
+          }
+        }),
+      }
     }
   }
 })
@@ -303,8 +336,17 @@ const multLineChartOptions = computed(() => {
       right: 60,
       bottom: 40,
     },
+    // tooltip: { show: true, trigger: 'axis' },
     legend: {
       show: true,
+      type: 'scroll',
+      animationDurationUpdate: 300,
+      icon: 'circle',
+      itemWidth: 10,
+      itemGap: 20,
+      textStyle: {
+        // color: '#556677'
+      },
     },
     xAxis: {
       axisLine: { show: false },

src/modules/analysis/personnel-statistics/components/StatisticsPersonnel.vue

@@ -274,7 +274,7 @@ watch(tableData, () => {
 })
 
 watch(currentView, () => {
-  if (currentView.value) {
+  if (currentView.value && !!currentView.value.markingGroupNumber) {
     push({
       name: 'AnalysisPersonnelStatisticsMarker',
       query: { markerId: currentView.value.markerId, markerName: currentView.value.markerName },

src/modules/analysis/personnel-statistics/index.vue

@@ -20,14 +20,14 @@
 
 <script setup lang="ts" name="AnalysisPersonnelStatistics">
 /** 人员数据统计 */
-import { computed } from 'vue'
+import { computed, onMounted } from 'vue'
 import { omit } from 'lodash-es'
 import { ElButton } from 'element-plus'
 import BaseForm from '@/components/element/BaseForm.vue'
 import useFetch from '@/hooks/useFetch'
 import useVW from '@/hooks/useVW'
 import useStatisticsFilter from './hooks/useStatisticsFilter'
-
+import useMainStore from '@/store/main'
 import StatisticsGroup from './components/StatisticsGroup.vue'
 import StatisticsPersonnel from './components/StatisticsPersonnel.vue'
 
@@ -35,6 +35,13 @@ import type { ExtractApiResponse } from '@/api/api'
 
 const { model, fetchModel, items, onOptionInit } = useStatisticsFilter()
 
+onMounted(() => {
+  const mainStore = useMainStore()
+  if (mainStore.myUserInfo && mainStore.myUserInfo.role === 'DEPUTY') {
+    model.expand = ['按人员展开']
+  }
+})
+
 const { fetch, result, loading } = useFetch('getStatisticsByGroup')
 
 const data = computed<ExtractApiResponse<'getStatisticsByGroup'>>(() => {

src/modules/marking/mark/index.vue

@@ -67,7 +67,8 @@
     </template>
   </base-dialog>
   <remark-list-modal v-model="remarkModalVisible" @task-change="historyTaskChange"></remark-list-modal>
-  <image-preview v-model="previewModalVisible" :url="currentTask?.url"></image-preview>
+  <!-- <image-preview v-if="currentTask" v-model="previewModalVisible" :url="currentTask?.url"></image-preview> -->
+  <image-preview v-if="currentTask" v-model="previewModalVisible" :url="currentTask?.url"></image-preview>
 </template>
 
 <script setup lang="ts" name="MarkingMark">

src/router/index.ts

@@ -60,13 +60,20 @@ router.beforeEach(async (to, from, next) => {
   const mainStore = useMainStore()
   if (to.name === 'Login') {
     mainStore.setLockScreen(false)
+    next()
+    return
   }
   if (
     !mainStore.myUserInfo &&
     sessionStorage.get('LOGIN_RESULT') &&
     !['Login', 'CheckExam', 'InitCreateExam', 'InitUserName'].includes(String(to.name))
   ) {
-    await mainStore.getMyUserInfo()
+    try {
+      await mainStore.getMyUserInfo()
+    } catch (e) {
+      next({ name: 'Login' })
+      return
+    }
   }
   if (
     sessionStorage.get('LOGIN_RESULT') &&
@@ -75,7 +82,6 @@ router.beforeEach(async (to, from, next) => {
     ) &&
     mainStore.myUserInfo?.passwordWeak
   ) {
-    console.log('to:', to)
     next({ name: 'ChangePassword', query: { redirectPath: encodeURIComponent(to.fullPath) } })
   } else if (to.meta?.auth === false || to.name === 'Login' || sessionStorage.get('LOGIN_RESULT')) {
     next()