处理日志界面修改

src/views/againAssign.vue

@@ -128,6 +128,14 @@
               <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"
@@ -181,7 +189,12 @@
                       '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.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>
@@ -288,6 +301,7 @@ export default {
         .then(function(res) {
           console.log(res.data);
           that.model = res.data.model;
+          that.getProgressInfo();
         });
     },
     // 获取图片
@@ -316,7 +330,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
         });
     },
     //隐藏显示详情
@@ -448,7 +486,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();
@@ -656,6 +693,7 @@ i.iconfont.blue {
               }
               .text2 {
                 color: #666;
+                word-break: break-all;
               }
               p {
                 padding: 0;

src/views/closed.vue

@@ -265,7 +265,12 @@
                       '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.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>
@@ -336,6 +341,7 @@ export default {
           that.model = res.data.model;
           //seimin
           localStorage.setItem("modelData", JSON.stringify(that.model));
+          that.getProgressInfo();
         });
     },
     // 获取图片
@@ -364,7 +370,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
         });
     },
     //隐藏显示详情
@@ -413,7 +443,6 @@ export default {
       ? this.$route.params.data.id
       : JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
-    this.getProgressInfo();
     this.getImgs();
   }
 };
@@ -628,6 +657,7 @@ i.iconfont {
               }
               .text2 {
                 color: #666;
+                word-break: break-all;
               }
               p {
                 padding: 0;

src/views/grabSheet.vue

@@ -94,6 +94,14 @@
                 <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">展开详情 >></span>
@@ -117,7 +125,12 @@
                     <i
                       :class="{'iconfont':true, 'icon-icon_weizuo':item.endTime!='','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.userName">
+                        ，{{item.userName}}
+                      </template>
+                      </span>
                   </div>
                   <div
                     :class="{'cont':true,'blue':item.endTime!='' }"
@@ -198,6 +211,7 @@ export default {
           }
           //seimin
           localStorage.setItem('modelData',JSON.stringify(that.model))
+          that.getProgressInfo();
         });
     },
     // 获取图片
@@ -226,7 +240,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
         });
     },
     //隐藏显示详情
@@ -300,7 +338,6 @@ export default {
           .processInstanceId;
           this.id=this.$route.params.data?this.$route.params.data.id:JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
-    this.getProgressInfo();
     this.getImgs();
   }
 };
@@ -512,6 +549,7 @@ export default {
               }
               .text2 {
                 color: #666;
+                word-break: break-all;
               }
               p {
                 padding: 0;

src/views/order.vue

@@ -15,13 +15,13 @@
                 @click="toInfo('progress')"
               >处理进度</a>
             </div>
-            <div class="fl" :class="{'p50':model.incident.handlerUser.id!=loginUser.id}">
+            <!-- <div class="fl" :class="{'p50':model.incident.handlerUser.id!=loginUser.id}">
               <a
                 :class="{active:actives=='handlerLog'}"
                 href="javascript:;"
                 @click="toInfo('handlerLog')"
               >处理日志</a>
-            </div>
+            </div> -->
             <div class="fl" v-if="model.incident.handlerUser.id==loginUser.id">
               <a :class="{active:actives=='jd'}" href="javascript:;" @click="toInfo('jd')">接单</a>
             </div>
@@ -137,7 +137,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}" id="progressBox">
               <div class="progress_info" v-for="item in progressInfo">
@@ -147,7 +147,12 @@
                     <i
                       :class="{'iconfont':true, 'icon-icon_weizuo':item.endTime!='','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.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>
@@ -188,7 +193,6 @@
 <script>
 import LoadIng from "./../views/loading.vue";
 import PrompTing from "./../views/prompting.vue";
-import HandlerLog from "./../views/handlerLog.vue";
 export default {
   data() {
     return {
@@ -221,7 +225,6 @@ export default {
   components: {
     LoadIng,
     PrompTing,
-    HandlerLog
   },
   methods: {
     //   获取事件数据
@@ -240,6 +243,7 @@ export default {
           that.model = res.data.model;
           //seimin
           localStorage.setItem('modelData',JSON.stringify(that.model))
+          that.getProgressInfo();
         });
     },
     // 获取图片
@@ -268,7 +272,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
         });
     },
     //隐藏显示详情
