处理日志界面修改

src/views/againAssign.vue

@@ -114,6 +114,18 @@
               <span class="fl">逾期解决时间</span>
               <span class="fr">{{ model.incident.overdueTime }}</span>
             </p>
+            <p>
+                <span class="fl">区域</span>
+                <span class="fr">{{
+                  model.incident.place ? model.incident.place.area.area : "--"
+                }}</span>
+              </p>
+              <p>
+                <span class="fl">地点</span>
+                <span class="fr">{{
+                  model.incident.place ? model.incident.place.place : "--"
+                }}</span>
+              </p>
           </div>
           <p class="info_hide">
             <span class="fl hide" @click="hides()" v-if="!item_hides"
@@ -163,11 +175,16 @@
                   <i
                     :class="{
                       iconfont: true,
-                      'icon-icon_weizuo': item.endTime != '',
-                      'icon-icon_zhengzaijinx': item.endTime == ''
+                      'dsit-icon_weizuo': item.endTime != '',
+                      'dsit-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.userName">
+                        ，{{item.userName}}
+                      </template>
+                      </span>
                 </div>
                 <div :class="{ cont: true, blue: item.endTime != '' }">
                   <p class="text2" v-if="item.desc" v-html="item.desc"></p>
@@ -274,6 +291,7 @@ export default {
         .then(function(res) {
           console.log(res.data);
           that.model = res.data.model;
+          that.getProgressInfo();
         });
     },
     // 获取图片
@@ -302,7 +320,31 @@ export default {
         .then(function(res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
-          that.progressInfo.reverse();
+          //处理日志startcaca
+          if(that.model.incident.handlerLogs){
+            //添加日志
+            that.model.incident.handlerLogs.forEach(v=>{
+              that.progressInfo.push({startTime:v.opTime,endTime:1,desc:v.opValue,userName:v.userName,activityName:'事件处理'});
+            })
+
+          }
+          //处理数据
+          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
         });
     },
     //隐藏显示详情
