优化

config/index.js

@@ -14,7 +14,7 @@ module.exports = {
     proxyTable: {
       '/service': {//自定义名字，代表的是以下target中的内容
         // target: host.host+'/service/',//微信
-        target: 'http://192.168.4.240',//微信
+        target: 'http://192.168.3.111',//微信
         changeOrigin: true,//是否允许跨域
         // pathRewrite: {
         //   '^/service': ''

src/views/againAssign.vue

@@ -137,6 +137,7 @@ import LoadIng from "./../views/loading.vue";
 import PrompTing from "./../views/prompting.vue";
 import EventInformation from './../components/EventInformation/index.vue'
 import ShowPicture from './../custom/ShowPicture.vue'
+import { formatDate } from "./../components/js/date.js";
 export default {
   data() {
     return {
@@ -204,7 +205,7 @@ export default {
               that.progressInfo.push({
                 startTime: v.opTime,
                 endTime: 1,
-                desc: v.opValue,
+                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(v.expectedDate, "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
                 userName: v.userName,
                 activityName: "事件处理",
               });
@@ -543,9 +544,6 @@ i.iconfont.blue {
                 }
               }
 
-              .text1 {
-                font-size: 0.15rem;
-              }
               .text2 {
                 color: #666;
                 word-break: break-all;

src/views/closed.vue

@@ -169,6 +169,7 @@
 import LoadIng from "./../views/loading.vue";
 import EventInformation from './../components/EventInformation/index.vue'
 import ShowPicture from './../custom/ShowPicture.vue'
+import { formatDate } from "./../components/js/date.js";
 export default {
   data() {
     return {
@@ -256,7 +257,7 @@ export default {
               that.progressInfo.push({
                 startTime: v.opTime,
                 endTime: 1,
-                desc: v.opValue,
+                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(v.expectedDate, "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
                 userName: v.userName,
                 activityName: "事件处理",
               });
@@ -518,9 +519,6 @@ i.iconfont {
                 }
               }
 
-              .text1 {
-                font-size: 0.15rem;
-              }
               .text2 {
                 color: #666;
                 word-break: break-all;

src/views/grabSheet.vue

@@ -85,6 +85,7 @@
 import LoadIng from "./../views/loading.vue";
 import EventInformation from './../components/EventInformation/index.vue'
 import ShowPicture from './../custom/ShowPicture.vue'
+import { formatDate } from "./../components/js/date.js";
 export default {
   data() {
     return {
@@ -165,7 +166,7 @@ export default {
               that.progressInfo.push({
                 startTime: v.opTime,
                 endTime: 1,
-                desc: v.opValue,
+                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(v.expectedDate, "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
                 userName: v.userName,
                 activityName: "事件处理",
               });
@@ -480,9 +481,6 @@ export default {
                 }
               }
 
-              .text1 {
-                font-size: 0.15rem;
-              }
               .text2 {
                 color: #666;
                 word-break: break-all;

src/views/order.vue

@@ -135,6 +135,7 @@ import LoadIng from "./../views/loading.vue";
 import PrompTing from "./../views/prompting.vue";
 import EventInformation from './../components/EventInformation/index.vue'
 import ShowPicture from './../custom/ShowPicture.vue'
+import { formatDate } from "./../components/js/date.js";
 export default {
   data() {
     return {
@@ -210,7 +211,7 @@ export default {
               that.progressInfo.push({
                 startTime: v.opTime,
                 endTime: 1,
-                desc: v.opValue,
+                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(v.expectedDate, "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
                 userName: v.userName,
                 activityName: "事件处理",
               });
@@ -520,9 +521,6 @@ i.iconfont.blue {
                 }
               }
 
-              .text1 {
-                font-size: 0.15rem;
-              }
               .text2 {
                 color: #666;
                 word-break: break-all;

src/views/processing.vue

@@ -315,6 +315,7 @@ import LoadIng from "./../views/loading.vue";
 import PrompTing from "./../views/prompting.vue";
 import EventInformation from "./../components/EventInformation/index.vue";
 import ShowPicture from './../custom/ShowPicture.vue'
+import { formatDate } from "./../components/js/date.js";
 // import HandlerLog from "./../views/handlerLog.vue";
 // import host from '../request/host'
 
@@ -1072,7 +1073,7 @@ export default {
               that.progressInfo.push({
                 startTime: v.opTime,
                 endTime: 1,
-                desc: v.opValue,
+                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(new Date(v.expectedDate), "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
                 userName: v.userName,
                 activityName: "事件处理"
               });
@@ -2382,9 +2383,6 @@ i.iconfont.blue {
                 }
               }
 
-              .text1 {
-                font-size: 0.15rem;
-              }
               .text2 {
                 color: #666;
                 word-break: break-all;

src/views/solved.vue

@@ -194,6 +194,7 @@
 import LoadIng from "./../views/loading.vue";
 import EventInformation from './../components/EventInformation/index.vue'
 import ShowPicture from './../custom/ShowPicture.vue'
+import { formatDate } from "./../components/js/date.js";
 // import HandlerLog from "./../views/handlerLog.vue";
 export default {
   data() {
@@ -289,7 +290,7 @@ export default {
               that.progressInfo.push({
                 startTime: v.opTime,
                 endTime: 1,
-                desc: v.opValue,
+                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(v.expectedDate, "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
                 userName: v.userName,
                 activityName: "事件处理",
               });
@@ -669,9 +670,6 @@ i.iconfont {
                 }
               }
 
-              .text1 {
-                font-size: 0.15rem;
-              }
               .text2 {
                 color: #666;
                 word-break: break-all;