浏览代码

处理日志界面修改

seimin 3 年之前
父节点
当前提交
e17a50d690
共有 6 个文件被更改,包括 234 次插入39 次删除
  1. 41 3
      src/views/againAssign.vue
  2. 33 3
      src/views/closed.vue
  3. 41 3
      src/views/grabSheet.vue
  4. 39 10
      src/views/order.vue
  5. 41 11
      src/views/processing.vue
  6. 39 9
      src/views/solved.vue

+ 41 - 3
src/views/againAssign.vue

@@ -128,6 +128,14 @@
128
               <span class="fl">逾期解决时间</span>
128
               <span class="fl">逾期解决时间</span>
129
               <span class="fr">{{ model.incident.overdueTime }}</span>
129
               <span class="fr">{{ model.incident.overdueTime }}</span>
130
             </p>
130
             </p>
131
+            <p>
132
+                <span class="fl">区域</span>
133
+                <span class="fr">{{model.incident.place?model.incident.place.area.area:'--'}}</span>
134
+              </p>
135
+              <p>
136
+                <span class="fl">地点</span>
137
+                <span class="fr">{{model.incident.place?model.incident.place.place:'--'}}</span>
138
+              </p>
131
           </div>
139
           </div>
132
           <p class="info_hide">
140
           <p class="info_hide">
133
             <span class="fl hide" @click="hides()" v-if="!item_hides"
141
             <span class="fl hide" @click="hides()" v-if="!item_hides"
@@ -181,7 +189,12 @@
181
                       'icon-icon_zhengzaijinx': item.endTime == ''
189
                       'icon-icon_zhengzaijinx': item.endTime == ''
182
                     }"
190
                     }"
183
                   ></i>
191
                   ></i>
184
-                  <span class="text1">{{ item.startTime }}</span>
192
+                  <span class="text1">
193
+                      {{item.startTime | timeFormat("MM-dd HH:mm:ss")}}
194
+                      <template v-if="item.userName">
195
+                        ,{{item.userName}}
196
+                      </template>
197
+                      </span>
185
                 </div>
198
                 </div>
186
                 <div :class="{ cont: true, blue: item.endTime != '' }">
199
                 <div :class="{ cont: true, blue: item.endTime != '' }">
187
                   <p class="text2" v-if="item.desc" v-html="item.desc"></p>
200
                   <p class="text2" v-if="item.desc" v-html="item.desc"></p>
@@ -288,6 +301,7 @@ export default {
288
         .then(function(res) {
301
         .then(function(res) {
289
           console.log(res.data);
302
           console.log(res.data);
290
           that.model = res.data.model;
303
           that.model = res.data.model;
304
+          that.getProgressInfo();
291
         });
305
         });
292
     },
306
     },
293
     // 获取图片
307
     // 获取图片
@@ -316,7 +330,31 @@ export default {
316
         .then(function(res) {
330
         .then(function(res) {
317
           console.log(res.data);
331
           console.log(res.data);
318
           that.progressInfo = res.data.data;
332
           that.progressInfo = res.data.data;
319
-          that.progressInfo.reverse();
333
+          //处理日志startcaca
334
+          if(that.model.incident.handlerLogs){
335
+            //添加日志
336
+            that.model.incident.handlerLogs.forEach(v=>{
337
+              that.progressInfo.push({startTime:v.opTime,endTime:1,desc:v.opValue,userName:v.userName,activityName:'事件处理'});
338
+            })
339
+
340
+          }
341
+          //处理数据
342
+          that.progressInfo.forEach((v)=>{
343
+            if(!v.endTime){
344
+              v.endTime = 1;
345
+            }
346
+            v.startTime = new Date(v.startTime).getTime();
347
+          })
348
+          var kaishi = that.progressInfo.shift();
349
+          var jiedan = that.progressInfo.shift();
350
+          that.progressInfo.sort(function(o,c){
351
+            return c.startTime - o.startTime;
352
+          });
353
+          that.progressInfo.length && (that.progressInfo[0].endTime = '');
354
+          that.progressInfo.push(jiedan);
355
+          that.progressInfo.push(kaishi);
356
+          console.log(that.progressInfo)
357
+        //处理日志end
320
         });
358
         });
321
     },
359
     },
322
     //隐藏显示详情
360
     //隐藏显示详情
