优化处理进度

src/views/againAssign.vue

@@ -55,26 +55,26 @@
             :class="{ progress: true, progressHide: !pro_hides }"
             id="progressBox"
           >
-            <div class="progress_info" v-for="item in progressInfo">
-              <div class="progress_info_L">{{ item.activityName }}</div>
+            <div class="progress_info" v-for="(item,index) in progressInfo" :key="index">
+              <div class="progress_info_L">{{ item.logType ? item.logType.name : '' }}</div>
               <div class="progress_info_R">
                 <div class="time">
                   <i
                     :class="{
                       iconfont: true,
                       'icon-icon_weizuo': item.endTime != '',
-                      'icon-icon_zhengzaijinx': item.endTime == '',
+                      'icon-icon_zhengzaijinx': item.endTime == ''
                     }"
                   ></i>
                   <span class="text1">
                     {{ item.startTime | timeFormat("MM-dd HH:mm:ss") }}
-                    <template v-if="item.userName">
-                      ，{{ item.userName }}
+                    <template v-if="item.appointorName">
+                      ，{{ item.appointorName }}
                     </template>
                   </span>
                 </div>
                 <div :class="{ cont: true, blue: item.endTime != '' }">
-                  <p class="text2" v-if="item.desc" v-html="item.desc"></p>
+                  <p class="text2" v-if="item.logType && item.logType.desc" v-html="item.logType.desc"></p>
                 </div>
               </div>
             </div>
