zhangjie hace 4 años
padre
commit
ebb6b5d397

+ 8 - 6
src/assets/styles/common-component.less

@@ -48,12 +48,14 @@
     position: absolute;
     width: 600px;
     // box-shadow: 0px 24px 36px 0px rgba(0, 0, 0, 0.3);
-    cursor: move;
     transition: width, height, transform 0.2s linear;
     z-index: 8;
     &-nosition {
       transition: none;
     }
+    &-move {
+      cursor: move;
+    }
     > img {
       display: block;
       width: 100%;
@@ -88,14 +90,13 @@
   }
   &-footer {
     position: absolute;
-    width: 100%;
     height: 60px;
     bottom: 0;
-    left: 0;
+    left: 50%;
+    transform: translateX(-50%);
     padding: 10px;
-    text-align: center;
     font-size: 30px;
-    color: #d0d0d0;
+    color: #333;
     z-index: 99;
     li {
       display: inline-block;
@@ -104,11 +105,12 @@
       width: 40px;
       line-height: 40px;
       margin: 0 5px;
+      text-align: center;
       cursor: pointer;
       transition: transform 0.2s linear;
     }
     li:hover {
-      color: #fff;
+      // color: #000;
       transform: scale(1.1, 1.1);
     }
     li.li-disabled {

+ 4 - 4
src/components/SimpleImagePreview.vue

@@ -13,16 +13,16 @@
       <Icon type="ios-close" />
     </div>
 
-    <div :class="[`${prefixCls}-body`]" ref="ReviewBody">
+    <div :class="[`${prefixCls}-body`]" ref="ReviewBody" @click="cancel">
       <div
         :class="[`${prefixCls}-guide`, `${prefixCls}-guide-prev`]"
-        @click="showPrev"
+        @click.stop="showPrev"
       >
         <Icon type="ios-arrow-back" />
       </div>
       <div
         :class="[`${prefixCls}-guide`, `${prefixCls}-guide-next`]"
-        @click="showNext"
+        @click.stop="showNext"
       >
         <Icon type="ios-arrow-forward" />
       </div>
@@ -49,7 +49,7 @@
 
     <div :class="[`${prefixCls}-footer`]">
       <ul>
-        <li title="旋转" @click="toRotate">
+        <li title="旋转" @click.stop="toRotate">
           <Icon type="ios-refresh-circle" />
         </li>
       </ul>

+ 2 - 2
src/modules/inspection/InspectionActionLogs.vue

@@ -106,7 +106,7 @@
 <script>
 import { inspectionActionLogPageList, workList } from "@/api";
 import { ACTION_TYPE } from "@/constants/enumerate";
-import { filterObjNull } from "@/plugins/utils";
+import { filterObjNull, qsParams } from "@/plugins/utils";
 
 export default {
   name: "inspection-action-logs",
@@ -223,7 +223,7 @@ export default {
         return;
       }
       window.open(
-        `${this.GLOBAL.domain}/api/export/log/oper?workId=${this.filter.workId}&subject=${this.filter.subject}`
+        `${this.GLOBAL.domain}/api/export/log/oper?${qsParams(this.filter)}`
       );
     }
   }

+ 2 - 2
src/modules/inspection/InspectionCollectLogs.vue

@@ -109,7 +109,7 @@ import {
   workList,
   clientUserPageList
 } from "@/api";
-import { filterObjNull } from "@/plugins/utils";
+import { filterObjNull, qsParams } from "@/plugins/utils";
 
 export default {
   name: "inspection-collect-logs",
@@ -225,7 +225,7 @@ export default {
         return;
       }
       window.open(
-        `${this.GLOBAL.domain}/api/export/log/collect?workId=${this.filter.workId}&subject=${this.filter.subject}`
+        `${this.GLOBAL.domain}/api/export/log/collect?${qsParams(this.filter)}`
       );
     }
   }

+ 3 - 3
src/modules/mark-set/MarkRuleSet.vue

@@ -3,7 +3,7 @@
     <Form
       ref="modalFormComp"
       :model="modalForm"
-      :label-width="180"
+      :label-width="230"
       style="width: 400px"
     >
       <FormItem label="分数处理方式:">
@@ -16,11 +16,11 @@
           >
         </Select>
       </FormItem>
-      <FormItem label="是否显示改档及改档打分:">
+      <FormItem label="阅卷员是否显示改档及改档打分:">
         <Select
           v-model="modalForm.changeStage"
           :disabled="!modalFormCanEdit"
-          placeholder="是否显示改档及改档打分"
+          placeholder="阅卷员是否显示改档及改档打分"
         >
           <Option
             v-for="(val, key) in BOOLEAN_TYPE"

+ 1 - 0
src/plugins/utils.js

@@ -185,6 +185,7 @@ function randomCode(len = 16) {
  */
 function qsParams(params) {
   return Object.entries(params)
+    .filter(([key, val]) => val !== null)
     .map(([key, val]) => `${key}=${val}`)
     .join("&");
 }