@@ -448,7 +486,6 @@ export default {
448
     this.processInstanceId = this.$route.params.data.processInstanceId;
486
     this.processInstanceId = this.$route.params.data.processInstanceId;
449
     this.id = this.$route.params.data.id;
487
     this.id = this.$route.params.data.id;
450
     this.getParamsData();
488
     this.getParamsData();
451
-    this.getProgressInfo();
452
     this.getImgs();
489
     this.getImgs();
453
     this.getHandlerUser();
490
     this.getHandlerUser();
454
     this.getCandidateGroups();
491
     this.getCandidateGroups();
@@ -656,6 +693,7 @@ i.iconfont.blue {
656
               }
693
               }
657
               .text2 {
694
               .text2 {
658
                 color: #666;
695
                 color: #666;
696
+                word-break: break-all;
659
               }
697
               }
660
               p {
698
               p {
661
                 padding: 0;
699
                 padding: 0;

+ 33 - 3
src/views/closed.vue

@@ -265,7 +265,12 @@
265
                       'icon-icon_zhengzaijinx': item.endTime == ''
265
                       'icon-icon_zhengzaijinx': item.endTime == ''
266
                     }"
266
                     }"
267
                   ></i>
267
                   ></i>
268
-                  <span class="text1">{{ item.startTime }}</span>
268
+                  <span class="text1">
269
+                      {{item.startTime | timeFormat("MM-dd HH:mm:ss")}}
270
+                      <template v-if="item.userName">
271
+                        ,{{item.userName}}
272
+                      </template>
273
+                      </span>
269
                 </div>
274
                 </div>
270
                 <div :class="{ cont: true, blue: item.endTime != '' }">
275
                 <div :class="{ cont: true, blue: item.endTime != '' }">
271
                   <p class="text2" v-if="item.desc" v-html="item.desc"></p>
276
                   <p class="text2" v-if="item.desc" v-html="item.desc"></p>
@@ -336,6 +341,7 @@ export default {
336
           that.model = res.data.model;
341
           that.model = res.data.model;
337
           //seimin
342
           //seimin
338
           localStorage.setItem("modelData", JSON.stringify(that.model));
343
           localStorage.setItem("modelData", JSON.stringify(that.model));
344
+          that.getProgressInfo();
339
         });
345
         });
340
     },
346
     },
341
     // 获取图片
347
     // 获取图片
@@ -364,7 +370,31 @@ export default {
364
         .then(function(res) {
370
         .then(function(res) {
365
           console.log(res.data);
371
           console.log(res.data);
366
           that.progressInfo = res.data.data;
372
           that.progressInfo = res.data.data;
367
-          that.progressInfo.reverse();
373
+          //处理日志startcaca
374
+          if(that.model.incident.handlerLogs){
375
+            //添加日志
376
+            that.model.incident.handlerLogs.forEach(v=>{
377
+              that.progressInfo.push({startTime:v.opTime,endTime:1,desc:v.opValue,userName:v.userName,activityName:'事件处理'});
378
+            })
379
+
380
+          }
381
+          //处理数据
382
+          that.progressInfo.forEach((v)=>{
383
+            if(!v.endTime){
384
+              v.endTime = 1;
385
+            }
386
+            v.startTime = new Date(v.startTime).getTime();
387
+          })
388
+          var kaishi = that.progressInfo.shift();
389
+          var jiedan = that.progressInfo.shift();
390
+          that.progressInfo.sort(function(o,c){
391
+            return c.startTime - o.startTime;
392
+          });
393
+          that.progressInfo.length && (that.progressInfo[0].endTime = '');;
394
+          that.progressInfo.push(jiedan);
395
+          that.progressInfo.push(kaishi);
396
+          console.log(that.progressInfo)
397
+        //处理日志end
368
         });
398
         });
369
     },
399
     },
370
     //隐藏显示详情
400
     //隐藏显示详情
@@ -413,7 +443,6 @@ export default {
413
       ? this.$route.params.data.id
443
       ? this.$route.params.data.id
414
       : JSON.parse(localStorage.getItem("modelData")).incident.id;
444
       : JSON.parse(localStorage.getItem("modelData")).incident.id;
415
     this.getParamsData();
445
     this.getParamsData();
416
-    this.getProgressInfo();
417
     this.getImgs();
446
     this.getImgs();
418
   }
447
   }
419
 };
448
 };
@@ -628,6 +657,7 @@ i.iconfont {
628
               }
657
               }
629
               .text2 {
658
               .text2 {
630
                 color: #666;
659
                 color: #666;
660
+                word-break: break-all;
631
               }
661
               }
