优化

public/hitch-screen/index.html

@@ -178,7 +178,7 @@ var option = {
         show: true,
         formatter: '{@value}',
         textStyle: {
-          color: '#fff',
+          color: '#000',
           fontSize: 11
         }
       }
@@ -191,8 +191,34 @@ var option = {
     zlevel: 6,
     data: [
     ]
-  },{
-    name: '异常点编号',
+  }, {
+    name: '红色非计划性报修异常点',
+    type: 'effectScatter',
+    coordinateSystem: 'geo',
+    data: [
+    ],
+    showEffectOn: 'render',
+    rippleEffect: {
+      brushType: 'stroke'
+    },
+    hoverAnimation: true,
+    label: {
+      normal: {
+        formatter: '{@value}',
+        position: 'left',
+        show: false
+      }
+    },
+    itemStyle: {
+      normal: {
+        color: 'red',
+        shadowBlur: 200,
+        shadowColor: 'red'
+      }
+    },
+    zlevel: 1
+  }, {
+    name: '红色非计划性报修异常点编号',
     type: 'scatter',
     coordinateSystem: 'geo',
     symbol: 'pin', // 气泡
@@ -202,7 +228,7 @@ var option = {
         show: true,
         formatter: '{@value}',
         textStyle: {
-          color: '#fff',
+          color: '#000',
           fontSize: 11
         }
       }
@@ -215,8 +241,8 @@ var option = {
     zlevel: 6,
     data: [
     ]
-  }, {
-    name: '异常点',
+  },{
+    name: '黄色计划性报修异常点',
     type: 'effectScatter',
     coordinateSystem: 'geo',
     data: [
@@ -241,6 +267,30 @@ var option = {
       }
     },
     zlevel: 1
+  }, {
+    name: '黄色计划性报修异常点编号',
+    type: 'scatter',
+    coordinateSystem: 'geo',
+    symbol: 'pin', // 气泡
+    symbolSize: 50,
+    label: {
+      normal: {
+        show: true,
+        formatter: '{@value}',
+        textStyle: {
+          color: '#000',
+          fontSize: 11
+        }
+      }
+    },
+    itemStyle: {
+      normal: {
+        color: 'yellow'
+      }
+    },
+    zlevel: 6,
+    data: [
+    ]
   }]
 }
 
@@ -341,21 +391,32 @@ function getData(){
     success: function (response) {
       const data= response.data;
       const normalSbInfoList = [];
-      const repairSbInfoList = [];
+      const repairSbInfoListRed = [];
+      const repairSbInfoListYellow = [];
       if(data.normalSbInfoList !=null){
         for(var i=0;i<data.normalSbInfoList.length;i++){
-          normalSbInfoList.push([data.normalSbInfoList[i].zjm, data.normalSbInfoList[i].jbdh, data.normalSbInfoList[i].no])
+          normalSbInfoList.push([data.normalSbInfoList[i].zjm, data.normalSbInfoList[i].jbdh,
+            data.normalSbInfoList[i].no])
+        }
+      }
+      if(data.repairSbInfoListRed !=null) {
+        for (var i = 0; i < data.repairSbInfoListRed.length; i++) {
+          repairSbInfoListRed.push([data.repairSbInfoListRed[i].zjm, data.repairSbInfoListRed[i].jbdh,
+            data.repairSbInfoListRed[i].no])
         }
       }
-      if(data.repairSbInfoList !=null) {
-        for (var i = 0; i < data.repairSbInfoList.length; i++) {
-          repairSbInfoList.push([data.repairSbInfoList[i].zjm, data.repairSbInfoList[i].jbdh, data.repairSbInfoList[i].no])
+      if(data.repairSbInfoListYellow !=null) {
+        for (var i = 0; i < data.repairSbInfoListYellow.length; i++) {
+          repairSbInfoListYellow.push([data.repairSbInfoListYellow[i].zjm, data.repairSbInfoListYellow[i].jbdh,
+            data.repairSbInfoListYellow[i].no])
         }
       }
       option.series[0].data=normalSbInfoList;// 正常数据：
       option.series[1].data=normalSbInfoList;// 正常数据的编号
-      option.series[2].data=repairSbInfoList;// 异常数据的编号
-      option.series[3].data=repairSbInfoList;// 异常数据：黄点
+      option.series[2].data=repairSbInfoListRed;// 非计划性报修 红色编号
+      option.series[3].data=repairSbInfoListRed;// 非计划性报修 红色
+      option.series[4].data=repairSbInfoListYellow;// 计划性报修 黃色编号
+      option.series[5].data=repairSbInfoListYellow;// 计划性报修 黃色
       myChart.setOption(option, true)
     },
     error: function (xhr,textStatus,errorThrown) {

src/utils/dict.js

@@ -1295,14 +1295,12 @@ DictCache.COLOR = {
    * 报修状态
    */
   REPAIR_APPLICATION_FORM_STATUS: {
-    1: 'warning', // 待分配
-    2: 'processing', // 已分配
-    3: 'warning', // 已接收处理中
-    4: 'default', // 待验收
+    1: 'warning', // 待接收
+    2: 'processing', // 维修中
+    3: 'yellow', // 待提交审核
+    4: 'error', // 审核中
     5: 'success', // 已驳回
-    6: 'default', // 已完成
-    7: 'success', // 提交检查
-    8: 'default' // 已检查完毕
+    6: 'default' // 已完成
   },
   /**
    * 维修状态

src/views/repair/application-form/RepairApplicationForm.vue

@@ -292,7 +292,7 @@ export default {
           type: 1,
           dataScope: {
             sortBy: 'desc',
-            sortName: 'update_time'
+            sortName: 'apply_time'
           }
         }
         return getRepairApplicationFormPage(Object.assign(parameter, this.queryParam))

src/views/repair/application-form/RepairCheckForm.vue

@@ -269,7 +269,7 @@ export default {
           ...this.queryParam,
           dataScope: {
             sortBy: 'desc',
-            sortName: 'check_start_time'
+            sortName: 'apply_time'
           }
         }
         return getRepairApplicationFormPage(Object.assign(parameter, this.queryParam))

src/views/repair/application-form/RepairOut.vue

@@ -198,7 +198,7 @@ export default {
           type: 2,
           dataScope: {
             sortBy: 'desc',
-            sortName: 'update_time'
+            sortName: 'apply_time'
           }
         }
         return getRepairApplicationFormPage(Object.assign(parameter, this.queryParam))

src/views/repair/application-form/modules/BaseForm.vue

@@ -44,7 +44,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select @change="changeNeedStop" v-decorator="['needStop', {initialValue: DictCache.VALUE.YES_NO.NO,rules: [{required: true, message: '计划性维修不能为空'}]}]" placeholder="请选择">
+            <a-select @change="changeNeedStop" v-decorator="['needStop', {rules: [{required: true, message: '计划性维修不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in needStopMap"
                 :key="value"