@@ -365,7 +393,7 @@ export default {
           .processInstanceId;
           this.id=this.$route.params.data?this.$route.params.data.id:JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
-    this.getProgressInfo();
+
     this.getImgs();
   }
 };
@@ -406,10 +434,10 @@ i.iconfont.blue {
     top: 0.88rem;
 
     div {
-      width: 25%;
+      width: 33.33%;
       text-align: center;
       &.p50{
-        width: 33.333% ;
+        width: 49.99% ;
     }
       a {
         display: inline-block;
@@ -575,6 +603,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"
             :class="{ p50: modelData.incident.handlerUser.id != loginUser.id }"
           >
@@ -24,7 +24,7 @@
               href="javascript:;"
               @click="toInfo('handlerLog')"
               >处理日志</a>
-          </div>
+          </div> -->
           <div
             class="fl"
             :class="{ p50: modelData.incident.handlerUser.id != loginUser.id }"
@@ -212,7 +212,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 }"
@@ -229,7 +229,12 @@
                       '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.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>
@@ -404,7 +409,7 @@ import DatePicker from "./../components/date-picker.vue";
 import CubeExtendPopup from "./../components/extend-popup.vue";
 import LoadIng from "./../views/loading.vue";
 import PrompTing from "./../views/prompting.vue";
-import HandlerLog from "./../views/handlerLog.vue";
+// import HandlerLog from "./../views/handlerLog.vue";
 // import host from '../request/host'
 
 // 知识库类型
@@ -846,7 +851,7 @@ export default {
   },
   components: {
     LoadIng,
-    HandlerLog
+    // HandlerLog
   },
   methods: {
     //获取区域
@@ -915,6 +920,7 @@ export default {
           that.modelData = res.data.model;
           //seimin
           localStorage.setItem("modelData", JSON.stringify(that.modelData));
+
         });
     },
     // 获取图片
@@ -1023,7 +1029,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
         });
     },
     //隐藏显示详情
@@ -1215,6 +1244,7 @@ export default {
           localStorage.getItem("selectedCategoryTxt")
         );
       }
+      that.getProgressInfo();
     },
     // 事件分类
     showCategoryPicker() {
@@ -1668,7 +1698,6 @@ export default {
 
     this.action.target += this.processInstanceId;
     this.getParamsData();
-    this.getProgressInfo();
     this.getImgs();
     // 处理方式
     this.getHandleCategory();
@@ -1713,7 +1742,7 @@ export default {
     CubeExtendPopup,
     LoadIng,
     PrompTing,
-    HandlerLog
+    // HandlerLog
   }
 };
 </script>
@@ -1888,10 +1917,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;
@@ -2057,6 +2086,7 @@ i.iconfont.blue {
               }
               .text2 {
                 color: #666;
+                word-break: break-all;
               }
               p {
                 padding: 0;

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' }"
@@ -234,7 +234,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 }"
@@ -251,7 +251,12 @@
                       '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.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>
@@ -313,7 +318,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 {
@@ -349,7 +354,7 @@ export default {
   },
   components: {
     LoadIng,
-    HandlerLog
+    // HandlerLog
   },
   methods: {
     //   获取事件数据
@@ -371,6 +376,7 @@ export default {
           that.model.msgflag = "已解决";
           //seimin
           localStorage.setItem("modelData", JSON.stringify(that.model));
+          that.getProgressInfo();
         });
     },
     // 获取图片
@@ -399,7 +405,30 @@ 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
         });
     },
     // 获取结果类型
@@ -540,7 +569,7 @@ export default {
       ? this.$route.params.data.id
       : JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
-    this.getProgressInfo();
+
     this.getImgs();
     this.getHandlerRes();
     this.getDegree();
@@ -587,7 +616,7 @@ i.iconfont {
     position: fixed;
     top: 0.88rem;
     div {
-      width: 25%;
+      width: 33.33%;
       text-align: center;
       a {
         display: inline-block;
@@ -776,6 +805,7 @@ i.iconfont {
               }
               .text2 {
                 color: #666;
+                word-break: break-all;
               }
               p {
                 padding: 0;