632
               p {
662
               p {
633
                 padding: 0;
663
                 padding: 0;

+ 41 - 3
src/views/grabSheet.vue

@@ -94,6 +94,14 @@
94
                 <span class="fl">逾期解决时间</span>
94
                 <span class="fl">逾期解决时间</span>
95
                 <span class="fr">{{model.incident.overdueTime||''}}</span>
95
                 <span class="fr">{{model.incident.overdueTime||''}}</span>
96
               </p>
96
               </p>
97
+              <p>
98
+                <span class="fl">区域</span>
99
+                <span class="fr">{{model.incident.place?model.incident.place.area.area:'--'}}</span>
100
+              </p>
101
+              <p>
102
+                <span class="fl">地点</span>
103
+                <span class="fr">{{model.incident.place?model.incident.place.place:'--'}}</span>
104
+              </p>
97
             </div>
105
             </div>
98
             <p class="info_hide">
106
             <p class="info_hide">
99
               <span class="fl hide" @click="hides()" v-if="!item_hides">展开详情 >></span>
107
               <span class="fl hide" @click="hides()" v-if="!item_hides">展开详情 >></span>
@@ -117,7 +125,12 @@
117
                     <i
125
                     <i
118
                       :class="{'iconfont':true, 'icon-icon_weizuo':item.endTime!='','icon-icon_zhengzaijinx':item.endTime=='' }"
126
                       :class="{'iconfont':true, 'icon-icon_weizuo':item.endTime!='','icon-icon_zhengzaijinx':item.endTime=='' }"
119
                     ></i>
127
                     ></i>
120
-                    <span class="text1">{{item.startTime}}</span>
128
+                    <span class="text1">
129
+                      {{item.startTime | timeFormat("MM-dd HH:mm:ss")}}
130
+                      <template v-if="item.userName">
131
+                        ,{{item.userName}}
132
+                      </template>
133
+                      </span>
121
                   </div>
134
                   </div>
122
                   <div
135
                   <div
123
                     :class="{'cont':true,'blue':item.endTime!='' }"
136
                     :class="{'cont':true,'blue':item.endTime!='' }"
@@ -198,6 +211,7 @@ export default {
198
           }
211
           }
199
           //seimin
212
           //seimin
200
           localStorage.setItem('modelData',JSON.stringify(that.model))
213
           localStorage.setItem('modelData',JSON.stringify(that.model))
214
+          that.getProgressInfo();
201
         });
215
         });
202
     },
216
     },
203
     // 获取图片
217
     // 获取图片
@@ -226,7 +240,31 @@ export default {
226
         .then(function(res) {
240
         .then(function(res) {
227
           console.log(res.data);
241
           console.log(res.data);
228
           that.progressInfo = res.data.data;
242
           that.progressInfo = res.data.data;
229
-          that.progressInfo.reverse();
243
+          //处理日志startcaca
244
+          if(that.model.incident.handlerLogs){
245
+            //添加日志
246
+            that.model.incident.handlerLogs.forEach(v=>{
247
+              that.progressInfo.push({startTime:v.opTime,endTime:1,desc:v.opValue,userName:v.userName,activityName:'事件处理'});
248
+            })
249
+
250
+          }
251
+          //处理数据
252
+          that.progressInfo.forEach((v)=>{
253
+            if(!v.endTime){
254
+              v.endTime = 1;
255
+            }
256
+            v.startTime = new Date(v.startTime).getTime();
257
+          })
258
+          var kaishi = that.progressInfo.shift();
259
+          var jiedan = that.progressInfo.shift();
260
+          that.progressInfo.sort(function(o,c){
261
+            return c.startTime - o.startTime;
262
+          });
263
+          that.progressInfo.length && (that.progressInfo[0].endTime = '');;
264
+          that.progressInfo.push(jiedan);
265
+          that.progressInfo.push(kaishi);
266
+          console.log(that.progressInfo)
267
+        //处理日志end
230
         });
268
         });
231
     },
269
     },
232
     //隐藏显示详情
270
     //隐藏显示详情
@@ -300,7 +338,6 @@ export default {
300
           .processInstanceId;
338
           .processInstanceId;
301
           this.id=this.$route.params.data?this.$route.params.data.id:JSON.parse(localStorage.getItem("modelData")).incident.id;
339
           this.id=this.$route.params.data?this.$route.params.data.id:JSON.parse(localStorage.getItem("modelData")).incident.id;
302
     this.getParamsData();
340
     this.getParamsData();
303
-    this.getProgressInfo();
304
     this.getImgs();
341
     this.getImgs();
305
   }
342
   }
306
 };
343
 };
@@ -512,6 +549,7 @@ export default {
512
               }
