bug fix和优化

server.config.ts

@@ -3,9 +3,9 @@ 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.107:8200',
-      target: 'http://cet-test.markingtool.cn',
+      // target: 'http://cet-test.markingtool.cn',
       // target: 'http://cet-dev.markingtool.cn:8200',
     },
   },

src/assets/styles/element/custom.scss

@@ -190,3 +190,48 @@ button.el-button {
 .el-message__badge {
   display: none;
 }
+
+
+
+.el-table__border-left-patch{
+  background-color:#ddd !important;
+}
+.el-table--border:after, .el-table--border:before, .el-table--border .el-table__inner-wrapper:after, .el-table__inner-wrapper:before{
+  background-color: #ddd !important;
+}
+.el-table th.el-table__cell.is-leaf, .el-table td.el-table__cell{
+  border-bottom:1px solid #ddd !important;
+  border-right:1px solid #ddd !important;
+}
+.el-table--group .el-table__inner-wrapper tr:first-child td:first-child, .el-table--group .el-table__inner-wrapper tr:first-child th:first-child, .el-table--group .el-table__footer-wrapper tr:first-child td:first-child, .el-table--group .el-table__footer-wrapper tr:first-child th:first-child, .el-table--border .el-table__inner-wrapper tr:first-child td:first-child, .el-table--border .el-table__inner-wrapper tr:first-child th:first-child, .el-table--border .el-table__footer-wrapper tr:first-child td:first-child, .el-table--border .el-table__footer-wrapper tr:first-child th:first-child{
+  border-left:1px solid #ddd !important;
+}
+.el-input__wrapper{
+  box-shadow: 0 0 0 1px #ddd inset !important;
+}
+
+.el-table__body tr.current-row > td.el-table__cell{
+  background-color: #A1D6FF !important;
+}
+
+
+
+// .el-table--border, .el-table--group {
+//   border: 1px solid red!important;
+// }
+// /**
+// 改变表格内竖线颜色
+// */
+// .el-table--border  td, .el-table--border th, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
+//   border-right: 1px solid #ddd!important;
+// }
+// /**
+// 改变表格内行线颜色
+// */
+// .el-table  td, .el-table th.is-leaf  {
+//   border-bottom: 1px solid #ddd!important;
+// }
+
+// .el-table thead tr th{
+//   border-color: #8c939d;
+// }

src/modules/admin-user/manage/index.vue

@@ -3,6 +3,7 @@
     <div
       class="flex items-center p-l-base p-r-base p-t-medium-base fill-blank filter-form"
       :class="{ 'is-expand': expand }"
+      style="padding-bottom: 10px"
     >
       <base-form
         ref="formRef"
@@ -232,5 +233,8 @@ onSearch()
       transform: rotate(90deg);
     }
   }
+  :deep(.el-form-item--small) {
+    margin-bottom: 10px;
+  }
 }
 </style>

src/modules/analysis/monitoring/index.vue