@@ -192,27 +192,33 @@ export default {
       var that = this;
       that.$http
         .post(
-          "/service/bpm/bpm/flowTracingCustom/" + that.processInstanceId,
-          {}
+          "/service/simple/data/fetchDataList/incidentLog",
+          {
+              "idx": 0,
+              "sum": 9999,
+              "incidentLog": {
+                  "incidentId": this.id
+              }
+          }
         )
-        .then(function (res) {
+        .then(function(res) {
           console.log(res.data);
-          that.progressInfo = res.data.data;
+          that.progressInfo = res.data.list || [];
           //维修记录startcaca
-          if (that.model.incident.handlerLogs) {
+          if (that.modelData.incident.handlerLogs) {
             //添加日志
-            that.model.incident.handlerLogs.forEach((v) => {
+            that.modelData.incident.handlerLogs.forEach(v => {
               that.progressInfo.push({
                 startTime: v.opTime,
                 endTime: 1,
-                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(v.expectedDate, "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
-                userName: v.userName,
-                activityName: "事件处理",
+                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(new Date(v.expectedDate), "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
+                appointorName: v.userName,
+                logType: {name: "事件处理"}
               });
             });
           }
           //处理数据
-          that.progressInfo.forEach((v) => {
+          that.progressInfo.forEach(v => {
             if (!v.endTime) {
               v.endTime = 1;
             }
@@ -220,7 +226,7 @@ export default {
           });
           var kaishi = that.progressInfo.shift();
           var jiedan = that.progressInfo.shift();
-          that.progressInfo.sort(function (o, c) {
+          that.progressInfo.sort(function(o, c) {
             return c.startTime - o.startTime;
           });
           that.progressInfo.length && (that.progressInfo[0].endTime = "");

src/views/closed.vue

@@ -127,26 +127,26 @@
             :class="{ progress: true, progressHide: !pro_hides }"
             id="progressBox"
           >
-            <div class="progress_info" v-for="item in progressInfo">
-              <div class="progress_info_L">{{ item.activityName }}</div>
+            <div class="progress_info" v-for="(item,index) in progressInfo" :key="index">
+              <div class="progress_info_L">{{ item.logType ? item.logType.name : '' }}</div>
               <div class="progress_info_R">
                 <div class="time">
                   <i
                     :class="{
                       iconfont: true,
                       'icon-icon_weizuo': item.endTime != '',
-                      'icon-icon_zhengzaijinx': item.endTime == '',
+                      'icon-icon_zhengzaijinx': item.endTime == ''
                     }"
                   ></i>
                   <span class="text1">
                     {{ item.startTime | timeFormat("MM-dd HH:mm:ss") }}
-                    <template v-if="item.userName">
-                      ，{{ item.userName }}
+                    <template v-if="item.appointorName">
+                      ，{{ item.appointorName }}
                     </template>
                   </span>
                 </div>
                 <div :class="{ cont: true, blue: item.endTime != '' }">
-                  <p class="text2" v-if="item.desc" v-html="item.desc"></p>
+                  <p class="text2" v-if="item.logType && item.logType.desc" v-html="item.logType.desc"></p>
                 </div>
               </div>
             </div>
@@ -244,27 +244,33 @@ export default {
       var that = this;
       that.$http
         .post(
-          "/service/bpm/bpm/flowTracingCustom/" + that.processInstanceId,
-          {}
+          "/service/simple/data/fetchDataList/incidentLog",
+          {
+              "idx": 0,
+              "sum": 9999,
+              "incidentLog": {
+                  "incidentId": this.id
+              }
+          }
         )
-        .then(function (res) {
+        .then(function(res) {
           console.log(res.data);
-          that.progressInfo = res.data.data;
+          that.progressInfo = res.data.list || [];
           //维修记录startcaca
-          if (that.model.incident.handlerLogs) {
+          if (that.modelData.incident.handlerLogs) {
             //添加日志
-            that.model.incident.handlerLogs.forEach((v) => {
+            that.modelData.incident.handlerLogs.forEach(v => {
               that.progressInfo.push({
                 startTime: v.opTime,
                 endTime: 1,
-                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(v.expectedDate, "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
-                userName: v.userName,
-                activityName: "事件处理",
+                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(new Date(v.expectedDate), "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
+                appointorName: v.userName,
+                logType: {name: "事件处理"}
               });
             });
           }
           //处理数据
-          that.progressInfo.forEach((v) => {
+          that.progressInfo.forEach(v => {
             if (!v.endTime) {
               v.endTime = 1;
             }
@@ -272,7 +278,7 @@ export default {
           });
           var kaishi = that.progressInfo.shift();
           var jiedan = that.progressInfo.shift();
-          that.progressInfo.sort(function (o, c) {
+          that.progressInfo.sort(function(o, c) {
             return c.startTime - o.startTime;
           });
           that.progressInfo.length && (that.progressInfo[0].endTime = "");

src/views/grabSheet.vue

@@ -41,26 +41,26 @@
               :class="{ progress: true, progressHide: !pro_hides }"
               id="progressBox"
             >
-              <div class="progress_info" v-for="item in progressInfo">
-                <div class="progress_info_L">{{ item.activityName }}</div>
+              <div class="progress_info" v-for="(item,index) in progressInfo" :key="index">
+                <div class="progress_info_L">{{ item.logType ? item.logType.name : '' }}</div>
                 <div class="progress_info_R">
                   <div class="time">
                     <i
                       :class="{
                         iconfont: true,
                         'icon-icon_weizuo': item.endTime != '',
-                        'icon-icon_zhengzaijinx': item.endTime == '',
+                        'icon-icon_zhengzaijinx': item.endTime == ''
                       }"
                     ></i>
                     <span class="text1">
                       {{ item.startTime | timeFormat("MM-dd HH:mm:ss") }}
-                      <template v-if="item.userName">
-                        ，{{ item.userName }}
+                      <template v-if="item.appointorName">
+                        ，{{ item.appointorName }}
                       </template>
                     </span>
                   </div>
                   <div :class="{ cont: true, blue: item.endTime != '' }">
-                    <p class="text2" v-if="item.desc" v-html="item.desc"></p>
+                    <p class="text2" v-if="item.logType && item.logType.desc" v-html="item.logType.desc"></p>
                   </div>
                 </div>
               </div>
@@ -153,27 +153,33 @@ export default {
       var that = this;
       that.$http
         .post(
-          "/service/bpm/bpm/flowTracingCustom/" + that.processInstanceId,
-          {}
+          "/service/simple/data/fetchDataList/incidentLog",
+          {
+              "idx": 0,
+              "sum": 9999,
+              "incidentLog": {
+                  "incidentId": this.id
+              }
+          }
         )
-        .then(function (res) {
+        .then(function(res) {
           console.log(res.data);
-          that.progressInfo = res.data.data;
+          that.progressInfo = res.data.list || [];
           //维修记录startcaca
-          if (that.model.incident.handlerLogs) {
+          if (that.modelData.incident.handlerLogs) {
             //添加日志
-            that.model.incident.handlerLogs.forEach((v) => {
+            that.modelData.incident.handlerLogs.forEach(v => {
               that.progressInfo.push({
                 startTime: v.opTime,
                 endTime: 1,
-                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(v.expectedDate, "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
-                userName: v.userName,
-                activityName: "事件处理",
+                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(new Date(v.expectedDate), "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
+                appointorName: v.userName,
+                logType: {name: "事件处理"}
               });
             });
           }
           //处理数据
-          that.progressInfo.forEach((v) => {
+          that.progressInfo.forEach(v => {
             if (!v.endTime) {
               v.endTime = 1;
             }
@@ -181,7 +187,7 @@ export default {
           });
           var kaishi = that.progressInfo.shift();
           var jiedan = that.progressInfo.shift();
-          that.progressInfo.sort(function (o, c) {
+          that.progressInfo.sort(function(o, c) {
             return c.startTime - o.startTime;
           });
           that.progressInfo.length && (that.progressInfo[0].endTime = "");

src/views/order.vue

@@ -65,26 +65,26 @@
               :class="{ progress: true, progressHide: !pro_hides }"
               id="progressBox"
             >
-              <div class="progress_info" v-for="item in progressInfo">
-                <div class="progress_info_L">{{ item.activityName }}</div>
+              <div class="progress_info" v-for="(item,index) in progressInfo" :key="index">
+                <div class="progress_info_L">{{ item.logType ? item.logType.name : '' }}</div>
                 <div class="progress_info_R">
                   <div class="time">
                     <i
                       :class="{
                         iconfont: true,
                         'icon-icon_weizuo': item.endTime != '',
-                        'icon-icon_zhengzaijinx': item.endTime == '',
+                        'icon-icon_zhengzaijinx': item.endTime == ''
                       }"
                     ></i>
                     <span class="text1">
                       {{ item.startTime | timeFormat("MM-dd HH:mm:ss") }}
-                      <template v-if="item.userName">
-                        ，{{ item.userName }}
+                      <template v-if="item.appointorName">
+                        ，{{ item.appointorName }}
                       </template>
                     </span>
                   </div>
                   <div :class="{ cont: true, blue: item.endTime != '' }">
-                    <p class="text2" v-if="item.desc" v-html="item.desc"></p>
+                    <p class="text2" v-if="item.logType && item.logType.desc" v-html="item.logType.desc"></p>
                   </div>
                 </div>
               </div>
@@ -198,27 +198,33 @@ export default {
       var that = this;
       that.$http
         .post(
-          "/service/bpm/bpm/flowTracingCustom/" + that.processInstanceId,
-          {}
+          "/service/simple/data/fetchDataList/incidentLog",
+          {
+              "idx": 0,
+              "sum": 9999,
+              "incidentLog": {
+                  "incidentId": this.id
+              }
+          }
         )
-        .then(function (res) {
+        .then(function(res) {
           console.log(res.data);
-          that.progressInfo = res.data.data;
+          that.progressInfo = res.data.list || [];
           //维修记录startcaca
-          if (that.model.incident.handlerLogs) {
+          if (that.modelData.incident.handlerLogs) {
             //添加日志
-            that.model.incident.handlerLogs.forEach((v) => {
+            that.modelData.incident.handlerLogs.forEach(v => {
               that.progressInfo.push({
                 startTime: v.opTime,
                 endTime: 1,
-                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(v.expectedDate, "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
-                userName: v.userName,
-                activityName: "事件处理",
+                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(new Date(v.expectedDate), "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
+                appointorName: v.userName,
+                logType: {name: "事件处理"}
               });
             });
           }
           //处理数据
-          that.progressInfo.forEach((v) => {
+          that.progressInfo.forEach(v => {
             if (!v.endTime) {
               v.endTime = 1;
             }
@@ -226,7 +232,7 @@ export default {
           });
           var kaishi = that.progressInfo.shift();
           var jiedan = that.progressInfo.shift();
-          that.progressInfo.sort(function (o, c) {
+          that.progressInfo.sort(function(o, c) {
             return c.startTime - o.startTime;
           });
           that.progressInfo.length && (that.progressInfo[0].endTime = "");

src/views/processing.vue

@@ -68,8 +68,8 @@
             :class="{ progress: true, progressHide: !pro_hides }"
             id="progressBox"
           >
-            <div class="progress_info" v-for="item in progressInfo">
-              <div class="progress_info_L">{{ item.activityName }}</div>
+            <div class="progress_info" v-for="(item,index) in progressInfo" :key="index">
+              <div class="progress_info_L">{{ item.logType ? item.logType.name : '' }}</div>
               <div class="progress_info_R">
                 <div class="time">
                   <i
@@ -81,13 +81,13 @@
                   ></i>
                   <span class="text1">
                     {{ item.startTime | timeFormat("MM-dd HH:mm:ss") }}
-                    <template v-if="item.userName">
-                      ，{{ item.userName }}
+                    <template v-if="item.appointorName">
+                      ，{{ item.appointorName }}
                     </template>
                   </span>
                 </div>
                 <div :class="{ cont: true, blue: item.endTime != '' }">
-                  <p class="text2" v-if="item.desc" v-html="item.desc"></p>
+                  <p class="text2" v-if="item.logType && item.logType.desc" v-html="item.logType.desc"></p>
                 </div>
               </div>
             </div>
@@ -1078,12 +1078,18 @@ export default {
       var that = this;
       that.$http
         .post(
-          "/service/bpm/bpm/flowTracingCustom/" + that.processInstanceId,
-          {}
+          "/service/simple/data/fetchDataList/incidentLog",
+          {
+              "idx": 0,
+              "sum": 9999,
+              "incidentLog": {
+                  "incidentId": this.id
+              }
+          }
         )
         .then(function(res) {
           console.log(res.data);
-          that.progressInfo = res.data.data;
+          that.progressInfo = res.data.list || [];
           //维修记录startcaca
           if (that.modelData.incident.handlerLogs) {
             //添加日志
@@ -1092,8 +1098,8 @@ export default {
                 startTime: v.opTime,
                 endTime: 1,
                 desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(new Date(v.expectedDate), "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
-                userName: v.userName,
-                activityName: "事件处理"
+                appointorName: v.userName,
+                logType: {name: "事件处理"}
               });
             });
           }

src/views/solved.vue

@@ -113,26 +113,26 @@
             :class="{ progress: true, progressHide: !pro_hides }"
             id="progressBox"
           >
-            <div class="progress_info" v-for="item in progressInfo">
-              <div class="progress_info_L">{{ item.activityName }}</div>
+            <div class="progress_info" v-for="(item,index) in progressInfo" :key="index">
+              <div class="progress_info_L">{{ item.logType ? item.logType.name : '' }}</div>
               <div class="progress_info_R">
                 <div class="time">
                   <i
                     :class="{
                       iconfont: true,
                       'icon-icon_weizuo': item.endTime != '',
-                      'icon-icon_zhengzaijinx': item.endTime == '',
+                      'icon-icon_zhengzaijinx': item.endTime == ''
                     }"
                   ></i>
                   <span class="text1">
                     {{ item.startTime | timeFormat("MM-dd HH:mm:ss") }}
-                    <template v-if="item.userName">
-                      ，{{ item.userName }}
+                    <template v-if="item.appointorName">
+                      ，{{ item.appointorName }}
                     </template>
                   </span>
                 </div>
                 <div :class="{ cont: true, blue: item.endTime != '' }">
-                  <p class="text2" v-if="item.desc" v-html="item.desc"></p>
+                  <p class="text2" v-if="item.logType && item.logType.desc" v-html="item.logType.desc"></p>
                 </div>
               </div>
             </div>
@@ -277,27 +277,33 @@ export default {
       var that = this;
       that.$http
         .post(
-          "/service/bpm/bpm/flowTracingCustom/" + that.processInstanceId,
-          {}
+          "/service/simple/data/fetchDataList/incidentLog",
+          {
+              "idx": 0,
+              "sum": 9999,
+              "incidentLog": {
+                  "incidentId": this.id
+              }
+          }
         )
-        .then(function (res) {
+        .then(function(res) {
           console.log(res.data);
-          that.progressInfo = res.data.data;
+          that.progressInfo = res.data.list || [];
           //维修记录startcaca
-          if (that.model.incident.handlerLogs) {
+          if (that.modelData.incident.handlerLogs) {
             //添加日志
-            that.model.incident.handlerLogs.forEach((v) => {
+            that.modelData.incident.handlerLogs.forEach(v => {
               that.progressInfo.push({
                 startTime: v.opTime,
                 endTime: 1,
-                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(v.expectedDate, "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
-                userName: v.userName,
-                activityName: "事件处理",
+                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(new Date(v.expectedDate), "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
+                appointorName: v.userName,
+                logType: {name: "事件处理"}
               });
             });
           }
           //处理数据
-          that.progressInfo.forEach((v) => {
+          that.progressInfo.forEach(v => {
             if (!v.endTime) {
               v.endTime = 1;
             }
@@ -305,7 +311,7 @@ export default {
           });
           var kaishi = that.progressInfo.shift();
           var jiedan = that.progressInfo.shift();
-          that.progressInfo.sort(function (o, c) {
+          that.progressInfo.sort(function(o, c) {
             return c.startTime - o.startTime;
           });
           that.progressInfo.length && (that.progressInfo[0].endTime = "");

src/views/waitConfirm.vue

@@ -203,8 +203,8 @@
 
           <div class="label" id="progress">处理进度</div>
           <div class="progress">
-            <div class="progress_info" v-for="item in progressInfo">
-              <div class="progress_info_L">{{ item.activityName }}</div>
+            <div class="progress_info" v-for="(item,index) in progressInfo" :key="index">
+              <div class="progress_info_L">{{ item.logType ? item.logType.name : '' }}</div>
               <div class="progress_info_R">
                 <div class="time">
                   <i
@@ -214,10 +214,15 @@
                       'icon-icon_zhengzaijinx': item.endTime == ''
                     }"
                   ></i>
-                  <span class="text1">{{ item.startTime }}</span>
+                  <span class="text1">
+                    {{ item.startTime | timeFormat("MM-dd HH:mm:ss") }}
+                    <template v-if="item.appointorName">
+                      ，{{ item.appointorName }}
+                    </template>
+                  </span>
                 </div>
                 <div :class="{ cont: true, blue: item.endTime != '' }">
-                  <p class="text2" v-if="item.desc" v-html="item.desc"></p>
+                  <p class="text2" v-if="item.logType && item.logType.desc" v-html="item.logType.desc"></p>
                 </div>
               </div>
             </div>
@@ -235,6 +240,7 @@ export default {
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       selected: 1,
+      id: "",
       options: [
         {
           label: "接单",
@@ -274,17 +280,52 @@ export default {
         });
     },
     // 获取处理进度
-    getHandlerInfo() {
+    getProgressInfo() {
       var that = this;
       that.$http
         .post(
-          "/service/bpm/bpm/flowTracingCustom/" + that.processInstanceId,
-          {}
+          "/service/simple/data/fetchDataList/incidentLog",
+          {
+              "idx": 0,
+              "sum": 9999,
+              "incidentLog": {
+                  "incidentId": this.id
+              }
+          }
         )
         .then(function(res) {
           console.log(res.data);
-          that.progressInfo = res.data.data;
-          that.progressInfo.reverse();
+          that.progressInfo = res.data.list || [];
+          //维修记录startcaca
+          if (that.modelData.incident.handlerLogs) {
+            //添加日志
+            that.modelData.incident.handlerLogs.forEach(v => {
+              that.progressInfo.push({
+                startTime: v.opTime,
+                endTime: 1,
+                desc: (v.repairType && v.expectedDate) ? `${v.repairType.name} ${formatDate(new Date(v.expectedDate), "MM月dd日前完成")}<br>${v.opValue}` : v.opValue,
+                appointorName: v.userName,
+                logType: {name: "事件处理"}
+              });
+            });
+          }
+          //处理数据
+          that.progressInfo.forEach(v => {
+            if (!v.endTime) {
+              v.endTime = 1;
+            }
+            v.startTime = new Date(v.startTime).getTime();
+          });
+          var kaishi = that.progressInfo.shift();
+          var jiedan = that.progressInfo.shift();
+          that.progressInfo.sort(function(o, c) {
+            return c.startTime - o.startTime;
+          });
+          that.progressInfo.length && (that.progressInfo[0].endTime = "");
+          that.progressInfo.push(jiedan);
+          that.progressInfo.push(kaishi);
+          console.log(that.progressInfo);
+          //维修记录end
         });
     },
     //隐藏显示详情
@@ -312,7 +353,13 @@ export default {
     }
   },
   created() {
-    this.processInstanceId = this.$route.params.data.processInstanceId;
+    this.processInstanceId = this.$route.params.data
+      ? this.$route.params.data.processInstanceId
+      : JSON.parse(localStorage.getItem("modelData")).incident
+          .processInstanceId;
+    this.id = this.$route.params.data
+      ? this.$route.params.data.id
+      : JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
     this.getHandlerInfo();
   },