549
               }
513
               .text2 {
550
               .text2 {
514
                 color: #666;
551
                 color: #666;
552
+                word-break: break-all;
515
               }
553
               }
516
               p {
554
               p {
517
                 padding: 0;
555
                 padding: 0;

+ 39 - 10
src/views/order.vue

@@ -15,13 +15,13 @@
15
                 @click="toInfo('progress')"
15
                 @click="toInfo('progress')"
16
               >处理进度</a>
16
               >处理进度</a>
17
             </div>
17
             </div>
18
-            <div class="fl" :class="{'p50':model.incident.handlerUser.id!=loginUser.id}">
18
+            <!-- <div class="fl" :class="{'p50':model.incident.handlerUser.id!=loginUser.id}">
19
               <a
19
               <a
20
                 :class="{active:actives=='handlerLog'}"
20
                 :class="{active:actives=='handlerLog'}"
21
                 href="javascript:;"
21
                 href="javascript:;"
22
                 @click="toInfo('handlerLog')"
22
                 @click="toInfo('handlerLog')"
23
               >处理日志</a>
23
               >处理日志</a>
24
-            </div>
24
+            </div> -->
25
             <div class="fl" v-if="model.incident.handlerUser.id==loginUser.id">
25
             <div class="fl" v-if="model.incident.handlerUser.id==loginUser.id">
26
               <a :class="{active:actives=='jd'}" href="javascript:;" @click="toInfo('jd')">接单</a>
26
               <a :class="{active:actives=='jd'}" href="javascript:;" @click="toInfo('jd')">接单</a>
27
             </div>
27
             </div>
@@ -137,7 +137,7 @@
137
                 </p>
137
                 </p>
138
               </div>
138
               </div>
139
             </div>
139
             </div>
140
-            <HandlerLog :data="model.incident.handlerLogs" id="handlerLog"></HandlerLog>
140
+            <!-- <HandlerLog :data="model.incident.handlerLogs" id="handlerLog"></HandlerLog> -->
141
             <div class="label" id="progress">处理进度</div>
141
             <div class="label" id="progress">处理进度</div>
142
             <div :class="{'progress':true,'progressHide':!pro_hides}" id="progressBox">
142
             <div :class="{'progress':true,'progressHide':!pro_hides}" id="progressBox">
143
               <div class="progress_info" v-for="item in progressInfo">
143
               <div class="progress_info" v-for="item in progressInfo">
@@ -147,7 +147,12 @@
147
                     <i
147
                     <i
148
                       :class="{'iconfont':true, 'icon-icon_weizuo':item.endTime!='','icon-icon_zhengzaijinx':item.endTime=='' }"
148
                       :class="{'iconfont':true, 'icon-icon_weizuo':item.endTime!='','icon-icon_zhengzaijinx':item.endTime=='' }"
149
                     ></i>
149
                     ></i>
150
-                    <span class="text1">{{item.startTime}}</span>
150
+                    <span class="text1">
151
+                      {{item.startTime | timeFormat("MM-dd HH:mm:ss")}}
152
+                      <template v-if="item.userName">
153
+                        ,{{item.userName}}
154
+                      </template>
155
+                      </span>
151
                   </div>
156
                   </div>
152
                   <div :class="{'cont':true,'blue':item.endTime!='' }">
157
                   <div :class="{'cont':true,'blue':item.endTime!='' }">
153
                     <p class="text2" v-if="item.desc" v-html="item.desc"></p>
158
                     <p class="text2" v-if="item.desc" v-html="item.desc"></p>
@@ -188,7 +193,6 @@
188
 <script>
193
 <script>
189
 import LoadIng from "./../views/loading.vue";
194
 import LoadIng from "./../views/loading.vue";
190
 import PrompTing from "./../views/prompting.vue";
195
 import PrompTing from "./../views/prompting.vue";
191
-import HandlerLog from "./../views/handlerLog.vue";
192
 export default {
196
 export default {
193
   data() {
197
   data() {
194
     return {
198
     return {
@@ -221,7 +225,6 @@ export default {
221
   components: {
225
   components: {
222
     LoadIng,
226
     LoadIng,
223
     PrompTing,
227
     PrompTing,
224
-    HandlerLog
225
   },
228
   },
226
   methods: {
229
   methods: {
227
     //   获取事件数据
230
     //   获取事件数据
@@ -240,6 +243,7 @@ export default {
240
           that.model = res.data.model;
243
           that.model = res.data.model;
241
           //seimin
244
           //seimin
242
           localStorage.setItem('modelData',JSON.stringify(that.model))
245
           localStorage.setItem('modelData',JSON.stringify(that.model))
246
+          that.getProgressInfo();
243
         });
247
         });
244
     },
248
     },
245
     // 获取图片
249
     // 获取图片
@@ -268,7 +272,31 @@ export default {
268
         .then(function(res) {
272
         .then(function(res) {
269
           console.log(res.data);
273
           console.log(res.data);
270
           that.progressInfo = res.data.data;
274
           that.progressInfo = res.data.data;
271
-          that.progressInfo.reverse();
275
+          //处理日志startcaca
276
+          if(that.model.incident.handlerLogs){
277
+            //添加日志
278
+            that.model.incident.handlerLogs.forEach(v=>{
279
+              that.progressInfo.push({startTime:v.opTime,endTime:1,desc:v.opValue,userName:v.userName,activityName:'事件处理'});
280
+            })
281
+
282
+          }
283
+          //处理数据
284
+          that.progressInfo.forEach((v)=>{
285
+            if(!v.endTime){
286
+              v.endTime = 1;
287
+            }
288
+            v.startTime = new Date(v.startTime).getTime();
289
+          })
290
+          var kaishi = that.progressInfo.shift();
291
+          var jiedan = that.progressInfo.shift();
292
+          that.progressInfo.sort(function(o,c){
293
+            return c.startTime - o.startTime;
294
+          });
295
+          that.progressInfo.length && (that.progressInfo[0].endTime = '');
296
+          that.progressInfo.push(jiedan);
297
+          that.progressInfo.push(kaishi);
298
+          console.log(that.progressInfo)
299
+        //处理日志end
272
         });
300
         });
273
     },
301
     },
274
     //隐藏显示详情
302
     //隐藏显示详情
@@ -365,7 +393,7 @@ export default {
365
           .processInstanceId;
393
           .processInstanceId;
366
           this.id=this.$route.params.data?this.$route.params.data.id:JSON.parse(localStorage.getItem("modelData")).incident.id;
394
           this.id=this.$route.params.data?this.$route.params.data.id:JSON.parse(localStorage.getItem("modelData")).incident.id;
367
     this.getParamsData();
395
     this.getParamsData();
368
-    this.getProgressInfo();
396
+
369
     this.getImgs();
397
     this.getImgs();
370
   }
398
   }
371
 };
399
 };
@@ -406,10 +434,10 @@ i.iconfont.blue {
406
     top: 0.88rem;
434
     top: 0.88rem;
407
 
435
 
408
     div {
436
     div {
409
-      width: 25%;
437
+      width: 33.33%;
410
       text-align: center;
438
       text-align: center;
411
       &.p50{
439
       &.p50{
412
-        width: 33.333% ;
440
+        width: 49.99% ;
413
     }
441
     }
414
       a {
442
       a {
415
         display: inline-block;
443
         display: inline-block;
@@ -575,6 +603,7 @@ i.iconfont.blue {
575
               }
603
               }
576
               .text2 {
604
               .text2 {
577
                 color: #666;
605
                 color: #666;
606
+                word-break: break-all;
578
               }
607
               }
579
               p {
608
               p {
580
                 padding: 0;
609
                 padding: 0;

+ 41 - 11
src/views/processing.vue

@@ -15,7 +15,7 @@
15
               >事件信息</a
15
               >事件信息</a
16
             >
16
             >
17
           </div>
17
           </div>
18
-          <div
18
+          <!-- <div
19
             class="fl"
19
             class="fl"
20
             :class="{ p50: modelData.incident.handlerUser.id != loginUser.id }"
20
             :class="{ p50: modelData.incident.handlerUser.id != loginUser.id }"
21
           >
21
           >
@@ -24,7 +24,7 @@
24
               href="javascript:;"
24
               href="javascript:;"
25
               @click="toInfo('handlerLog')"
25
               @click="toInfo('handlerLog')"
26
               >处理日志</a>
26
               >处理日志</a>
27
-          </div>
27
+          </div> -->
28
           <div
28
           <div
29
             class="fl"
29
             class="fl"
30
             :class="{ p50: modelData.incident.handlerUser.id != loginUser.id }"
30
             :class="{ p50: modelData.incident.handlerUser.id != loginUser.id }"
@@ -212,7 +212,7 @@
212
               </p>
212
               </p>
213
             </div>
213
             </div>
214
           </div>
214
           </div>
215
-          <HandlerLog :data="modelData.incident.handlerLogs" id="handlerLog"></HandlerLog>
215
+          <!-- <HandlerLog :data="modelData.incident.handlerLogs" id="handlerLog"></HandlerLog> -->
216
           <div class="label" id="progress">处理进度</div>
216
           <div class="label" id="progress">处理进度</div>
217
           <div
217
           <div
218
             :class="{ progress: true, progressHide: !pro_hides }"
218
             :class="{ progress: true, progressHide: !pro_hides }"
@@ -229,7 +229,12 @@
229
                       'icon-icon_zhengzaijinx': item.endTime == ''
229
                       'icon-icon_zhengzaijinx': item.endTime == ''
230
                     }"
230
                     }"
231
                   ></i>
231
                   ></i>
232
-                  <span class="text1">{{ item.startTime }}</span>
232
+                  <span class="text1">
233
+                    {{ item.startTime | timeFormat("MM-dd HH:mm:ss") }}
234
+                    <template v-if="item.userName">
235
+                      ,{{item.userName}}
236
+                    </template>
237
+                  </span>
233
                 </div>
238
                 </div>
234
                 <div :class="{ cont: true, blue: item.endTime != '' }">
239
                 <div :class="{ cont: true, blue: item.endTime != '' }">
235
                   <p class="text2" v-if="item.desc" v-html="item.desc"></p>
240
                   <p class="text2" v-if="item.desc" v-html="item.desc"></p>
@@ -404,7 +409,7 @@ import DatePicker from "./../components/date-picker.vue";
404
 import CubeExtendPopup from "./../components/extend-popup.vue";
409
 import CubeExtendPopup from "./../components/extend-popup.vue";
405
 import LoadIng from "./../views/loading.vue";
410
 import LoadIng from "./../views/loading.vue";
406
 import PrompTing from "./../views/prompting.vue";
411
 import PrompTing from "./../views/prompting.vue";
407
-import HandlerLog from "./../views/handlerLog.vue";
412
+// import HandlerLog from "./../views/handlerLog.vue";
408
 // import host from '../request/host'
413
 // import host from '../request/host'
409
 
414
 
410
 // 知识库类型
415
 // 知识库类型
@@ -846,7 +851,7 @@ export default {
846
   },
851
   },
847
   components: {
852
   components: {
848
     LoadIng,
853
     LoadIng,
849
-    HandlerLog
854
+    // HandlerLog
850
   },
855
   },
851
   methods: {
856
   methods: {
852
     //获取区域
857
     //获取区域
@@ -915,6 +920,7 @@ export default {
915
           that.modelData = res.data.model;
920
           that.modelData = res.data.model;
916
           //seimin
921
           //seimin
917
           localStorage.setItem("modelData", JSON.stringify(that.modelData));
922
           localStorage.setItem("modelData", JSON.stringify(that.modelData));
923
+
918
         });
924
         });
919
     },
925
     },
920
     // 获取图片
926
     // 获取图片
@@ -1023,7 +1029,30 @@ export default {
1023
         .then(function(res) {
1029
         .then(function(res) {
1024
           console.log(res.data);
1030
           console.log(res.data);
1025
           that.progressInfo = res.data.data;
1031
           that.progressInfo = res.data.data;
1026
-          that.progressInfo.reverse();
1032
+          //处理日志startcaca
1033
+          if(that.modelData.incident.handlerLogs){
1034
+            //添加日志
1035
+            that.modelData.incident.handlerLogs.forEach(v=>{
1036
+              that.progressInfo.push({startTime:v.opTime,endTime:1,desc:v.opValue,userName:v.userName,activityName:'事件处理'});
1037
+            })
1038
+          }
1039
+          //处理数据
1040
+          that.progressInfo.forEach((v)=>{
1041
+            if(!v.endTime){
1042
+              v.endTime = 1;
1043
+            }
1044
+            v.startTime = new Date(v.startTime).getTime();
1045
+          })
1046
+          var kaishi = that.progressInfo.shift();
1047
+          var jiedan = that.progressInfo.shift();
1048
+          that.progressInfo.sort(function(o,c){
1049
+            return c.startTime - o.startTime;
1050
+          });
1051
+          that.progressInfo.length && (that.progressInfo[0].endTime = '');;
1052
+          that.progressInfo.push(jiedan);
1053
+          that.progressInfo.push(kaishi);
1054
+          console.log(that.progressInfo)
1055
+        //处理日志end
1027
         });
1056
         });
1028
     },
1057
     },
1029
     //隐藏显示详情
1058
     //隐藏显示详情
@@ -1215,6 +1244,7 @@ export default {
1215
           localStorage.getItem("selectedCategoryTxt")
1244
           localStorage.getItem("selectedCategoryTxt")
1216
         );
1245
         );