@@ -355,7 +355,7 @@ watch([interval, initFinish], () => {
   .data-card-view {
     // width: 1118px;
     width: calc(((100% - 40px) / 5) * 4 + 30px);
-    height: 100%;
+    height: 706px;
     flex-wrap: wrap;
     align-content: flex-start;
     display: flex;
@@ -363,10 +363,11 @@ watch([interval, initFinish], () => {
     .data-card {
       // width: 272px;
       width: calc((100% - 30px) / 4);
-      height: 337px;
+      height: 348px;
       padding-top: 2px;
       &.active {
         background-color: #32c5ff;
+        box-shadow: 0px 16px 16px 0px rgba(0, 0, 0, 0.1);
       }
       &:nth-child(n + 5) {
         margin-top: $ExtraSmallGapSpace;
@@ -375,6 +376,8 @@ watch([interval, initFinish], () => {
   }
   .data-detail-view {
     width: calc((100% - 40px) / 5);
+    height: 706px;
+    overflow: auto;
   }
 
   .card-title {
@@ -393,7 +396,7 @@ watch([interval, initFinish], () => {
           // background: rgba(255, 114, 59, 0.09);
         }
         .el-table__cell {
-          padding: 4px 0;
+          padding: 5px 0;
         }
       }
     }

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

@@ -1,6 +1,6 @@
 <template>
   <div class="flex direction-column full personnel-statistics-view">
-    <div class="p-l-base p-r-base p-t-medium-base fill-blank filter-form">
+    <div class="p-l-base p-r-base p-t-medium-base fill-blank filter-form" style="padding-bottom: 10px">
       <base-form size="small" :label-width="useVW(88)" :disabled="loading" :model="model" :items="items">
         <template #form-item-button-group>
           <el-button :loading="loading" type="primary" @click="onSearch">查询</el-button>
@@ -71,5 +71,8 @@ function onExport() {
   .filter-form {
     border-bottom: $OnePixelLine;
   }
+  :deep(.el-form-item--small) {
+    margin-bottom: 10px;
+  }
 }
 </style>

src/modules/marking/arbitration/index.vue

@@ -184,13 +184,13 @@ const columns: EpTableColumn[] = [
   { label: '密号', prop: 'secretNumber', width: 100, fixed: 'left' },
   { label: '客观分', prop: 'objectiveScore', width: 60 },
   { label: '组员给分', prop: 'markerScore', width: 70 },
-  { label: '组员', prop: 'markerName', width: 45 },
+  { label: '组员', prop: 'markerName', width: 90 },
   { label: '组员客主比', prop: 'markerRatio', width: 80 },
   { label: '小组长给分', prop: 'deputyScore', width: 80 },
-  { label: '小组长', prop: 'deputyName', width: 55 },
+  { label: '小组长', prop: 'deputyName', width: 90 },
   { label: '小组长客主比', prop: 'deputyRatio', width: 90 },
   { label: '大组长给分', prop: 'chiefScore', width: 80 },
-  { label: '大组长', prop: 'chiefName', width: 60 },
+  { label: '大组长', prop: 'chiefName', width: 90 },
   { label: '大组长客主比', prop: 'chiefRatio', width: 90 },
 ]
 

src/modules/marking/problem/index.vue

@@ -6,7 +6,11 @@
       @click="onOperationClick"
     >
       <el-button
-        :disabled="!currentProblem?.id"
+        :disabled="
+          !currentProblem?.id ||
+          currentProblem.problemSolveType === 'MARK' ||
+          currentProblem.problemSolveType === 'REJECT'
+        "
         class="m-l-base m-r-auto"
         size="small"
         type="primary"

src/modules/monitor/training-monitoring/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex direction-column full training-monitoring-view">
-    <div class="p-l-base p-r-base p-t-medium-base fill-blank filter-form">
+    <div class="p-l-base p-r-base p-t-medium-base fill-blank filter-form" style="padding-bottom: 10px">
       <base-form
         ref="formRef"
         size="small"
@@ -176,6 +176,9 @@ onBeforeUnmount(() => {
 </script>
 
 <style scoped lang="scss">
-.training-monitoring {
+.training-monitoring-view {
+  :deep(.el-form-item--small) {
+    margin-bottom: 10px;
+  }
 }
 </style>

src/modules/quality/ending-check/components/EndCheck.vue

@@ -72,7 +72,12 @@
       </div>
     </div>
   </div>
-  <base-dialog v-model="visibleChangeMarker" title="任务指定评卷员" destroy-on-close>
+  <base-dialog
+    v-model="visibleChangeMarker"
+    title="任务指定评卷员"
+    destroy-on-close
+    @close="changeMarkerModel.loginName = ''"
+  >
     <base-form
       ref="formRef"
       size="small"
@@ -84,7 +89,12 @@
       <confirm-button around @confirm="onSubmitChangeMarker" @cancel="visibleChangeMarker = false"></confirm-button>
     </template>
   </base-dialog>
-  <base-dialog v-model="visibleChangeMarker2" title="任务指定评卷员" destroy-on-close>
+  <base-dialog
+    v-model="visibleChangeMarker2"
+    title="任务指定评卷员"
+    destroy-on-close
+    @close="changeMarkerModel2.loginName = ''"
+  >
     <base-form
       ref="formRef"
       size="small"

src/router/index.ts

@@ -55,7 +55,8 @@ router.beforeEach(async (to, from, next) => {
   } else if (to.meta?.auth === false || to.name === 'Login' || sessionStorage.get('LOGIN_RESULT')) {
     next()
   } else {
-    next({ name: 'Login' })
+    // next({ name: 'Login' })
+    next()
   }
 })