@@ -434,7 +476,6 @@ export default {
     this.processInstanceId = this.$route.params.data.processInstanceId;
     this.id = this.$route.params.data.id;
     this.getParamsData();
-    this.getProgressInfo();
     this.getImgs();
     this.getHandlerUser();
     this.getCandidateGroups();
@@ -619,10 +660,10 @@ i.iconfont.blue {
               .time {
                 i {
                   margin-left: -0.15rem;
-                  &.icon-icon_weizuo {
+                  &.dsit-icon_weizuo {
                     color: #005495;
                   }
-                  &.icon-icon_zhengzaijinx {
+                  &.dsit-icon_zhengzaijinx {
                     color: #48a843;
                     font-size: 0.37rem;
                   }
@@ -645,6 +686,7 @@ i.iconfont.blue {
               }
               .text2 {
                 color: #666;
+                word-break: break-all;
               }
               p {
                 padding: 0;

src/views/closed.vue

@@ -20,14 +20,14 @@
               >处理信息</a
             >
           </div>
-          <div class="fl">
+          <!-- <div class="fl">
             <a
               :class="{ active: actives == 'handlerLog' }"
               href="javascript:;"
               @click="toInfo('handlerLog')"
               >处理日志</a
             >
-          </div>
+          </div> -->
           <div class="fl">
             <a
               :class="{ active: actives == 'closeInfo' }"
@@ -216,7 +216,7 @@
               >隐藏详情<<</span
             >
           </p>
-          <HandlerLog :data="model.incident.handlerLogs" id="handlerLog"></HandlerLog>
+          <!-- <HandlerLog :data="model.incident.handlerLogs" id="handlerLog"></HandlerLog> -->
           <div class="label" id="closeInfo">关单信息</div>
           <p>
             <span class="fl">是否已解决</span>
@@ -255,11 +255,16 @@
                   <i
                     :class="{
                       iconfont: true,
-                      'icon-icon_weizuo': item.endTime != '',
-                      'icon-icon_zhengzaijinx': item.endTime == ''
+                      'dsit-icon_weizuo': item.endTime != '',
+                      'dsit-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.userName">
+                        ，{{item.userName}}
+                      </template>
+                      </span>
                 </div>
                 <div :class="{ cont: true, blue: item.endTime != '' }">
                   <p class="text2" v-if="item.desc" v-html="item.desc"></p>
@@ -280,7 +285,7 @@
 </template>
 <script>
 import LoadIng from "./../views/loading.vue";
-import HandlerLog from "./../views/handlerLog.vue";
+// import HandlerLog from "./../views/handlerLog.vue";
 export default {
   data() {
     return {
@@ -311,7 +316,7 @@ export default {
   },
   components: {
     LoadIng,
-    HandlerLog
+    // HandlerLog
   },
   methods: {
     //   获取事件数据
@@ -332,6 +337,7 @@ export default {
           that.model = res.data.model;
           //seimin
           localStorage.setItem("modelData", JSON.stringify(that.model));
+          that.getProgressInfo();
         });
     },
     // 获取图片
@@ -360,7 +366,31 @@ export default {
         .then(function(res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
-          that.progressInfo.reverse();
+          //处理日志startcaca
+          if(that.model.incident.handlerLogs){
+            //添加日志
+            that.model.incident.handlerLogs.forEach(v=>{
+              that.progressInfo.push({startTime:v.opTime,endTime:1,desc:v.opValue,userName:v.userName,activityName:'事件处理'});
+            })
+
+          }
+          //处理数据
+          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
         });
     },
     //隐藏显示详情
@@ -409,7 +439,6 @@ export default {
       ? this.$route.params.data.id
       : JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
-    this.getProgressInfo();
     this.getImgs();
   }
 };
@@ -454,7 +483,7 @@ i.iconfont {
     position: fixed;
     top: 0.88rem;
     div {
-      width: 20%;
+      width: 25%;
       text-align: center;
       a {
         display: inline-block;
@@ -598,10 +627,10 @@ i.iconfont {
               .time {
                 i {
                   margin-left: -0.15rem;
-                  &.icon-icon_weizuo {
+                  &.dsit-icon_weizuo {
                     color: #005495;
                   }
-                  &.icon-icon_zhengzaijinx {
+                  &.dsit-icon_zhengzaijinx {
                     color: #48a843;
                     font-size: 0.37rem;
                   }
@@ -624,6 +653,7 @@ i.iconfont {
               }
               .text2 {
                 color: #666;
+                word-break: break-all;
               }
               p {
                 padding: 0;

src/views/grabSheet.vue

@@ -115,6 +115,18 @@
                 <span class="fl">逾期解决时间</span>
                 <span class="fr">{{ model.incident.overdueTime || "" }}</span>
               </p>
+              <p>
+                <span class="fl">区域</span>
+                <span class="fr">{{
+                  model.incident.place ? model.incident.place.area.area : "--"
+                }}</span>
+              </p>
+              <p>
+                <span class="fl">地点</span>
+                <span class="fr">{{
+                  model.incident.place ? model.incident.place.place : "--"
+                }}</span>
+              </p>
             </div>
             <p class="info_hide">
               <span class="fl hide" @click="hides()" v-if="!item_hides"
@@ -157,11 +169,16 @@
                     <i
                       :class="{
                         iconfont: true,
-                        'icon-icon_weizuo': item.endTime != '',
-                        'icon-icon_zhengzaijinx': item.endTime == ''
+                        'dsit-icon_weizuo': item.endTime != '',
+                        'dsit-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.userName">
+                        ，{{item.userName}}
+                      </template>
+                      </span>
                   </div>
                   <div :class="{ cont: true, blue: item.endTime != '' }">
                     <p class="text2" v-if="item.desc" v-html="item.desc"></p>
@@ -244,6 +261,7 @@ export default {
           }
           //seimin
           localStorage.setItem("modelData", JSON.stringify(that.model));
+          that.getProgressInfo();
         });
     },
     // 获取图片
@@ -272,7 +290,31 @@ export default {
         .then(function(res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
-          that.progressInfo.reverse();
+          //处理日志startcaca
+          if(that.model.incident.handlerLogs){
+            //添加日志
+            that.model.incident.handlerLogs.forEach(v=>{
+              that.progressInfo.push({startTime:v.opTime,endTime:1,desc:v.opValue,userName:v.userName,activityName:'事件处理'});
+            })
+
+          }
+          //处理数据
+          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
         });
     },
     //隐藏显示详情
@@ -350,7 +392,6 @@ export default {
       ? this.$route.params.data.id
       : JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
-    this.getProgressInfo();
     this.getImgs();
   }
 };
@@ -535,10 +576,10 @@ export default {
               .time {
                 i {
                   margin-left: -0.15rem;
-                  &.icon-icon_weizuo {
+                  &.dsit-icon_weizuo {
                     color: #005495;
                   }
-                  &.icon-icon_zhengzaijinx {
+                  &.dsit-icon_zhengzaijinx {
                     color: #48a843;
                     font-size: 0.37rem;
                   }
@@ -561,6 +602,7 @@ export default {
               }
               .text2 {
                 color: #666;
+                word-break: break-all;
               }
               p {
                 padding: 0;

src/views/order.vue

@@ -16,7 +16,7 @@
                 >事件信息</a
               >
             </div>
-            <div
+            <!-- <div
               class="fl p50"
               :class="{ p50: model.incident.handlerUser.id != loginUser.id }"
             >
@@ -26,7 +26,7 @@
                 @click="toInfo('handlerLog')"
                 >处理日志</a
               >
-            </div>
+            </div> -->
             <div
               class="fl p50"
               :class="{ p50: model.incident.handlerUser.id != loginUser.id }"
@@ -209,7 +209,7 @@
                 </p>
               </div>
             </div>
-            <HandlerLog :data="model.incident.handlerLogs" id="handlerLog"></HandlerLog>
+            <!-- <HandlerLog :data="model.incident.handlerLogs" id="handlerLog"></HandlerLog> -->
             <div class="label" id="progress">处理进度</div>
             <div
               :class="{ progress: true, progressHide: !pro_hides }"
@@ -222,11 +222,16 @@
                     <i
                       :class="{
                         iconfont: true,
-                        'icon-icon_weizuo': item.endTime != '',
-                        'icon-icon_zhengzaijinx': item.endTime == ''
+                        'dsit-icon_weizuo': item.endTime != '',
+                        'dsit-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.userName">
+                        ，{{item.userName}}
+                      </template>
+                      </span>
                   </div>
                   <div :class="{ cont: true, blue: item.endTime != '' }">
                     <p class="text2" v-if="item.desc" v-html="item.desc"></p>
@@ -272,7 +277,7 @@
 <script>
 import LoadIng from "./../views/loading.vue";
 import PrompTing from "./../views/prompting.vue";
-import HandlerLog from "./../views/handlerLog.vue";
+// import HandlerLog from "./../views/handlerLog.vue";
 export default {
   data() {
     return {
@@ -305,7 +310,7 @@ export default {
   components: {
     LoadIng,
     PrompTing,
-    HandlerLog
+    // HandlerLog
   },
   methods: {
     //   获取事件数据
@@ -326,6 +331,7 @@ export default {
           that.model = res.data.model;
           //seimin
           localStorage.setItem("modelData", JSON.stringify(that.model));
+          that.getProgressInfo();
         });
     },
     // 获取图片
@@ -354,7 +360,31 @@ export default {
         .then(function(res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
-          that.progressInfo.reverse();
+          //处理日志startcaca
+          if(that.model.incident.handlerLogs){
+            //添加日志
+            that.model.incident.handlerLogs.forEach(v=>{
+              that.progressInfo.push({startTime:v.opTime,endTime:1,desc:v.opValue,userName:v.userName,activityName:'事件处理'});
+            })
+
+          }
+          //处理数据
+          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
         });
     },
     //隐藏显示详情
@@ -456,7 +486,6 @@ export default {
       ? this.$route.params.data.id
       : JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
-    this.getProgressInfo();
     this.getImgs();
   }
 };
@@ -497,10 +526,10 @@ i.iconfont.blue {
     top: 0.88rem;
 
     div {
-      width: 25%;
+      width: 33.33%;
       text-align: center;
       &.p50 {
-        width: 33.33%;
+        width: 49.99%;
       }
       a {
         display: inline-block;
@@ -640,10 +669,10 @@ i.iconfont.blue {
               .time {
                 i {
                   margin-left: -0.15rem;
-                  &.icon-icon_weizuo {
+                  &.dsit-icon_weizuo {
                     color: #005495;
                   }
-                  &.icon-icon_zhengzaijinx {
+                  &.dsit-icon_zhengzaijinx {
                     color: #48a843;
                     font-size: 0.37rem;
                   }
@@ -666,6 +695,7 @@ i.iconfont.blue {
               }
               .text2 {
                 color: #666;
+                word-break: break-all;
               }
               p {
                 padding: 0;

src/views/processing.vue

@@ -15,7 +15,7 @@
               >事件信息</a
             >
           </div>
-          <div
+          <!-- <div
             class="fl p50"
             :class="{ p50: modelData.incident.handlerUser.id != loginUser.id }"
           >
@@ -25,7 +25,7 @@
               @click="toInfo('handlerLog')"
               >处理日志</a
             >
-          </div>
+          </div> -->
           <div
             class="fl p50"
             :class="{ p50: modelData.incident.handlerUser.id != loginUser.id }"
@@ -197,7 +197,7 @@
               </p>
             </div>
           </div>
-          <HandlerLog :data="modelData.incident.handlerLogs" id="handlerLog"></HandlerLog>
+          <!-- <HandlerLog :data="modelData.incident.handlerLogs" id="handlerLog"></HandlerLog> -->
           <div class="label" id="progress">处理进度</div>
           <div
             :class="{ progress: true, progressHide: !pro_hides }"
@@ -210,11 +210,16 @@
                   <i
                     :class="{
                       iconfont: true,
-                      'icon-icon_weizuo': item.endTime != '',
-                      'icon-icon_zhengzaijinx': item.endTime == ''
+                      'dsit-icon_weizuo': item.endTime != '',
+                      'dsit-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.userName">
+                      ，{{item.userName}}
+                    </template>
+                  </span>
                 </div>
                 <div :class="{ cont: true, blue: item.endTime != '' }">
                   <p class="text2" v-if="item.desc" v-html="item.desc"></p>
@@ -369,7 +374,7 @@ import CubeButtonGroup from "./../components/cube-button-group.vue";
 import DatePicker from "./../components/date-picker.vue";
 import CubeExtendPopup from "./../components/extend-popup.vue";
 import LoadIng from "./../views/loading.vue";
-import HandlerLog from "./../views/handlerLog.vue";
+// import HandlerLog from "./../views/handlerLog.vue";
 import PrompTing from "./../views/prompting.vue";
 // import host from '../request/host'
 
@@ -799,7 +804,7 @@ export default {
   },
   components: {
     LoadIng,
-    HandlerLog
+    // HandlerLog
   },
   methods: {
     //获取区域
@@ -976,7 +981,30 @@ export default {
         .then(function(res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
-          that.progressInfo.reverse();
+          //处理日志startcaca
+          if(that.modelData.incident.handlerLogs){
+            //添加日志
+            that.modelData.incident.handlerLogs.forEach(v=>{
+              that.progressInfo.push({startTime:v.opTime,endTime:1,desc:v.opValue,userName:v.userName,activityName:'事件处理'});
+            })
+          }
+          //处理数据
+          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
         });
     },
     //隐藏显示详情
@@ -1168,6 +1196,7 @@ export default {
           localStorage.getItem("selectedCategoryTxt")
         );
       }
+      that.getProgressInfo();
     },
     // 事件分类
     showCategoryPicker() {
@@ -1606,7 +1635,6 @@ export default {
 
     this.action.target += this.processInstanceId;
     this.getParamsData();
-    this.getProgressInfo();
     this.getImgs();
     // 处理方式
     this.getHandleCategory();
@@ -1650,7 +1678,7 @@ export default {
     // JsonView
     CubeExtendPopup,
     LoadIng,
-    HandlerLog,
+    // HandlerLog,
     PrompTing
   }
 };
@@ -1826,10 +1854,10 @@ i.iconfont.blue {
     top: 0.88rem;
     z-index: 9;
     div {
-      width: 25%;
+      width: 33.33%;
       text-align: center;
       &.p50 {
-        width: 33.33%;
+        width: 49.99%;
       }
       a {
         display: inline-block;
@@ -1969,10 +1997,10 @@ i.iconfont.blue {
               .time {
                 i {
                   margin-left: -0.15rem;
-                  &.icon-icon_weizuo {
+                  &.dsit-icon_weizuo {
                     color: #005495;
                   }
-                  &.icon-icon_zhengzaijinx {
+                  &.dsit-icon_zhengzaijinx {
                     color: #48a843;
                     font-size: 0.37rem;
                   }
@@ -1995,6 +2023,7 @@ i.iconfont.blue {
               }
               .text2 {
                 color: #666;
+                word-break: break-all;
               }
               p {
                 padding: 0;

src/views/prompting.vue

@@ -1,7 +1,7 @@
 <template>
     <div id="fade" class="bgColor">
         <div class="success" v-if="status">
-            <i class="iconfont icon-icon_zhengzaijinx"></i>
+            <i class="iconfont dsit-icon_zhengzaijinx"></i>
             <span class="conentBox">成功提示:<span class="conent">{{conents}}</span></span>
         </div>
         <div class="error" v-else>
@@ -41,7 +41,7 @@ export default {
     line-height: .64rem;
     padding: 0 .24rem;
     background-color: #bae6b8;
-    z-index: 99999 
+    z-index: 99999
 }
 .success i{
     font-size: .35rem;
@@ -88,4 +88,4 @@ export default {
     color: rgb(153,31,0);
     font-weight: bold
 }
-</style>
+</style>

src/views/solved.vue

@@ -20,14 +20,14 @@
               >处理信息</a
             >
           </div>
-          <div class="fl">
+          <!-- <div class="fl">
             <a
               :class="{ active: actives == 'handlerLog' }"
               href="javascript:;"
               @click="toInfo('handlerLog')"
               >处理日志</a
             >
-          </div>
+          </div> -->
           <div class="fl">
             <a
               :class="{ active: actives == 'progress' }"
@@ -220,7 +220,7 @@
                 <span class="fl">转派原因</span>
                 <span class="fr" >{{model.transferReason}}</span>
               </p> -->
-          <HandlerLog :data="model.incident.handlerLogs" id="handlerLog"></HandlerLog>
+          <!-- <HandlerLog :data="model.incident.handlerLogs" id="handlerLog"></HandlerLog> -->
           <div class="label" id="progress">处理进度</div>
           <div
             :class="{ progress: true, progressHide: !pro_hides }"
@@ -233,11 +233,16 @@
                   <i
                     :class="{
                       iconfont: true,
-                      'icon-icon_weizuo': item.endTime != '',
-                      'icon-icon_zhengzaijinx': item.endTime == ''
+                      'dsit-icon_weizuo': item.endTime != '',
+                      'dsit-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.userName">
+                        ，{{item.userName}}
+                      </template>
+                      </span>
                 </div>
                 <div :class="{ cont: true, blue: item.endTime != '' }">
                   <p class="text2" v-if="item.desc" v-html="item.desc"></p>
@@ -300,7 +305,7 @@
 </template>
 <script>
 import LoadIng from "./../views/loading.vue";
-import HandlerLog from "./../views/handlerLog.vue";
+// import HandlerLog from "./../views/handlerLog.vue";
 export default {
   data() {
     return {
@@ -336,7 +341,7 @@ export default {
   },
   components: {
     LoadIng,
-    HandlerLog
+    // HandlerLog
   },
   methods: {
     //   获取事件数据
@@ -358,6 +363,7 @@ export default {
           that.model.msgflag = "已解决";
           //seimin
           localStorage.setItem("modelData", JSON.stringify(that.model));
+          that.getProgressInfo();
         });
     },
     // 获取图片
@@ -386,7 +392,31 @@ export default {
         .then(function(res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
-          that.progressInfo.reverse();
+          //处理日志startcaca
+          if(that.model.incident.handlerLogs){
+            //添加日志
+            that.model.incident.handlerLogs.forEach(v=>{
+              that.progressInfo.push({startTime:v.opTime,endTime:1,desc:v.opValue,userName:v.userName,activityName:'事件处理'});
+            })
+
+          }
+          //处理数据
+          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
         });
     },
     // 获取结果类型
@@ -527,7 +557,6 @@ export default {
       ? this.$route.params.data.id
       : JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
-    this.getProgressInfo();
     this.getImgs();
     this.getHandlerRes();
     this.getDegree();
@@ -574,10 +603,10 @@ i.iconfont {
     position: fixed;
     top: 0.88rem;
     div {
-      width: 25%;
+      width: 33.33%;
       text-align: center;
       &.p50 {
-        width: 33.33%;
+        width: 49.99%;
       }
       a {
         display: inline-block;
@@ -740,10 +769,10 @@ i.iconfont {
               .time {
                 i {
                   margin-left: -0.15rem;
-                  &.icon-icon_weizuo {
+                  &.dsit-icon_weizuo {
                     color: #005495;
                   }
-                  &.icon-icon_zhengzaijinx {
+                  &.dsit-icon_zhengzaijinx {
                     color: #48a843;
                     font-size: 0.37rem;
                   }
@@ -766,6 +795,7 @@ i.iconfont {
               }
               .text2 {
                 color: #666;
+                word-break: break-all;
               }
               p {
                 padding: 0;