1217
       }
1246
       }
1247
+      that.getProgressInfo();
1218
     },
1248
     },
1219
     // 事件分类
1249
     // 事件分类
1220
     showCategoryPicker() {
1250
     showCategoryPicker() {
@@ -1668,7 +1698,6 @@ export default {
1668
 
1698
 
1669
     this.action.target += this.processInstanceId;
1699
     this.action.target += this.processInstanceId;
1670
     this.getParamsData();
1700
     this.getParamsData();
1671
-    this.getProgressInfo();
1672
     this.getImgs();
1701
     this.getImgs();
1673
     // 处理方式
1702
     // 处理方式
1674
     this.getHandleCategory();
1703
     this.getHandleCategory();
@@ -1713,7 +1742,7 @@ export default {
1713
     CubeExtendPopup,
1742
     CubeExtendPopup,
1714
     LoadIng,
1743
     LoadIng,
1715
     PrompTing,
1744
     PrompTing,
1716
-    HandlerLog
1745
+    // HandlerLog
1717
   }
1746
   }
1718
 };
1747
 };
1719
 </script>
1748
 </script>
@@ -1888,10 +1917,10 @@ i.iconfont.blue {
1888
     top: 0.88rem;
1917
     top: 0.88rem;
1889
     z-index: 9;
1918
     z-index: 9;
1890
     div {
1919
     div {
1891
-      width: 25%;
1920
+      width: 33.33%;
1892
       text-align: center;
1921
       text-align: center;
1893
       &.p50 {
1922
       &.p50 {
1894
-        width: 33.33%;
1923
+        width: 49.99%;
1895
       }
1924
       }
1896
       a {
1925
       a {
1897
         display: inline-block;
1926
         display: inline-block;
@@ -2057,6 +2086,7 @@ i.iconfont.blue {
2057
               }
2086
               }
2058
               .text2 {
2087
               .text2 {
2059
                 color: #666;
2088
                 color: #666;
2089
+                word-break: break-all;
2060
               }
2090
               }
2061
               p {
2091
               p {
2062
                 padding: 0;
2092
                 padding: 0;

+ 39 - 9
src/views/solved.vue

@@ -20,14 +20,14 @@
20
               >处理信息</a
20
               >处理信息</a
21
             >
21
             >
22
           </div>
22
           </div>
23
-          <div class="fl">
23
+          <!-- <div class="fl">
24
             <a
24
             <a
25
               :class="{ active: actives == 'handlerLog' }"
25
               :class="{ active: actives == 'handlerLog' }"
26
               href="javascript:;"
26
               href="javascript:;"
27
               @click="toInfo('handlerLog')"
27
               @click="toInfo('handlerLog')"
28
               >处理日志</a
28
               >处理日志</a
29
             >
29
             >
30
-          </div>
30
+          </div> -->
31
           <div class="fl">
31
           <div class="fl">
32
             <a
32
             <a
33
               :class="{ active: actives == 'progress' }"
33
               :class="{ active: actives == 'progress' }"
@@ -234,7 +234,7 @@
234
                 <span class="fl">转派原因</span>
234
                 <span class="fl">转派原因</span>
235
                 <span class="fr" >{{model.transferReason}}</span>
235
                 <span class="fr" >{{model.transferReason}}</span>
236
               </p> -->
236
               </p> -->
237
-          <HandlerLog :data="model.incident.handlerLogs" id="handlerLog"></HandlerLog>
237
+          <!-- <HandlerLog :data="model.incident.handlerLogs" id="handlerLog"></HandlerLog> -->
238
           <div class="label" id="progress">处理进度</div>
238
           <div class="label" id="progress">处理进度</div>
239
           <div
239
           <div
240
             :class="{ progress: true, progressHide: !pro_hides }"
240
             :class="{ progress: true, progressHide: !pro_hides }"
@@ -251,7 +251,12 @@
251
                       'icon-icon_zhengzaijinx': item.endTime == ''
251
                       'icon-icon_zhengzaijinx': item.endTime == ''
252
                     }"
252
                     }"
253
                   ></i>
253
                   ></i>
254
-                  <span class="text1">{{ item.startTime }}</span>
254
+                  <span class="text1">
255
+                    {{ item.startTime | timeFormat("MM-dd HH:mm:ss") }}
256
+                    <template v-if="item.userName">
257
+                      ,{{item.userName}}
258
+                    </template>
259
+                  </span>
255
                 </div>
260
                 </div>
256
                 <div :class="{ cont: true, blue: item.endTime != '' }">
261
                 <div :class="{ cont: true, blue: item.endTime != '' }">
257
                   <p class="text2" v-if="item.desc" v-html="item.desc"></p>
262
                   <p class="text2" v-if="item.desc" v-html="item.desc"></p>
@@ -313,7 +318,7 @@
313
 </template>
318
 </template>
314
 <script>
319
 <script>
315
 import LoadIng from "./../views/loading.vue";
320
 import LoadIng from "./../views/loading.vue";
316
-import HandlerLog from "./../views/handlerLog.vue";
321
+// import HandlerLog from "./../views/handlerLog.vue";
317
 export default {
322
 export default {
318
   data() {
323
   data() {
319
     return {
324
     return {
@@ -349,7 +354,7 @@ export default {
349
   },
354
   },
350
   components: {
355
   components: {
351
     LoadIng,
356
     LoadIng,
352
-    HandlerLog
357
+    // HandlerLog
353
   },
358
   },
354
   methods: {
359
   methods: {
355
     //   获取事件数据
360
     //   获取事件数据
@@ -371,6 +376,7 @@ export default {
371
           that.model.msgflag = "已解决";
376
           that.model.msgflag = "已解决";
372
           //seimin
377
           //seimin
373
           localStorage.setItem("modelData", JSON.stringify(that.model));
378
           localStorage.setItem("modelData", JSON.stringify(that.model));
379
+          that.getProgressInfo();
374
         });
380
         });
375
     },
381
     },
376
     // 获取图片
382
     // 获取图片
@@ -399,7 +405,30 @@ export default {
399
         .then(function(res) {
405
         .then(function(res) {
400
           console.log(res.data);
406
           console.log(res.data);
401
           that.progressInfo = res.data.data;
407
           that.progressInfo = res.data.data;
402
-          that.progressInfo.reverse();
408
+          //处理日志startcaca
409
+          if(that.model.incident.handlerLogs){
410
+            //添加日志
411
+            that.model.incident.handlerLogs.forEach(v=>{
412
+              that.progressInfo.push({startTime:v.opTime,endTime:1,desc:v.opValue,userName:v.userName,activityName:'事件处理'});
413
+            })
414
+          }
415
+          //处理数据
416
+          that.progressInfo.forEach((v)=>{
417
+            if(!v.endTime){
418
+              v.endTime = 1;
419
+            }
420
+            v.startTime = new Date(v.startTime).getTime();
421
+          })
422
+          var kaishi = that.progressInfo.shift();
423
+          var jiedan = that.progressInfo.shift();
424
+          that.progressInfo.sort(function(o,c){
425
+            return c.startTime - o.startTime;
426
+          });
427
+          that.progressInfo.length && (that.progressInfo[0].endTime = '');;
428
+          that.progressInfo.push(jiedan);
429
+          that.progressInfo.push(kaishi);
430
+          console.log(that.progressInfo)
431
+        //处理日志end
403
         });
432
         });
404
     },
433
     },
405
     // 获取结果类型
434
     // 获取结果类型
@@ -540,7 +569,7 @@ export default {
540
       ? this.$route.params.data.id
569
       ? this.$route.params.data.id
541
       : JSON.parse(localStorage.getItem("modelData")).incident.id;
570
       : JSON.parse(localStorage.getItem("modelData")).incident.id;
542
     this.getParamsData();
571
     this.getParamsData();
543
-    this.getProgressInfo();
572
+
544
     this.getImgs();
573
     this.getImgs();
545
     this.getHandlerRes();
574
     this.getHandlerRes();
546
     this.getDegree();
575
     this.getDegree();
@@ -587,7 +616,7 @@ i.iconfont {
587
     position: fixed;
616
     position: fixed;
588
     top: 0.88rem;
617
     top: 0.88rem;
589
     div {
618
     div {
590
-      width: 25%;
619
+      width: 33.33%;
591
       text-align: center;
620
       text-align: center;
592
       a {
621
       a {
593
         display: inline-block;
622
         display: inline-block;
@@ -776,6 +805,7 @@ i.iconfont {
776
               }
805
               }
777
               .text2 {
806
               .text2 {
778
                 color: #666;
807
                 color: #666;
808
+                word-break: break-all;
779
               }
809
               }
780
               p {
810
               p {
781
                 padding: 0;
811
                 padding: 0;