Pārlūkot izejas kodu

bug fix 和优化

刘洋 2 gadi atpakaļ
vecāks
revīzija
abe26bf5bb

+ 2 - 54
src/components/shared/ImagePreview.vue

@@ -61,34 +61,13 @@ watch(
   }
 )
 </script>
-//
-<style lang="scss">
-// .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;
   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 {
@@ -118,42 +97,11 @@ watch(
   .preview-body {
     flex: 1;
     padding: 2px;
+    overflow: auto;
     img {
       width: 100%;
       height: auto;
     }
   }
 }
-
-// .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>

+ 1 - 1
src/components/shared/StandardDialog.vue

@@ -8,7 +8,7 @@
     </div>
     <div class="standard-body">
       <div id="my-iframe-mask"></div>
-      <iframe style="width: 100%; height: 100%; prevent-events: pointer" :src="iframeSrc" alt=""></iframe>
+      <iframe v-if="iframeSrc" style="width: 100%; height: 100%; prevent-events: pointer" :src="iframeSrc"></iframe>
     </div>
   </div>
 </template>

+ 16 - 74
src/directives/customDialogResizeImg.ts

@@ -36,6 +36,7 @@ export const customDialogResizeImg = {
     el.fullscreen = false
     // 弹框可拉伸最小宽高
     const minWidth = 290
+    const minHeight = 400
     const maxHeight = window.innerHeight
     const winHeight = window.innerHeight
     const winWidth = window.innerWidth
@@ -57,7 +58,7 @@ export const customDialogResizeImg = {
     img.onload = function () {
       // dragDom.style.width = img.clientWidth + 'px'
       if (!keyboardResize) {
-        const compareHeight = bValue === 'can-resize22' ? parseInt(maxHeight * 0.97 + '') : parseInt(maxHeight / 2 + '')
+        const compareHeight = bValue === 'can-resize22' ? parseInt(maxHeight * 0.9 + '') : parseInt(maxHeight / 2 + '')
         const ratio = (img.clientWidth + 4) / (img.clientHeight + 48)
         if (img.clientHeight + 48 > compareHeight) {
           const dragDomH = compareHeight
@@ -173,58 +174,7 @@ export const customDialogResizeImg = {
       }
     }
     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的控制块
@@ -249,9 +199,8 @@ export const customDialogResizeImg = {
       // 鼠标按下,计算当前元素距离可视区的距离
       const disX = e.clientX - resizeEl.offsetLeft
       const disY = e.clientY - resizeEl.offsetTop
-      console.log('2333', resizeEl.offsetLeft, resizeEl.offsetTop, disX, disY)
 
-      let maxWW = 0
+      // let maxWW = 0
       document.onmousemove = function (e) {
         e.preventDefault() // 移动时禁用默认事件
         // 通过事件委托,计算移动的距离
@@ -259,33 +208,26 @@ export const customDialogResizeImg = {
         const x = e.clientX - disX + (e.clientX - clientX) / 5
         const y = e.clientY - disY
 
-        if (dragDom.clientHeight >= maxHeight && maxWW == 0) {
-          maxWW = dragDom.clientWidth
+        if (dragDom.clientWidth + parseFloat(dragDom.style.left) >= winWidth - 20 && e.clientX > winWidth - 20) {
+        } else {
+          dragDom.style.width = x > minWidth ? `${x}px` : minWidth + 'px'
         }
-        // 比较是否小于最小宽高
-        if (x > maxWW && maxWW > 0) {
-          return
+
+        if (dragDom.clientHeight + parseFloat(dragDom.style.top) >= winHeight - 20 && e.clientY > winHeight - 20) {
+        } else {
+          dragDom.style.height = y > minHeight ? `${y}px` : minHeight + 'px'
         }
-        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 (parseFloat(dragDom.style.width) > winWidth - 20) {
+          dragDom.style.width = winWidth - 20 + 'px'
+        }
+        if (parseFloat(dragDom.style.height) > winHeight - 20) {
+          dragDom.style.height = winHeight - 20 + 'px'
+        }
         if (!imgError && !!img.src) {
           localStorage.setItem(
             localKeyMap.resize[bValue],

+ 303 - 0
src/directives/customDialogResizeImgOld.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 + 'px'
+      dragDom.style.top = winHeight / 2 - minWidth / 2 + 'px'
+      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)
+      }
+    }
+  },
+}

+ 4 - 5
src/hooks/useMarkHeader.ts

@@ -67,7 +67,6 @@ const useMarkHeader = () => {
     bus.emit('showStandard')
   }
   function markKeyBoardEvents(e: any) {
-    console.log('eee', e)
     if (e.key === 'F7') {
       e.preventDefault()
       bus.emit('scale-up')
@@ -122,7 +121,7 @@ const useMarkHeader = () => {
         })
       }
     } else if (e.key == 'Backspace') {
-      if (e.target.tagName === 'INPUT' || e.target.className.includes('contenteditable-ele')) {
+      if (e.target.tagName === 'INPUT' || (e.target.className || '').includes('contenteditable-ele')) {
         return false
       } else {
         bus.emit('mark-prev')
@@ -130,20 +129,20 @@ const useMarkHeader = () => {
     }
   }
   function paperDblClick(e: any) {
-    if ((e.target.className || '').includes('paper-img')) {
+    if (typeof e.target.className === 'string' && (e.target.className || '').includes('paper-img')) {
       bus.emit('scale-up')
     }
   }
   onMounted(() => {
     const route = useRoute()
-    if (route.name === 'MarkingMark') {
+    if (route.path === '/marking/mark') {
       document.addEventListener('keydown', markKeyBoardEvents)
       document.addEventListener('dblclick', paperDblClick)
     }
   })
   onBeforeUnmount(() => {
     const route = useRoute()
-    if (route.name === 'MarkingMark') {
+    if (route.path === '/marking/mark') {
       document.removeEventListener('keydown', markKeyBoardEvents)
       document.removeEventListener('dblclick', paperDblClick)
     }

+ 4 - 2
src/hooks/useOptions.ts

@@ -6,7 +6,7 @@ import type { Ref } from 'vue'
 
 export interface DataModel {
   subject?: string
-  question?: number
+  question?: number | ''
   group?: number
 }
 
@@ -135,13 +135,15 @@ const useOptions = (
         // changeModelValue('question')(void 0)
         // changeModelValue('group')(void 0)
         getMainQuestionList({ subjectCode: dataModel.subject })
+        dataModel.question = ''
       }
     },
     { immediate: true }
   )
 
   watch(
-    [() => dataModel.question, () => dataModel.question],
+    // [() => dataModel.question, () => dataModel.question],
+    [() => dataModel.question],
     () => {
       if (types.includes('group') && dataModel.subject && dataModel.question) {
         // resetGroupList()

+ 18 - 6
src/modules/analysis/marking-progress/components/TotalProgress.vue

@@ -107,7 +107,7 @@ const totalColumns: EpTableColumn<TotalProgress>[] = [
     formatter: getMainName,
     fixed: 'left',
   },
-  { label: '试卷总量', prop: 'totalPaper', align: 'center', sortable: true, minWidth: 95 },
+  { label: '试卷总量', prop: 'totalPaper', align: 'center', sortable: true, minWidth: 90 },
   { label: '已完成', prop: 'finishCount', align: 'center', sortable: true, minWidth: 80 },
   {
     label: '完成比',
@@ -138,9 +138,9 @@ const totalColumns: EpTableColumn<TotalProgress>[] = [
   },
   {
     // label: '预计耗时(分)',
-    label: '耗时',
+    label: '预计耗时',
     align: 'center',
-    minWidth: 150,
+    minWidth: 95,
     prop: 'takeTime',
     // formatter(row) {
     //   // return `${parseFloat((row.takeTime / 60 / 60).toFixed(2))}`
@@ -372,6 +372,18 @@ const getXAxisData = (field: keyof GroupProgress, data?: GroupProgress[]) => {
 
 const groupChartsOption = computed<EChartsOption>(() => {
   return {
+    tooltip: {
+      show: true,
+      trigger: 'item',
+      formatter(params: any) {
+        let prev = params.seriesName + '<br />' + params.name + ': ' + params.value
+        if (params.seriesName === '完成比') {
+          return prev + '%'
+        } else {
+          return prev
+        }
+      },
+    },
     legend: {
       right: 0,
       itemWidth: 14,
@@ -420,8 +432,8 @@ const groupChartsOption = computed<EChartsOption>(() => {
       {
         name: '完成比',
         type: 'bar',
-        barWidth: 80,
-        showBackground: true,
+        barWidth: 20,
+        // showBackground: true,
         barGap: '-200%',
         yAxisIndex: 1,
         itemStyle: {
@@ -438,7 +450,7 @@ const groupChartsOption = computed<EChartsOption>(() => {
 .total-progress-box {
   height: 323px;
   .left-table {
-    width: 50%;
+    width: 62%;
     // flex: 1;
   }
   .total-progress-info {

+ 4 - 1
src/modules/expert/assess/index.vue

@@ -233,9 +233,12 @@ const { fetch: updateMarkScore } = useFetch('updateMarkScore')
 
 const onSubmit = async () => {
   if (currentAssessPaper.value) {
+    const scores = JSON.parse(JSON.stringify(modelScore.value))
+
     await updateMarkScore({ id: currentAssessPaper.value.id, scores: modelScore.value })
-    currentAssessPaper.value.score = add(...modelScore.value)
+    currentAssessPaper.value.score = add(...scores)
     ElMessage.success('修改成功')
+    // onSearch()
   }
 }
 

+ 4 - 1
src/modules/expert/expert/index.vue

@@ -297,9 +297,12 @@ const { fetch: updateMarkScore } = useFetch('updateMarkScore')
 
 const onSubmit = async () => {
   if (currentExpertPaper.value) {
+    const scores = JSON.parse(JSON.stringify(modelScore.value))
+
     await updateMarkScore({ id: currentExpertPaper.value.id, scores: modelScore.value })
-    currentExpertPaper.value.score = add(...modelScore.value)
+    currentExpertPaper.value.score = add(...scores)
     ElMessage.success('修改成功')
+    // onSearch()
   }
 }
 

+ 3 - 2
src/modules/expert/sample/index.vue

@@ -213,10 +213,11 @@ const { fetch: updateMarkScore } = useFetch('updateMarkScore')
 const onSubmit = async () => {
   try {
     if (currentRfPaper.value) {
+      const scores = JSON.parse(JSON.stringify(modelScore.value))
       await updateMarkScore({ id: currentRfPaper.value.id, scores: modelScore.value })
-      // currentRfPaper.value.score = add(...modelScore.value)
+      currentRfPaper.value.score = add(...scores)
       ElMessage.success('修改成功')
-      onSearch()
+      // onSearch()
     }
   } catch (error) {
     console.error(error)

+ 3 - 2
src/modules/marking/arbitration/index.vue

@@ -231,10 +231,11 @@ const { fetch: markArbitrationPaper } = useFetch('markArbitrationPaper')
 
 const onSubmit = async () => {
   if (currentArbitration.value) {
+    const scores = JSON.parse(JSON.stringify(modelScore.value))
     await markArbitrationPaper({ id: currentArbitration.value.id, scores: modelScore.value })
-    // currentArbitration.value.chiefScore = add(...modelScore.value)
+    currentArbitration.value.chiefScore = add(...scores)
     ElMessage.success('修改成功')
-    onSearch()
+    // onSearch()
   }
 }
 

+ 7 - 3
src/modules/marking/inquiry-result/index.vue

@@ -144,7 +144,8 @@ const onSendBack = () => {
 }
 /** 打回成功 */
 const onRejected = () => {
-  onRefresh()
+  // onRefresh()
+  ElMessage.success('打回成功')
 }
 
 /** 给分板 */
@@ -365,9 +366,12 @@ const onConfirmSetExpert = async () => {
 /** 确定给分 */
 const onSubmit = async () => {
   if (current.value) {
+    const scores = JSON.parse(JSON.stringify(modelScore.value))
+
     await useFetch('updateCustomPaperScore').fetch({ taskId: current.value.taskId, scores: modelScore.value })
-    // current.value.headerScore = add(...modelScore.value)
-    onRefresh()
+
+    current.value.headerScore = add(...scores)
+    // onRefresh()
     ElMessage.success('修改成功')
   }
 }

+ 3 - 2
src/modules/marking/problem/index.vue

@@ -271,10 +271,11 @@ const { fetch: markProblemPaper } = useFetch('markProblemPaper')
 
 const onSubmit = async () => {
   if (currentProblem.value) {
+    const scores = JSON.parse(JSON.stringify(modelScore.value))
     await markProblemPaper({ id: currentProblem.value.id, scores: modelScore.value })
-    currentProblem.value.markScore = add(...modelScore.value)
+    currentProblem.value.markScore = add(...scores)
     ElMessage.success('修改成功')
-    onSearch()
+    // onSearch()
   }
 }
 

+ 3 - 2
src/modules/marking/repeat/index.vue

@@ -240,10 +240,11 @@ const { fetch: markReMarkPaper } = useFetch('markReMarkPaper')
 const onSubmit = async () => {
   try {
     if (currentReMarkPaper.value) {
+      const scores = JSON.parse(JSON.stringify(modelScore.value))
       await markReMarkPaper({ id: currentReMarkPaper.value.id, scores: modelScore.value })
-      // currentReMarkPaper.value.markerScore = add(...modelScore.value)
+      currentReMarkPaper.value.markerScore = add(...scores)
       ElMessage.success('修改成功')
-      onSearch()
+      // onSearch()
     }
   } catch (error) {
     console.error(error)

+ 3 - 2
src/modules/monitor/system-check/index.vue

@@ -313,11 +313,12 @@ const { fetch: markSystemSpotPaper } = useFetch('markSystemSpotPaper')
 
 const onSubmit = async () => {
   if (currentSystemCheckPaper.value) {
+    const scores = JSON.parse(JSON.stringify(modelScore.value))
     await markSystemSpotPaper({ id: currentSystemCheckPaper.value.id, scores: modelScore.value })
-    // currentSystemCheckPaper.value.headerScore = add(...modelScore.value)
+    currentSystemCheckPaper.value.headerScore = add(...scores)
     ElMessage.success('修改成功')
     // onSearch()
-    fetchTable()
+    // fetchTable()
   }
 }
 

+ 3 - 2
src/modules/quality/subjective-check/index.vue

@@ -300,10 +300,11 @@ const onSearch = async () => {
 const { fetch: subjectiveCheckMark } = useFetch('subjectiveCheckMark')
 const onSubmit = async () => {
   if (currentSubjectiveCheck.value) {
+    const scores = JSON.parse(JSON.stringify(modelScore.value))
     await subjectiveCheckMark({ taskId: currentSubjectiveCheck.value.taskId, scores: modelScore.value })
-    // currentSubjectiveCheck.value.markScore = add(...modelScore.value)
+    currentSubjectiveCheck.value.markScore = add(...scores)
     ElMessage.success('修改成功')
-    onSearch()
+    // onSearch()
   }
 }