资产新增与展示

src/views/againAssign.vue

@@ -117,7 +117,12 @@
             <p>
               <span class="fl">处理人电话</span>
               <span class="fr" v-if="!model.incident.handlerUser"></span>
-              <span class="fr" v-if="model.incident.handlerUser"><a :href="'tel:' + model.incident.handlerUser.phone"><i class="iconfont icon-shouji"></i>{{model.incident.handlerUser.phone}}</a></span>
+              <span class="fr" v-if="model.incident.handlerUser"
+                ><a :href="'tel:' + model.incident.handlerUser.phone"
+                  ><i class="iconfont icon-shouji"></i
+                  >{{ model.incident.handlerUser.phone }}</a
+                ></span
+              >
             </p>
             <p>
               <span class="fl">优先级</span>
@@ -134,30 +139,38 @@
               <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 class="boeder_B">
-                <span class="fl">地点</span>
-                <span class="fr">{{model.incident.place?model.incident.place.place:'--'}}</span>
-              </p>
-              <div v-if="hcsjList.length">
-                <p>耗材</p>
-                <div class="hcTable">
-                  <table>
-                    <tr>
-                      <td>耗材名称</td>
-                      <td>价格</td>
-                      <td>数量</td>
-                    </tr>
-                    <tr v-for="(item,i) in hcsjList" :key="i">
-                      <td>{{item.consumable.name}}</td>
-                      <td>{{item.extra1}}</td>
-                      <td>{{item.consumablesSum}}</td>
-                    </tr>
-                  </table>
-                </div>
+              <span class="fl">区域</span>
+              <span class="fr">{{
+                model.incident.place ? model.incident.place.area.area : "--"
+              }}</span>
+            </p>
+            <p class="boeder_B">
+              <span class="fl">地点</span>
+              <span class="fr">{{
+                model.incident.place ? model.incident.place.place : "--"
+              }}</span>
+            </p>
+            <div v-if="hcsjList.length">
+              <p>耗材</p>
+              <div class="hcTable">
+                <table>
+                  <tr>
+                    <td>耗材名称</td>
+                    <td>价格</td>
+                    <td>数量</td>
+                  </tr>
+                  <tr v-for="(item, i) in hcsjList" :key="i">
+                    <td>{{ item.consumable.name }}</td>
+                    <td>{{ item.extra1 }}</td>
+                    <td>{{ item.consumablesSum }}</td>
+                  </tr>
+                </table>
               </div>
+            </div>
+            <p v-if="wxIncidentWithCmdb == 1">
+              <span class="fl">资产</span>
+              <span class="fr">{{ model.incident.assetId || "无" }}</span>
+            </p>
           </div>
           <p class="info_hide">
             <span class="fl hide" @click="hides()" v-if="!item_hides"
@@ -172,11 +185,11 @@
               <img
                 v-if="
                   img.suffix == 'jpeg' ||
-                    img.suffix == 'jpg' ||
-                    img.suffix == 'gif' ||
-                    img.suffix == 'png' ||
-                    img.suffix == 'svg' ||
-                    img.suffix == 'pdf'
+                  img.suffix == 'jpg' ||
+                  img.suffix == 'gif' ||
+                  img.suffix == 'png' ||
+                  img.suffix == 'svg' ||
+                  img.suffix == 'pdf'
                 "
                 :src="img.previewUrl"
                 v-for="(img, index) in imgs"
@@ -208,15 +221,15 @@
                     :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>
-                      </span>
+                    {{ 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>
@@ -234,13 +247,13 @@
             <div class="form">
               <div class="txtLabel">
                 <div class="txt fl handler">
-                  <span style="color:red;">*</span>是否选择处理人：
+                  <span style="color: red">*</span>是否选择处理人：
                 </div>
                 <cube-switch v-model="handleUserOrGroup"></cube-switch>
               </div>
               <div class="txtLabel" v-if="handleUserOrGroup">
                 <div class="txt fl">
-                  <span style="color:red;">*</span> 处理人:
+                  <span style="color: red">*</span> 处理人:
                 </div>
                 <cube-select
                   class="selectGroup fl"
@@ -252,7 +265,7 @@
               </div>
               <div class="txtLabel" v-if="!handleUserOrGroup">
                 <div class="txt fl">
-                  <span style="color:red;">*</span> 处理组:
+                  <span style="color: red">*</span> 处理组:
                 </div>
                 <cube-select
                   class="selectGroup fl"
@@ -288,7 +301,7 @@ export default {
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
       wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
-      hcsjList:[],//绑定的耗材列表，展示
+      hcsjList: [], //绑定的耗材列表，展示
       promptingConent: "",
       promptingStatus: "",
       item_hides: false,
@@ -302,12 +315,12 @@ export default {
       candidateGroupsArr: [], //处理组
       handlerUser: "", //处理人
       handlerGroup: "", //处理组
-      pro_hides: false //展开/收起处理进度
+      pro_hides: false, //展开/收起处理进度
     };
   },
   components: {
     LoadIng,
-    PrompTing
+    PrompTing,
   },
   methods: {
     // 获取事件上绑定的耗材
@@ -317,7 +330,7 @@ export default {
           data: { type: 2, source: "1627", sourceId: this.id },
         })
         .then((result) => {
-          if(result.data.status == 200){
+          if (result.data.status == 200) {
             this.hcsjList = result.data.data;
           }
         });
@@ -335,9 +348,12 @@ export default {
             that.id,
           {}
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           that.model = res.data.model;
+          if (that.$route.params.data) {
+            that.model.incident.assetId = that.$route.params.data.assetId;
+          }
           that.getProgressInfo();
         });
     },
@@ -350,7 +366,7 @@ export default {
             that.processInstanceId,
           {}
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           that.imgs = res.data.data.splice(0, 3);
           console.log(that.imgs);
@@ -364,34 +380,39 @@ export default {
           "/service/bpm/bpm/flowTracingCustom/" + that.processInstanceId,
           {}
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
           //处理日志startcaca
-          if(that.model.incident.handlerLogs){
+          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.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){
+          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){
+          that.progressInfo.sort(function (o, c) {
             return c.startTime - o.startTime;
           });
-          that.progressInfo.length && (that.progressInfo[0].endTime = '');
+          that.progressInfo.length && (that.progressInfo[0].endTime = "");
           that.progressInfo.push(jiedan);
           that.progressInfo.push(kaishi);
-          console.log(that.progressInfo)
-        //处理日志end
+          console.log(that.progressInfo);
+          //处理日志end
         });
     },
     //隐藏显示详情
@@ -403,7 +424,7 @@ export default {
     proHides() {
       if (!this.pro_hides) {
         $("#progressBox").animate({
-          height: $("#progressBox")[0].scrollHeight
+          height: $("#progressBox")[0].scrollHeight,
         });
       } else {
         $("#progressBox").animate({ height: "1.7rem" });
@@ -418,7 +439,7 @@ export default {
           scrollTop:
             $("#" + id).offset().top -
             $(".header")[0].offsetHeight -
-            $(".navBar")[0].offsetHeight
+            $(".navBar")[0].offsetHeight,
         },
         260
       );
@@ -432,14 +453,14 @@ export default {
           sum: 1000,
           user: {
             roledata: { rolecode: "first-line support" },
-            selectType: "1"
-          }
+            selectType: "1",
+          },
         })
-        .then(function(res) {
-          res.data.list.forEach(function(v, i) {
+        .then(function (res) {
+          res.data.list.forEach(function (v, i) {
             that.handlerUserArr.push({
               text: v.name,
-              value: v.id
+              value: v.id,
             });
           });
         });
@@ -451,13 +472,13 @@ export default {
         .post("service/user/data/fetchDataList/group", {
           idx: 0,
           sum: 1000,
-          group: { selectType: "nouser" }
+          group: { selectType: "nouser" },
         })
-        .then(function(res) {
-          res.data.list.forEach(function(v, i) {
+        .then(function (res) {
+          res.data.list.forEach(function (v, i) {
             that.candidateGroupsArr.push({
               text: v.groupName,
-              value: v.id
+              value: v.id,
             });
           });
           console.log(that.candidateGroupsArr);
@@ -473,7 +494,7 @@ export default {
         $("#fade").fadeIn();
         that.promptingConent = "提交失败,请填写必填信息!";
         that.promptingStatus = false;
-        setTimeout(function() {
+        setTimeout(function () {
           $("#fade").fadeOut();
         }, 2000);
       }
@@ -496,7 +517,7 @@ export default {
             that.loginUser.id,
           that.model
         )
-        .then(function(res) {
+        .then(function (res) {
           if (res.data.status == 200) {
             $("#fade").fadeIn();
             that.promptingConent = "恭喜您,提交成功!";
@@ -509,27 +530,27 @@ export default {
                 icon: "cubeic-right",
                 onConfirm: (e, promptValue) => {
                   that.$router.push({ path: "/main" });
-                }
+                },
               })
               .show();
-            setTimeout(function() {
+            setTimeout(function () {
               $("#fade").fadeOut();
             }, 2000);
           }
         });
-    }
+    },
   },
   created() {
     this.processInstanceId = this.$route.params.data.processInstanceId;
     this.id = this.$route.params.data.id;
     this.getParamsData();
     this.getImgs();
-    if(this.incidentWithConsumable == 1){
+    if (this.incidentWithConsumable == 1) {
       this.getHcBySj();
     }
     this.getHandlerUser();
     this.getCandidateGroups();
-  }
+  },
 };
 </script>
 <style lang="less" scoped>

src/views/closed.vue

@@ -125,7 +125,12 @@
             <p>
               <span class="fl">处理人电话</span>
               <span class="fr" v-if="!model.incident.handlerUser"></span>
-              <span class="fr" v-if="model.incident.handlerUser"><a :href="'tel:' + model.incident.handlerUser.phone"><i class="iconfont icon-shouji"></i>{{model.incident.handlerUser.phone}}</a></span>
+              <span class="fr" v-if="model.incident.handlerUser"
+                ><a :href="'tel:' + model.incident.handlerUser.phone"
+                  ><i class="iconfont icon-shouji"></i
+                  >{{ model.incident.handlerUser.phone }}</a
+                ></span
+              >
             </p>
             <p>
               <span class="fl">优先级</span>
@@ -154,22 +159,26 @@
               }}</span>
             </p>
             <div v-if="hcsjList.length">
-                <p>耗材</p>
-                <div class="hcTable">
-                  <table>
-                    <tr>
-                      <td>耗材名称</td>
-                      <td>价格</td>
-                      <td>数量</td>
-                    </tr>
-                    <tr v-for="(item,i) in hcsjList" :key="i">
-                      <td>{{item.consumable.name}}</td>
-                      <td>{{item.extra1}}</td>
-                      <td>{{item.consumablesSum}}</td>
-                    </tr>
-                  </table>
-                </div>
+              <p>耗材</p>
+              <div class="hcTable">
+                <table>
+                  <tr>
+                    <td>耗材名称</td>
+                    <td>价格</td>
+                    <td>数量</td>
+                  </tr>
+                  <tr v-for="(item, i) in hcsjList" :key="i">
+                    <td>{{ item.consumable.name }}</td>
+                    <td>{{ item.extra1 }}</td>
+                    <td>{{ item.consumablesSum }}</td>
+                  </tr>
+                </table>
               </div>
+            </div>
+            <p v-if="wxIncidentWithCmdb == 1">
+              <span class="fl">资产</span>
+              <span class="fr">{{ model.incident.assetId || "无" }}</span>
+            </p>
           </div>
           <p class="info_hide">
             <span class="fl hide" @click="hides()" v-if="!item_hides"
@@ -184,11 +193,11 @@
               <img
                 v-if="
                   img.suffix == 'jpeg' ||
-                    img.suffix == 'jpg' ||
-                    img.suffix == 'gif' ||
-                    img.suffix == 'png' ||
-                    img.suffix == 'svg' ||
-                    img.suffix == 'pdf'
+                  img.suffix == 'jpg' ||
+                  img.suffix == 'gif' ||
+                  img.suffix == 'png' ||
+                  img.suffix == 'svg' ||
+                  img.suffix == 'pdf'
                 "
                 :src="img.previewUrl"
                 v-for="(img, index) in imgs"
@@ -284,15 +293,15 @@
                     :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>
-                      </span>
+                    {{ 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>
@@ -321,17 +330,17 @@ export default {
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
       wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
-      hcsjList:[],//绑定的耗材列表，展示
+      hcsjList: [], //绑定的耗材列表，展示
       selected: 1,
       options: [
         {
           label: "接单",
-          value: 1
+          value: 1,
         },
         {
           label: "关单信息",
-          value: 2
-        }
+          value: 2,
+        },
       ],
       resignComment: "", //重新指派原因
       item_hides: false,
@@ -341,11 +350,11 @@ export default {
       progressInfo: [], //处理进度
       imgs: [], //图片
       model: {}, //提交数据
-      pro_hides: false //展开/收起处理进度
+      pro_hides: false, //展开/收起处理进度
     };
   },
   components: {
-    LoadIng
+    LoadIng,
   },
   methods: {
     // 获取事件上绑定的耗材
@@ -355,7 +364,7 @@ export default {
           data: { type: 2, source: "1627", sourceId: this.id },
         })
         .then((result) => {
-          if(result.data.status == 200){
+          if (result.data.status == 200) {
             this.hcsjList = result.data.data;
           }
         });
@@ -373,9 +382,12 @@ export default {
             that.id,
           {}
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           that.model = res.data.model;
+          if (that.$route.params.data) {
+            that.model.incident.assetId = that.$route.params.data.assetId;
+          }
           //seimin
           localStorage.setItem("modelData", JSON.stringify(that.model));
           that.getProgressInfo();
@@ -390,7 +402,7 @@ export default {
             that.processInstanceId,
           {}
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           that.imgs = res.data.data.splice(0, 3);
           console.log(that.imgs);
@@ -404,34 +416,39 @@ export default {
           "/service/bpm/bpm/flowTracingCustom/" + that.processInstanceId,
           {}
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
           //处理日志startcaca
-          if(that.model.incident.handlerLogs){
+          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.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){
+          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){
+          that.progressInfo.sort(function (o, c) {
             return c.startTime - o.startTime;
           });
-          that.progressInfo.length && (that.progressInfo[0].endTime = '');;
+          that.progressInfo.length && (that.progressInfo[0].endTime = "");
           that.progressInfo.push(jiedan);
           that.progressInfo.push(kaishi);
-          console.log(that.progressInfo)
-        //处理日志end
+          console.log(that.progressInfo);
+          //处理日志end
         });
     },
     //隐藏显示详情
@@ -444,7 +461,7 @@ export default {
     proHides() {
       if (!this.pro_hides) {
         $("#progressBox").animate({
-          height: $("#progressBox")[0].scrollHeight
+          height: $("#progressBox")[0].scrollHeight,
         });
       } else {
         $("#progressBox").animate({ height: "1.7rem" });
@@ -464,11 +481,11 @@ export default {
           scrollTop:
             $("#" + id).offset().top -
             $(".header")[0].offsetHeight -
-            $(".navBar")[0].offsetHeight
+            $(".navBar")[0].offsetHeight,
         },
         260
       );
-    }
+    },
   },
   created() {
     // seimin
@@ -481,10 +498,10 @@ export default {
       : JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
     this.getImgs();
-    if(this.incidentWithConsumable == 1){
+    if (this.incidentWithConsumable == 1) {
       this.getHcBySj();
     }
-  }
+  },
 };
 </script>
 <style lang="less" scoped>

src/views/grabSheet.vue

@@ -1,19 +1,25 @@
 <template>
   <div class="grabSheet">
     <div class="conentBox">
-      <div class="conent" >
+      <div class="conent">
         <div class="header">处理方案</div>
         <div class="box" v-if="model.incident">
           <div class="navBar">
             <div class="fl">
-              <a :class="{active:actives=='info'}" href="javascript:;" @click="toInfo('info')">事件信息</a>
+              <a
+                :class="{ active: actives == 'info' }"
+                href="javascript:;"
+                @click="toInfo('info')"
+                >事件信息</a
+              >
             </div>
             <div class="fl">
               <a
-                :class="{active:actives=='progress'}"
+                :class="{ active: actives == 'progress' }"
                 href="javascript:;"
                 @click="toInfo('progress')"
-              >处理进度</a>
+                >处理进度</a
+              >
             </div>
           </div>
           <div class="label headtop" id="info">事件信息</div>
@@ -22,15 +28,17 @@
             <div class="head">
               <p>
                 <i class="iconfont icon-zuixinbaoxiu newPapir"></i>
-                事件编号：{{model.incident?model.incident.incidentsign:''}}
-                <span
-                  class="fr btn daiqiangdan"
-                >待抢单</span>
+                事件编号：{{
+                  model.incident ? model.incident.incidentsign : ""
+                }}
+                <span class="fr btn daiqiangdan">待抢单</span>
               </p>
             </div>
             <p>
               <span class="fl">事件分类</span>
-              <span class="fr">{{model.incident.category.category||''}}</span>
+              <span class="fr">{{
+                model.incident.category.category || ""
+              }}</span>
             </p>
             <!-- <p>
               <span class="fl">事件主题</span>
@@ -38,33 +46,50 @@
             </p> -->
             <p class="desc">
               <span class="fl">事件描述</span>
-              <span class="fr grayFont" v-html="model.incident.description"></span>
+              <span
+                class="fr grayFont"
+                v-html="model.incident.description"
+              ></span>
             </p>
             <div class="shows" id="shows">
-               <p v-if="valConfig==2">
+              <p v-if="valConfig == 2">
                 <span class="fl">报修科室</span>
-                <span class="fr">{{model.incident.department?model.incident.department.dept:''}}</span>
+                <span class="fr">{{
+                  model.incident.department
+                    ? model.incident.department.dept
+                    : ""
+                }}</span>
+              </p>
+              <p v-if="valConfig == 1">
+                <span class="fl">报修人</span>
+                <span class="fr">{{ model.incident.requester.name }}</span>
+              </p>
+              <p v-if="valConfig == 2">
+                <span class="fl">联系人</span>
+                <span class="fr">{{ model.incident.contacts }}</span>
               </p>
-            <p v-if="valConfig==1">
-              <span class="fl">报修人</span>
-              <span class="fr">{{model.incident.requester.name}}</span>
-            </p>
-            <p v-if="valConfig==2">
-              <span class="fl">联系人</span>
-              <span class="fr">{{model.incident.contacts}}</span>
-            </p>
               <p>
                 <span class="fl">联系电话</span>
-                <span class="fr" v-if="!model.incident.contactsInformation"></span>
-                <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation"><i class="iconfont icon-shouji"></i>{{ model.incident.contactsInformation }}</a></span>
+                <span
+                  class="fr"
+                  v-if="!model.incident.contactsInformation"
+                ></span>
+                <span class="fr" v-if="model.incident.contactsInformation"
+                  ><a :href="'tel:' + model.incident.contactsInformation"
+                    ><i class="iconfont icon-shouji"></i
+                    >{{ model.incident.contactsInformation }}</a
+                  ></span
+                >
               </p>
               <p>
                 <span class="fl">联系地址</span>
-                <span class="fr">{{model.incident.houseNumber||''||''}}</span>
+                <span class="fr">{{
+                  model.incident.houseNumber || "" || ""
+                }}</span>
               </p>
               <p class="boeder_B">
                 <span class="fl">事件来源</span>
-                <span class="fr">{{model.incident.source.name||''}}</span>
+                <span class="fr">{{ model.incident.source.name || "" }}</span>
               </p>
               <!-- <p>
                 <span class="fl">影响度</span>
@@ -76,36 +101,57 @@
               </p> -->
               <p>
                 <span class="fl">受理人</span>
-                <span class="fr">{{model.incident.acceptUser?model.incident.acceptUser.name:''}}</span>
+                <span class="fr">{{
+                  model.incident.acceptUser
+                    ? model.incident.acceptUser.name
+                    : ""
+                }}</span>
               </p>
               <p>
                 <span class="fl">处理人</span>
-                <span class="fr">{{model.incident.handlerUser?model.incident.handlerUser.name:''}}</span>
+                <span class="fr">{{
+                  model.incident.handlerUser
+                    ? model.incident.handlerUser.name
+                    : ""
+                }}</span>
               </p>
               <p>
                 <span class="fl">处理人电话</span>
                 <span class="fr" v-if="!model.incident.handlerUser"></span>
-                <span class="fr" v-if="model.incident.handlerUser"><a :href="'tel:' + model.incident.handlerUser.phone"><i class="iconfont icon-shouji"></i>{{model.incident.handlerUser.phone}}</a></span>
+                <span class="fr" v-if="model.incident.handlerUser"
+                  ><a :href="'tel:' + model.incident.handlerUser.phone"
+                    ><i class="iconfont icon-shouji"></i
+                    >{{ model.incident.handlerUser.phone }}</a
+                  ></span
+                >
               </p>
               <p>
                 <span class="fl">优先级</span>
-                <span class="fr">{{model.incident.priority?model.incident.priority.name:''}}</span>
+                <span class="fr">{{
+                  model.incident.priority ? model.incident.priority.name : ""
+                }}</span>
               </p>
               <p>
                 <span class="fl">逾期响应时间</span>
-                <span class="fr">{{model.incident.overdueResponseDate||''}}</span>
+                <span class="fr">{{
+                  model.incident.overdueResponseDate || ""
+                }}</span>
               </p>
               <p>
                 <span class="fl">逾期解决时间</span>
-                <span class="fr">{{model.incident.overdueTime||''}}</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>
+                <span class="fr">{{
+                  model.incident.place ? model.incident.place.area.area : "--"
+                }}</span>
               </p>
               <p class="boeder_B">
                 <span class="fl">地点</span>
-                <span class="fr">{{model.incident.place?model.incident.place.place:'--'}}</span>
+                <span class="fr">{{
+                  model.incident.place ? model.incident.place.place : "--"
+                }}</span>
               </p>
               <div v-if="hcsjList.length">
                 <p>耗材</p>
@@ -116,54 +162,81 @@
                       <td>价格</td>
                       <td>数量</td>
                     </tr>
-                    <tr v-for="(item,i) in hcsjList" :key="i">
-                      <td>{{item.consumable.name}}</td>
-                      <td>{{item.extra1}}</td>
-                      <td>{{item.consumablesSum}}</td>
+                    <tr v-for="(item, i) in hcsjList" :key="i">
+                      <td>{{ item.consumable.name }}</td>
+                      <td>{{ item.extra1 }}</td>
+                      <td>{{ item.consumablesSum }}</td>
                     </tr>
                   </table>
                 </div>
               </div>
+              <p v-if="wxIncidentWithCmdb == 1">
+                <span class="fl">资产</span>
+                <span class="fr">{{ model.incident.assetId || "无" }}</span>
+              </p>
             </div>
             <p class="info_hide">
-              <span class="fl hide" @click="hides()" v-if="!item_hides">展开详情 >></span>
-              <span class="fl hide" @click="hides()" v-if="item_hides">隐藏详情<<</span>
+              <span class="fl hide" @click="hides()" v-if="!item_hides"
+                >展开详情 >></span
+              >
+              <span class="fl hide" @click="hides()" v-if="item_hides"
+                >隐藏详情<<</span
+              >
             </p>
             <div class="imgs-container" v-if="imgs.length">
               <div class="imgs-cont">
-                <img v-if='img.suffix=="jpeg"||img.suffix=="jpg"||img.suffix=="gif"||img.suffix=="png"||img.suffix=="svg"||img.suffix=="pdf"' :src="img.previewUrl" v-for="(img, index) in imgs" class="imgs">
+                <img
+                  v-if="
+                    img.suffix == 'jpeg' ||
+                    img.suffix == 'jpg' ||
+                    img.suffix == 'gif' ||
+                    img.suffix == 'png' ||
+                    img.suffix == 'svg' ||
+                    img.suffix == 'pdf'
+                  "
+                  :src="img.previewUrl"
+                  v-for="(img, index) in imgs"
+                  class="imgs"
+                />
                 <p v-else>
-                  <a :href='[img.previewUrl]'>{{img.name}}</a>
+                  <a :href="[img.previewUrl]">{{ img.name }}</a>
                 </p>
               </div>
             </div>
 
             <div class="label" id="progress">处理进度</div>
-            <div :class="{'progress':true,'progressHide':!pro_hides}" id="progressBox">
+            <div
+              :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_L">{{ item.activityName }}</div>
                 <div class="progress_info_R">
                   <div class="time">
                     <i
-                      :class="{'iconfont':true, 'icon-icon_weizuo':item.endTime!='','icon-icon_zhengzaijinx':item.endTime=='' }"
+                      :class="{
+                        iconfont: true,
+                        'icon-icon_weizuo': item.endTime != '',
+                        'icon-icon_zhengzaijinx': item.endTime == '',
+                      }"
                     ></i>
                     <span class="text1">
-                      {{item.startTime | timeFormat("MM-dd HH:mm:ss")}}
+                      {{ item.startTime | timeFormat("MM-dd HH:mm:ss") }}
                       <template v-if="item.userName">
-                        ，{{item.userName}}
+                        ，{{ item.userName }}
                       </template>
-                      </span>
+                    </span>
                   </div>
-                  <div
-                    :class="{'cont':true,'blue':item.endTime!='' }"
-                  >
+                  <div :class="{ cont: true, blue: item.endTime != '' }">
                     <p class="text2" v-if="item.desc" v-html="item.desc"></p>
                   </div>
                 </div>
               </div>
             </div>
             <p class="info_hide">
-              <span class="fl hide" @click="proHides()">{{pro_hides?'隐藏详情 <<':'展开详情 >>'}}</span>
+              <span class="fl hide" @click="proHides()">{{
+                pro_hides ? "隐藏详情 <<" : "展开详情 >>"
+              }}</span>
             </p>
           </div>
           <cube-form-group class="sub">
@@ -172,7 +245,7 @@
         </div>
       </div>
 
-        <load-ing v-if="!model.incident"></load-ing>
+      <load-ing v-if="!model.incident"></load-ing>
     </div>
   </div>
 </template>
@@ -181,22 +254,22 @@ import LoadIng from "./../views/loading.vue";
 export default {
   data() {
     return {
-      id:'',
+      id: "",
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
       wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
-      hcsjList:[],//绑定的耗材列表，展示
+      hcsjList: [], //绑定的耗材列表，展示
       selected: 1,
       options: [
         {
           label: "接单",
-          value: 1
+          value: 1,
         },
         {
           label: "重新指派",
-          value: 2
-        }
+          value: 2,
+        },
       ],
       resignComment: "", //重新指派原因
       item_hides: false,
@@ -205,8 +278,8 @@ export default {
       progressInfo: [], //处理进度
       imgs: [], //图片
       model: {}, //提交数据
-      jurisdiction:false,//是否有抢单权限
-      pro_hides:false,//展开/收起处理进度
+      jurisdiction: false, //是否有抢单权限
+      pro_hides: false, //展开/收起处理进度
     };
   },
   methods: {
@@ -217,7 +290,7 @@ export default {
           data: { type: 2, source: "1627", sourceId: this.id },
         })
         .then((result) => {
-          if(result.data.status == 200){
+          if (result.data.status == 200) {
             this.hcsjList = result.data.data;
           }
         });
@@ -225,29 +298,34 @@ export default {
     //   获取事件数据
     getParamsData() {
       var that = this;
-      var groups=[];
-      that.loginUser.group.forEach(element => {
+      var groups = [];
+      that.loginUser.group.forEach((element) => {
         groups.push(element.id);
       });
-      console.log(groups)
+      console.log(groups);
       that.$http
         .get(
           "/service/form/renderForm/receiveform/" +
             that.processInstanceId +
             "/" +
-            that.loginUser.id+'/'+that.id,
+            that.loginUser.id +
+            "/" +
+            that.id,
           {}
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           that.model = res.data.model;
-          for(var i =0;i<groups.length;i++){
-            if(groups[i]==that.model.incident.candidateGroups){
-              that.jurisdiction=true;
+          if (that.$route.params.data) {
+            that.model.incident.assetId = that.$route.params.data.assetId;
+          }
+          for (var i = 0; i < groups.length; i++) {
+            if (groups[i] == that.model.incident.candidateGroups) {
+              that.jurisdiction = true;
             }
           }
           //seimin
-          localStorage.setItem('modelData',JSON.stringify(that.model))
+          localStorage.setItem("modelData", JSON.stringify(that.model));
           that.getProgressInfo();
         });
     },
@@ -260,7 +338,7 @@ export default {
             that.processInstanceId,
           {}
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           that.imgs = res.data.data.splice(0, 3);
           console.log(that.imgs);
@@ -274,34 +352,39 @@ export default {
           "/service/bpm/bpm/flowTracingCustom/" + that.processInstanceId,
           {}
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
           //处理日志startcaca
-          if(that.model.incident.handlerLogs){
+          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.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){
+          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){
+          that.progressInfo.sort(function (o, c) {
             return c.startTime - o.startTime;
           });
-          that.progressInfo.length && (that.progressInfo[0].endTime = '');;
+          that.progressInfo.length && (that.progressInfo[0].endTime = "");
           that.progressInfo.push(jiedan);
           that.progressInfo.push(kaishi);
-          console.log(that.progressInfo)
-        //处理日志end
+          console.log(that.progressInfo);
+          //处理日志end
         });
     },
     //隐藏显示详情
@@ -310,13 +393,15 @@ export default {
       $("#shows").slideToggle();
     },
     // 处理进度隐藏/展开
-    proHides(){
-      if(!this.pro_hides){
-        $('#progressBox').animate({'height':$('#progressBox')[0].scrollHeight})
-      }else{
-        $('#progressBox').animate({'height':'1.7rem'})
+    proHides() {
+      if (!this.pro_hides) {
+        $("#progressBox").animate({
+          height: $("#progressBox")[0].scrollHeight,
+        });
+      } else {
+        $("#progressBox").animate({ height: "1.7rem" });
       }
-      this.pro_hides=!this.pro_hides;
+      this.pro_hides = !this.pro_hides;
     },
     subVali() {
       //数据提交
@@ -326,7 +411,7 @@ export default {
           "service/bpm/bpm/claimAndCompletedTask/" + that.model.incident.taskId,
           { receive_code: "handler", userId: that.loginUser.id }
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           if (res.data.status == 200) {
             $("#fade").fadeIn();
@@ -340,10 +425,10 @@ export default {
                 icon: "cubeic-right",
                 onConfirm: (e, promptValue) => {
                   that.$router.push({ path: "/main" });
-                }
+                },
               })
               .show();
-            setTimeout(function() {
+            setTimeout(function () {
               $("#fade").fadeOut();
             }, 2000);
           }
@@ -357,15 +442,14 @@ export default {
           scrollTop:
             $("#" + id).offset().top -
             $(".header")[0].offsetHeight -
-            $(".navBar")[0].offsetHeight
+            $(".navBar")[0].offsetHeight,
         },
         260
       );
-    }
+    },
   },
   components: {
     LoadIng,
-
   },
   created() {
     // seimin
@@ -373,13 +457,15 @@ export default {
       ? 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.id = this.$route.params.data
+      ? this.$route.params.data.id
+      : JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
     this.getImgs();
-    if(this.incidentWithConsumable == 1){
+    if (this.incidentWithConsumable == 1) {
       this.getHcBySj();
     }
-  }
+  },
 };
 </script>
 <style lang="less" scoped>
@@ -408,10 +494,9 @@ export default {
     top: 0;
     z-index: 6;
   }
-  .box{
+  .box {
     min-height: 9.7rem;
     position: relative;
-
   }
   .navBar {
     width: 100%;
@@ -472,14 +557,14 @@ export default {
         border-bottom: 0.01rem solid #ccc;
       }
       p {
-          &.desc{
-            overflow: hidden;
-          }
-          .grayFont {
-            width: 75%;
-            text-align: right;
-            overflow-x: scroll;
-          }
+        &.desc {
+          overflow: hidden;
+        }
+        .grayFont {
+          width: 75%;
+          text-align: right;
+          overflow-x: scroll;
+        }
       }
       .bottom {
         overflow: hidden;
@@ -518,14 +603,14 @@ export default {
             color: #00559d;
           }
         }
-        .imgs-container{
-          a{
-            color:#03c !important;
-            &:visited{
+        .imgs-container {
+          a {
+            color: #03c !important;
+            &:visited {
               color: #551a8b !important;
             }
           }
-           img {
+          img {
             width: 1.5rem;
             height: 1.5rem;
             margin-right: 0.7rem;
@@ -537,17 +622,17 @@ export default {
         .progress {
           padding: 0.2rem 0.2rem;
           overflow: hidden;
-          transition-duration: .2s;
+          transition-duration: 0.2s;
           transition-timing-function: linear;
-          &.progressHide{
+          &.progressHide {
             height: 1.7rem;
           }
           .progress_info {
             overflow: hidden;
             margin-bottom: 0.1rem;
-            &:nth-last-child(1){
-              .cont{
-                border:none !important;
+            &:nth-last-child(1) {
+              .cont {
+                border: none !important;
               }
             }
             .progress_info_L {

src/views/newIncident.vue

@@ -109,6 +109,13 @@
           :field="fields[10]"
           class="btn_plcaeholde"
         ></cube-form-item>
+        <div class="zc" v-if="wxIncidentWithCmdb == 1">
+          <cube-form-item
+            :field="fields[22]"
+            class="btn_plcaeholde zc-item"
+          ></cube-form-item>
+          <span class="icon dash dash-saoyisao zc-sao" @click="scan()"></span>
+        </div>
         <div class="label" id="handlerInfo">处理信息</div>
         <div class="handleRadio">
           <cube-radio-group
@@ -188,6 +195,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 { SM } from "./../http/http";
 // import host from "../request/host";
 // 知识库类型
 const solution = {
@@ -320,6 +328,8 @@ export default {
       },
       isUploading: false,
       loadShow: false,
+      incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
+      wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       name: "",
@@ -345,6 +355,7 @@ export default {
         houseNumber: "", //详细地址
         description: "", //事件描述
         // bxcode: "",
+        assetId: "", //资产
         category: [],
         source: "", //事件来源
         title: "", //事件主题
@@ -692,7 +703,19 @@ export default {
           rules: {
             required: false
           }
-        }
+        },
+        {
+          type: "input",
+          modelKey: "assetId",
+          label: "资产:",
+          rules: {
+            required: false,
+          },
+          props: {
+            placeholder: "请选择资产",
+            disabled: true,
+          },
+        },
       ]
     };
   },
@@ -706,6 +729,12 @@ export default {
     // }
   },
   methods: {
+    //扫资产
+    scan(){
+      SM(this).then((ress1) => {
+        this.model.assetId = ress1;
+      })
+    },
     // 输入事件描述
     inpTitle() {
       this.model.title = this.incidentTitle;
@@ -922,7 +951,9 @@ export default {
       } else if (that.valConfig == 2) {
         that.modelData.incident.department = that.model.requester;
       }
-
+      if (that.wxIncidentWithCmdb == 1) {
+        that.modelData.incident.assetId = that.model.assetId;
+      }
       that.modelData.incident.area = { id: that.model.areaId };
       that.modelData.incident.place = { id: that.model.placeId };
       that.modelData.incident.category = {
@@ -1025,6 +1056,9 @@ export default {
       if (that.$route.params.data) {
         var inspecInfo = that.$route.params.data;
         // 巡检生成事件
+        if (that.wxIncidentWithCmdb == 1) {
+          that.model.assetId = inspecInfo.assetId;
+        }
         console.log(that.$route.params.abnormal);
         that.model.contacts = inspecInfo.processUser.name;
         that.model.contactsInformation = inspecInfo.processUser.phone
@@ -1639,6 +1673,20 @@ export default {
 }
 </style>
 <style lang="less" scoped>
+.zc{
+  display:flex;
+  position:relative;
+  .zc-item{
+    flex:7;
+  }
+  .zc-sao{
+    flex:3;
+    display:flex;
+    justify-content:center;
+    align-items:center;
+    font-size:0.6rem;
+  }
+}
 .header {
   width: 100%;
   height: 0.88rem;

src/views/order.vue

@@ -5,15 +5,27 @@
         <div class="header">处理方案</div>
         <div v-if="model.incident">
           <div class="navBar">
-            <div class="fl" :class="{'p50':model.incident.handlerUser.id!=loginUser.id}">
-              <a :class="{active:actives=='info'}" href="javascript:;" @click="toInfo('info')">事件信息</a>
+            <div
+              class="fl"
+              :class="{ p50: model.incident.handlerUser.id != loginUser.id }"
+            >
+              <a
+                :class="{ active: actives == 'info' }"
+                href="javascript:;"
+                @click="toInfo('info')"
+                >事件信息</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=='progress'}"
+                :class="{ active: actives == 'progress' }"
                 href="javascript:;"
                 @click="toInfo('progress')"
-              >处理进度</a>
+                >处理进度</a
+              >
             </div>
             <!-- <div class="fl" :class="{'p50':model.incident.handlerUser.id!=loginUser.id}">
               <a
@@ -22,8 +34,16 @@
                 @click="toInfo('handlerLog')"
               >处理日志</a>
             </div> -->
-            <div class="fl" v-if="model.incident.handlerUser.id==loginUser.id">
-              <a :class="{active:actives=='jd'}" href="javascript:;" @click="toInfo('jd')">接单</a>
+            <div
+              class="fl"
+              v-if="model.incident.handlerUser.id == loginUser.id"
+            >
+              <a
+                :class="{ active: actives == 'jd' }"
+                href="javascript:;"
+                @click="toInfo('jd')"
+                >接单</a
+              >
             </div>
           </div>
           <div class="label headtop" id="info">事件信息</div>
@@ -32,15 +52,34 @@
             <div class="head">
               <p>
                 <i class="iconfont icon-zuixinbaoxiu newPapir"></i>
-                事件单号：{{model.incident.incidentsign}}
+                事件单号：{{ model.incident.incidentsign }}
                 <span
-                  :class="{ 'fr':true,'btn':true, 'daijiedan':(model.incident.state.value=='pending'&&model.incident.handlerUser&&!model.incident.candidateGroups), 'daiqiangdan':(model.incident.state.value=='pending'&&!model.incident.handlerUser&&model.incident.candidateGroups)}"
-                >{{model.incident.state.value=='pending'?(model.incident.handlerUser&&!model.incident.candidateGroups?'待接单':'待抢单'):model.incident.state.name}}</span>
+                  :class="{
+                    fr: true,
+                    btn: true,
+                    daijiedan:
+                      model.incident.state.value == 'pending' &&
+                      model.incident.handlerUser &&
+                      !model.incident.candidateGroups,
+                    daiqiangdan:
+                      model.incident.state.value == 'pending' &&
+                      !model.incident.handlerUser &&
+                      model.incident.candidateGroups,
+                  }"
+                  >{{
+                    model.incident.state.value == "pending"
+                      ? model.incident.handlerUser &&
+                        !model.incident.candidateGroups
+                        ? "待接单"
+                        : "待抢单"
+                      : model.incident.state.name
+                  }}</span
+                >
               </p>
             </div>
             <p>
               <span class="fl">事件分类</span>
-              <span class="fr">{{model.incident.category.category}}</span>
+              <span class="fr">{{ model.incident.category.category }}</span>
             </p>
             <!-- <p>
               <span class="fl">事件主题</span>
@@ -48,33 +87,48 @@
             </p> -->
             <p class="desc">
               <span class="fl">事件描述</span>
-              <span class="grayFont fr" v-html="model.incident.description"></span>
+              <span
+                class="grayFont fr"
+                v-html="model.incident.description"
+              ></span>
             </p>
             <div class="shows" id="shows">
-              <p v-if="valConfig==2">
+              <p v-if="valConfig == 2">
                 <span class="fl">报修科室</span>
-                <span class="fr">{{model.incident.department?model.incident.department.dept:''}}</span>
+                <span class="fr">{{
+                  model.incident.department
+                    ? model.incident.department.dept
+                    : ""
+                }}</span>
+              </p>
+              <p v-if="valConfig == 1">
+                <span class="fl">报修人</span>
+                <span class="fr">{{ model.incident.requester.name }}</span>
+              </p>
+              <p v-if="valConfig == 2">
+                <span class="fl">联系人</span>
+                <span class="fr">{{ model.incident.contacts }}</span>
               </p>
-            <p v-if="valConfig==1">
-              <span class="fl">报修人</span>
-              <span class="fr">{{model.incident.requester.name}}</span>
-            </p>
-            <p v-if="valConfig==2">
-              <span class="fl">联系人</span>
-              <span class="fr">{{model.incident.contacts}}</span>
-            </p>
               <p>
                 <span class="fl">联系电话</span>
-                <span class="fr" v-if="!model.incident.contactsInformation"></span>
-                <span class="fr" v-if="model.incident.contactsInformation"><a :href="'tel:' + model.incident.contactsInformation"><i class="iconfont icon-shouji"></i>{{model.incident.contactsInformation}}</a></span>
+                <span
+                  class="fr"
+                  v-if="!model.incident.contactsInformation"
+                ></span>
+                <span class="fr" v-if="model.incident.contactsInformation"
+                  ><a :href="'tel:' + model.incident.contactsInformation"
+                    ><i class="iconfont icon-shouji"></i
+                    >{{ model.incident.contactsInformation }}</a
+                  ></span
+                >
               </p>
               <p>
                 <span class="fl">联系地址</span>
-                <span class="fr">{{model.incident.houseNumber||''}}</span>
+                <span class="fr">{{ model.incident.houseNumber || "" }}</span>
               </p>
               <p class="boeder_B">
                 <span class="fl">事件来源</span>
-                <span class="fr">{{model.incident.source.name}}</span>
+                <span class="fr">{{ model.incident.source.name }}</span>
               </p>
               <!-- <p>
                 <span class="fl">影响度</span>
@@ -86,36 +140,55 @@
               </p> -->
               <p>
                 <span class="fl">受理人</span>
-                <span class="fr">{{model.incident.acceptUser?model.incident.acceptUser.name:''}}</span>
+                <span class="fr">{{
+                  model.incident.acceptUser
+                    ? model.incident.acceptUser.name
+                    : ""
+                }}</span>
               </p>
               <p>
                 <span class="fl">处理人</span>
-                <span class="fr">{{model.incident.handlerUser?model.incident.handlerUser.name:''}}</span>
+                <span class="fr">{{
+                  model.incident.handlerUser
+                    ? model.incident.handlerUser.name
+                    : ""
+                }}</span>
               </p>
               <p>
                 <span class="fl">处理人电话</span>
                 <span class="fr" v-if="!model.incident.handlerUser"></span>
-                <span class="fr" v-if="model.incident.handlerUser"><a :href="'tel:' + model.incident.handlerUser.phone"><i class="iconfont icon-shouji"></i>{{model.incident.handlerUser.phone}}</a></span>
+                <span class="fr" v-if="model.incident.handlerUser"
+                  ><a :href="'tel:' + model.incident.handlerUser.phone"
+                    ><i class="iconfont icon-shouji"></i
+                    >{{ model.incident.handlerUser.phone }}</a
+                  ></span
+                >
               </p>
               <p>
                 <span class="fl">优先级</span>
-                <span class="fr">{{model.incident.priority?model.incident.priority.name:''}}</span>
+                <span class="fr">{{
+                  model.incident.priority ? model.incident.priority.name : ""
+                }}</span>
               </p>
               <p>
                 <span class="fl">逾期响应时间</span>
-                <span class="fr">{{model.incident.overdueResponseDate}}</span>
+                <span class="fr">{{ model.incident.overdueResponseDate }}</span>
               </p>
               <p>
                 <span class="fl">逾期解决时间</span>
-                <span class="fr">{{model.incident.overdueTime}}</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>
+                <span class="fr">{{
+                  model.incident.place ? model.incident.place.area.area : "--"
+                }}</span>
               </p>
               <p class="boeder_B">
                 <span class="fl">地点</span>
-                <span class="fr">{{model.incident.place?model.incident.place.place:'--'}}</span>
+                <span class="fr">{{
+                  model.incident.place ? model.incident.place.place : "--"
+                }}</span>
               </p>
               <div v-if="hcsjList.length">
                 <p>耗材</p>
@@ -126,14 +199,18 @@
                       <td>价格</td>
                       <td>数量</td>
                     </tr>
-                    <tr v-for="(item,i) in hcsjList" :key="i">
-                      <td>{{item.consumable.name}}</td>
-                      <td>{{item.extra1}}</td>
-                      <td>{{item.consumablesSum}}</td>
+                    <tr v-for="(item, i) in hcsjList" :key="i">
+                      <td>{{ item.consumable.name }}</td>
+                      <td>{{ item.extra1 }}</td>
+                      <td>{{ item.consumablesSum }}</td>
                     </tr>
                   </table>
                 </div>
               </div>
+              <p v-if="wxIncidentWithCmdb == 1">
+                <span class="fl">资产</span>
+                <span class="fr">{{ model.incident.assetId || "无" }}</span>
+              </p>
               <!-- <p v-if="model.incident.synergeticReason">
                 <span class="fl" >协同原因</span>
                 <span class="fr">{{model.incident.synergeticReason}}</span>
@@ -148,44 +225,69 @@
               </p> -->
             </div>
             <p class="info_hide">
-              <span class="fl hide" @click="hides()" v-if="!item_hides">展开详情 >></span>
-              <span class="fl hide" @click="hides()" v-if="item_hides">隐藏详情 <<</span>
+              <span class="fl hide" @click="hides()" v-if="!item_hides"
+                >展开详情 >></span
+              >
+              <span class="fl hide" @click="hides()" v-if="item_hides"
+                >隐藏详情 <<</span
+              >
             </p>
             <div class="imgs-container" v-if="imgs.length">
               <div class="imgs-cont">
-                <img v-if='img.suffix=="jpeg"||img.suffix=="jpg"||img.suffix=="gif"||img.suffix=="png"||img.suffix=="svg"||img.suffix=="pdf"' :src="img.previewUrl" v-for="(img, index) in imgs" class="imgs">
+                <img
+                  v-if="
+                    img.suffix == 'jpeg' ||
+                    img.suffix == 'jpg' ||
+                    img.suffix == 'gif' ||
+                    img.suffix == 'png' ||
+                    img.suffix == 'svg' ||
+                    img.suffix == 'pdf'
+                  "
+                  :src="img.previewUrl"
+                  v-for="(img, index) in imgs"
+                  class="imgs"
+                />
                 <p v-else>
-                  <a :href='[img.previewUrl]'>{{img.name}}</a>
+                  <a :href="[img.previewUrl]">{{ img.name }}</a>
                 </p>
               </div>
             </div>
             <!-- <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: 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_L">{{ item.activityName }}</div>
                 <div class="progress_info_R">
                   <div class="time">
                     <i
-                      :class="{'iconfont':true, 'icon-icon_weizuo':item.endTime!='','icon-icon_zhengzaijinx':item.endTime=='' }"
+                      :class="{
+                        iconfont: true,
+                        'icon-icon_weizuo': item.endTime != '',
+                        'icon-icon_zhengzaijinx': item.endTime == '',
+                      }"
                     ></i>
                     <span class="text1">
-                      {{item.startTime | timeFormat("MM-dd HH:mm:ss")}}
+                      {{ item.startTime | timeFormat("MM-dd HH:mm:ss") }}
                       <template v-if="item.userName">
-                        ，{{item.userName}}
+                        ，{{ item.userName }}
                       </template>
-                      </span>
+                    </span>
                   </div>
-                  <div :class="{'cont':true,'blue':item.endTime!='' }">
+                  <div :class="{ cont: true, blue: item.endTime != '' }">
                     <p class="text2" v-if="item.desc" v-html="item.desc"></p>
                   </div>
                 </div>
               </div>
             </div>
             <p class="info_hide">
-              <span class="fl hide" @click="proHides()">{{pro_hides?'隐藏详情 <<':'展开详情 >>'}}</span>
+              <span class="fl hide" @click="proHides()">{{
+                pro_hides ? "隐藏详情 <<" : "展开详情 >>"
+              }}</span>
             </p>
-            <div v-if="model.incident.handlerUser.id==loginUser.id">
+            <div v-if="model.incident.handlerUser.id == loginUser.id">
               <div class="label" id="jd">接单</div>
               <cube-radio-group
                 v-model="selected"
@@ -194,20 +296,29 @@
                 :hollow-style="true"
               />
 
-              <div class="txtLabel" v-if="selected==2">
+              <div class="txtLabel" v-if="selected == 2">
                 <div class="txt fl">
-                  <span style="color:red;">*</span> 重新指派理由:
+                  <span style="color: red">*</span> 重新指派理由:
                 </div>
-                <cube-textarea class="fl" v-model="resignComment" placeholder="重新指派理由"></cube-textarea>
+                <cube-textarea
+                  class="fl"
+                  v-model="resignComment"
+                  placeholder="重新指派理由"
+                ></cube-textarea>
               </div>
               <cube-form-group class="sub">
-                <cube-button type="submit" @click="subVali()">{{selected==1?'接单':'重新指派'}}</cube-button>
+                <cube-button type="submit" @click="subVali()">{{
+                  selected == 1 ? "接单" : "重新指派"
+                }}</cube-button>
               </cube-form-group>
             </div>
           </div>
         </div>
         <load-ing v-if="!model.incident"></load-ing>
-        <promp-ting :conents="promptingConent" :status="promptingStatus"></promp-ting>
+        <promp-ting
+          :conents="promptingConent"
+          :status="promptingStatus"
+        ></promp-ting>
       </div>
     </div>
   </div>
@@ -223,16 +334,16 @@ export default {
       incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
       wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
       selected: 1,
-      id:'',
+      id: "",
       options: [
         {
           label: "接单",
-          value: 1
+          value: 1,
         },
         {
           label: "重新指派",
-          value: 2
-        }
+          value: 2,
+        },
       ],
       promptingConent: "",
       promptingStatus: "",
@@ -243,8 +354,8 @@ export default {
       progressInfo: [], //处理进度
       imgs: [], //图片
       model: {}, //提交数据
-      pro_hides:false,//展开/收起处理进度
-      hcsjList:[],//绑定的耗材列表，展示
+      pro_hides: false, //展开/收起处理进度
+      hcsjList: [], //绑定的耗材列表，展示
     };
   },
   components: {
@@ -259,7 +370,7 @@ export default {
           data: { type: 2, source: "1627", sourceId: this.id },
         })
         .then((result) => {
-          if(result.data.status == 200){
+          if (result.data.status == 200) {
             this.hcsjList = result.data.data;
           }
         });
@@ -272,14 +383,19 @@ export default {
           "/service/form/renderForm/receiveform/" +
             that.processInstanceId +
             "/" +
-            that.loginUser.id+'/'+that.id,
+            that.loginUser.id +
+            "/" +
+            that.id,
           {}
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           that.model = res.data.model;
+          if (that.$route.params.data) {
+            that.model.incident.assetId = that.$route.params.data.assetId;
+          }
           //seimin
-          localStorage.setItem('modelData',JSON.stringify(that.model))
+          localStorage.setItem("modelData", JSON.stringify(that.model));
           that.getProgressInfo();
         });
     },
@@ -292,7 +408,7 @@ export default {
             that.processInstanceId,
           {}
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           that.imgs = res.data.data.splice(0, 3);
           console.log(that.imgs);
@@ -306,34 +422,39 @@ export default {
           "/service/bpm/bpm/flowTracingCustom/" + that.processInstanceId,
           {}
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
           //处理日志startcaca
-          if(that.model.incident.handlerLogs){
+          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.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){
+          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){
+          that.progressInfo.sort(function (o, c) {
             return c.startTime - o.startTime;
           });
-          that.progressInfo.length && (that.progressInfo[0].endTime = '');
+          that.progressInfo.length && (that.progressInfo[0].endTime = "");
           that.progressInfo.push(jiedan);
           that.progressInfo.push(kaishi);
-          console.log(that.progressInfo)
-        //处理日志end
+          console.log(that.progressInfo);
+          //处理日志end
         });
     },
     //隐藏显示详情
@@ -342,13 +463,15 @@ export default {
       $("#shows").slideToggle();
     },
     // 处理进度隐藏/展开
-    proHides(){
-      if(!this.pro_hides){
-        $('#progressBox').animate({'height':$('#progressBox')[0].scrollHeight})
-      }else{
-        $('#progressBox').animate({'height':'1.7rem'})
+    proHides() {
+      if (!this.pro_hides) {
+        $("#progressBox").animate({
+          height: $("#progressBox")[0].scrollHeight,
+        });
+      } else {
+        $("#progressBox").animate({ height: "1.7rem" });
       }
-      this.pro_hides=!this.pro_hides;
+      this.pro_hides = !this.pro_hides;
     },
     //数据提交baba
     subVali() {
@@ -359,18 +482,18 @@ export default {
       if (that.selected == 1) {
         that.model.receive_code = "handler";
         that.model.loginUser = that.loginUser;
-        that.model.msgflag = '接单';
-        that.model.submit = '接单';
+        that.model.msgflag = "接单";
+        that.model.submit = "接单";
       } else if (that.selected == 2) {
-        that.model.msgflag = '重新指派';
-        that.model.submit = '重新指派';
+        that.model.msgflag = "重新指派";
+        that.model.submit = "重新指派";
         that.model.receive_code = "transferment";
         that.model.resignComment = that.resignComment;
         if (!that.resignComment) {
           $("#fade").fadeIn();
           that.promptingConent = "提交失败,请填写必填信息!";
           that.promptingStatus = false;
-          setTimeout(function() {
+          setTimeout(function () {
             $("#fade").fadeOut();
           }, 2000);
           return;
@@ -385,24 +508,25 @@ export default {
             that.loginUser.id,
           that.model
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           if (res.data) {
             $("#fade").fadeIn();
-            that.promptingConent = that.selected==1?"恭喜您,接单成功!":"恭喜您,重新指派成功!";
+            that.promptingConent =
+              that.selected == 1 ? "恭喜您,接单成功!" : "恭喜您,重新指派成功!";
             that.promptingStatus = true;
             that.dialog = that
               .$createDialog({
                 type: "alert",
-                title: that.selected==1?"接单成功":"重新指派成功",
+                title: that.selected == 1 ? "接单成功" : "重新指派成功",
                 content: "点击返回首页",
                 icon: "cubeic-right",
                 onConfirm: (e, promptValue) => {
                   that.$router.push({ path: "/main" });
-                }
+                },
               })
               .show();
-            setTimeout(function() {
+            setTimeout(function () {
               $("#fade").fadeOut();
             }, 2000);
           }
@@ -416,11 +540,11 @@ export default {
           scrollTop:
             $("#" + id).offset().top -
             $(".header")[0].offsetHeight -
-            $(".navBar")[0].offsetHeight
+            $(".navBar")[0].offsetHeight,
         },
         260
       );
-    }
+    },
   },
   created() {
     // seimin
@@ -428,13 +552,15 @@ export default {
       ? 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.id = this.$route.params.data
+      ? this.$route.params.data.id
+      : JSON.parse(localStorage.getItem("modelData")).incident.id;
     this.getParamsData();
     this.getImgs();
-    if(this.incidentWithConsumable == 1){
+    if (this.incidentWithConsumable == 1) {
       this.getHcBySj();
     }
-  }
+  },
 };
 </script>
 <style lang="less" scoped>
@@ -475,9 +601,9 @@ i.iconfont.blue {
     div {
       width: 33.33%;
       text-align: center;
-      &.p50{
-        width: 49.99% ;
-    }
+      &.p50 {
+        width: 49.99%;
+      }
       a {
         display: inline-block;
         height: 0.9rem;
@@ -525,15 +651,15 @@ i.iconfont.blue {
       .boeder_B {
         border-bottom: 0.01rem solid #ccc;
       }
-        p {
-          &.desc{
-            overflow: hidden;
-          }
-          .grayFont {
-            width: 75%;
-            text-align: right;
-            overflow-x: scroll;
-          }
+      p {
+        &.desc {
+          overflow: hidden;
+        }
+        .grayFont {
+          width: 75%;
+          text-align: right;
+          overflow-x: scroll;
+        }
       }
       .bottom {
         overflow: hidden;
@@ -571,14 +697,14 @@ i.iconfont.blue {
             color: #00559d;
           }
         }
-        .imgs-container{
-          a{
-            color:#03c !important;
-            &:visited{
+        .imgs-container {
+          a {
+            color: #03c !important;
+            &:visited {
               color: #551a8b !important;
             }
           }
-           img {
+          img {
             width: 1.5rem;
             height: 1.5rem;
             margin-right: 0.7rem;
@@ -590,9 +716,9 @@ i.iconfont.blue {
         .progress {
           padding: 0.2rem 0.2rem;
           overflow: hidden;
-          transition-duration: .2s;
+          transition-duration: 0.2s;
           transition-timing-function: linear;
-          &.progressHide{
+          &.progressHide {
             height: 1.7rem;
           }
           .progress_info {

src/views/processing.vue

@@ -189,14 +189,18 @@
                     <td>价格</td>
                     <td>数量</td>
                   </tr>
-                  <tr v-for="(item,i) in hcsjList" :key="i">
-                    <td>{{item.consumable.name}}</td>
-                    <td>{{item.extra1}}</td>
-                    <td>{{item.consumablesSum}}</td>
+                  <tr v-for="(item, i) in hcsjList" :key="i">
+                    <td>{{ item.consumable.name }}</td>
+                    <td>{{ item.extra1 }}</td>
+                    <td>{{ item.consumablesSum }}</td>
                   </tr>
                 </table>
               </div>
             </div>
+            <p v-if="wxIncidentWithCmdb == 1">
+              <span class="fl">资产</span>
+              <span class="fr">{{ modelData.incident.assetId || "无" }}</span>
+            </p>
 
             <!-- <p v-if="modelData.incident.synergeticReason">
                 <span class="fl" >协同原因</span>
@@ -904,7 +908,7 @@ export default {
       hcList: [], //绑定的耗材列表
       idMock: 0, //自增id,mock
       hcs: [], //耗材列表
-      hcsjList:[],//绑定的耗材列表，展示
+      hcsjList: [], //绑定的耗材列表，展示
     };
   },
   watch: {
@@ -1021,6 +1025,9 @@ export default {
         .then(function (res) {
           console.log(res.data, 666);
           that.modelData = res.data.model;
+          if (that.$route.params.data) {
+            that.modelData.incident.assetId = that.$route.params.data.assetId;
+          }
           //seimin
           localStorage.setItem("modelData", JSON.stringify(that.modelData));
         });
@@ -1832,7 +1839,7 @@ export default {
           data: { type: 2, source: "1627", sourceId: this.id },
         })
         .then((result) => {
-          if(result.data.status == 200){
+          if (result.data.status == 200) {
             this.hcsjList = result.data.data;
           }
         });
@@ -1850,7 +1857,7 @@ export default {
     this.action.target += this.processInstanceId;
     this.getParamsData();
     this.getHcs();
-    if(this.incidentWithConsumable == 1){
+    if (this.incidentWithConsumable == 1) {
       this.getHcBySj();
     }
     this.getImgs();

src/views/solved.vue

@@ -60,7 +60,7 @@
           <p class="desc">
             <span class="fl">事件描述</span>
             <span
-              class="grayFont fr "
+              class="grayFont fr"
               v-html="model.incident.description"
             ></span>
           </p>
@@ -125,7 +125,12 @@
             <p>
               <span class="fl">处理人电话</span>
               <span class="fr" v-if="!model.incident.handlerUser"></span>
-              <span class="fr" v-if="model.incident.handlerUser"><a :href="'tel:' + model.incident.handlerUser.phone"><i class="iconfont icon-shouji"></i>{{model.incident.handlerUser.phone}}</a></span>
+              <span class="fr" v-if="model.incident.handlerUser"
+                ><a :href="'tel:' + model.incident.handlerUser.phone"
+                  ><i class="iconfont icon-shouji"></i
+                  >{{ model.incident.handlerUser.phone }}</a
+                ></span
+              >
             </p>
             <p>
               <span class="fl">优先级</span>
@@ -154,22 +159,26 @@
               }}</span>
             </p>
             <div v-if="hcsjList.length">
-                <p>耗材</p>
-                <div class="hcTable">
-                  <table>
-                    <tr>
-                      <td>耗材名称</td>
-                      <td>价格</td>
-                      <td>数量</td>
-                    </tr>
-                    <tr v-for="(item,i) in hcsjList" :key="i">
-                      <td>{{item.consumable.name}}</td>
-                      <td>{{item.extra1}}</td>
-                      <td>{{item.consumablesSum}}</td>
-                    </tr>
-                  </table>
-                </div>
+              <p>耗材</p>
+              <div class="hcTable">
+                <table>
+                  <tr>
+                    <td>耗材名称</td>
+                    <td>价格</td>
+                    <td>数量</td>
+                  </tr>
+                  <tr v-for="(item, i) in hcsjList" :key="i">
+                    <td>{{ item.consumable.name }}</td>
+                    <td>{{ item.extra1 }}</td>
+                    <td>{{ item.consumablesSum }}</td>
+                  </tr>
+                </table>
               </div>
+            </div>
+            <p v-if="wxIncidentWithCmdb == 1">
+              <span class="fl">资产</span>
+              <span class="fr">{{ model.incident.assetId || "无" }}</span>
+            </p>
           </div>
           <p class="info_hide">
             <span class="fl hide" @click="hides()" v-if="!item_hides"
@@ -184,11 +193,11 @@
               <img
                 v-if="
                   img.suffix == 'jpeg' ||
-                    img.suffix == 'jpg' ||
-                    img.suffix == 'gif' ||
-                    img.suffix == 'png' ||
-                    img.suffix == 'svg' ||
-                    img.suffix == 'pdf'
+                  img.suffix == 'jpg' ||
+                  img.suffix == 'gif' ||
+                  img.suffix == 'png' ||
+                  img.suffix == 'svg' ||
+                  img.suffix == 'pdf'
                 "
                 :src="img.previewUrl"
                 v-for="(img, index) in imgs"
@@ -270,13 +279,13 @@
                     :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}}
+                      ，{{ item.userName }}
                     </template>
                   </span>
                 </div>
@@ -298,7 +307,7 @@
           >
             <div class="txtLabel">
               <div class="txt fl handler">
-                <span style="color:red;">*</span>是否已解决：
+                <span style="color: red">*</span>是否已解决：
               </div>
               <cube-select
                 class="selectGroup fl"
@@ -308,7 +317,7 @@
             </div>
             <div class="txtLabel">
               <div class="txt fl">
-                <span style="color:red;">*</span> 结果类型:
+                <span style="color: red">*</span> 结果类型:
               </div>
               <cube-select
                 class="selectGroup fl"
@@ -349,18 +358,18 @@ export default {
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       incidentWithConsumable: localStorage.getItem("incidentWithConsumable"), //是否绑定耗材
       wxIncidentWithCmdb: localStorage.getItem("wxIncidentWithCmdb"), //是否绑定资产
-      hcsjList:[],//绑定的耗材列表，展示
+      hcsjList: [], //绑定的耗材列表，展示
       selected: 1,
       isclose: "close", //是否已解决
       iscloseArr: [
         {
           text: "已解决",
-          value: "close"
+          value: "close",
         },
         {
           text: "未解决",
-          value: "notsolved"
-        }
+          value: "notsolved",
+        },
       ],
       handleResult: "", //结果类型
       handleResultArr: [], //结果类型
@@ -374,7 +383,7 @@ export default {
       processInstanceId: "",
       progressInfo: [], //处理进度
       imgs: [], //图片
-      model: {} //提交数据
+      model: {}, //提交数据
     };
   },
   components: {
@@ -389,7 +398,7 @@ export default {
           data: { type: 2, source: "1627", sourceId: this.id },
         })
         .then((result) => {
-          if(result.data.status == 200){
+          if (result.data.status == 200) {
             this.hcsjList = result.data.data;
           }
         });
@@ -407,10 +416,13 @@ export default {
             that.id,
           {}
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           that.model = res.data.model;
           that.model.msgflag = "已解决";
+          if (that.$route.params.data) {
+            that.model.incident.assetId = that.$route.params.data.assetId;
+          }
           //seimin
           localStorage.setItem("modelData", JSON.stringify(that.model));
           that.getProgressInfo();
@@ -425,7 +437,7 @@ export default {
             that.processInstanceId,
           {}
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           that.imgs = res.data.data.splice(0, 3);
           console.log(that.imgs);
@@ -439,33 +451,39 @@ export default {
           "/service/bpm/bpm/flowTracingCustom/" + that.processInstanceId,
           {}
         )
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           that.progressInfo = res.data.data;
           //处理日志startcaca
-          if(that.model.incident.handlerLogs){
+          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.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){
+          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){
+          that.progressInfo.sort(function (o, c) {
             return c.startTime - o.startTime;
           });
-          that.progressInfo.length && (that.progressInfo[0].endTime = '');;
+          that.progressInfo.length && (that.progressInfo[0].endTime = "");
           that.progressInfo.push(jiedan);
           that.progressInfo.push(kaishi);
-          console.log(that.progressInfo)
-        //处理日志end
+          console.log(that.progressInfo);
+          //处理日志end
         });
     },
     // 获取结果类型
@@ -474,18 +492,18 @@ export default {
       that.$http
         .post("/service/common/common/getDictionary", {
           type: "list",
-          key: "incident_handleresult"
+          key: "incident_handleresult",
         })
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           // that.handleResultArr = res.data;
-          res.data.forEach(function(v, i) {
+          res.data.forEach(function (v, i) {
             that.handleResultArr.push({
               text: v.name,
-              value: v.id
+              value: v.id,
             });
           });
-          if(that.handleResultArr.length){
+          if (that.handleResultArr.length) {
             that.handleResult = that.handleResultArr[0].value;
           }
         });
@@ -496,15 +514,15 @@ export default {
       that.$http
         .post("/service/common/common/getDictionary", {
           type: "list",
-          key: "incident_degree"
+          key: "incident_degree",
         })
-        .then(function(res) {
+        .then(function (res) {
           console.log(res.data);
           // that.degreeArr = res.data;
-          res.data.forEach(function(v, i) {
+          res.data.forEach(function (v, i) {
             that.degreeArr.push({
               text: v.name,
-              value: v.id
+              value: v.id,
             });
           });
         });
@@ -523,7 +541,7 @@ export default {
     proHides() {
       if (!this.pro_hides) {
         $("#progressBox").animate({
-          height: $("#progressBox")[0].scrollHeight
+          height: $("#progressBox")[0].scrollHeight,
         });
       } else {
         $("#progressBox").animate({ height: "1.7rem" });
@@ -538,7 +556,7 @@ export default {
           scrollTop:
             $("#" + id).offset().top -
             $(".header")[0].offsetHeight -
-            $(".navBar")[0].offsetHeight
+            $(".navBar")[0].offsetHeight,
         },
         260
       );
@@ -563,7 +581,7 @@ export default {
         $("#fade").fadeIn();
         that.promptingConent = "提交失败,请填写必填信息!";
         that.promptingStatus = false;
-        setTimeout(function() {
+        setTimeout(function () {
           $("#fade").fadeOut();
         }, 2000);
       }
@@ -576,7 +594,7 @@ export default {
             that.loginUser.id,
           that.model
         )
-        .then(function(res) {
+        .then(function (res) {
           if (res.data.status == 200) {
             $("#fade").fadeIn();
             that.promptingConent = "恭喜您,提交成功!";
@@ -589,15 +607,15 @@ export default {
                 icon: "cubeic-right",
                 onConfirm: (e, promptValue) => {
                   that.$router.push({ path: "/main" });
-                }
+                },
               })
               .show();
-            setTimeout(function() {
+            setTimeout(function () {
               $("#fade").fadeOut();
             }, 2000);
           }
         });
-    }
+    },
   },
   created() {
     // seimin
@@ -611,12 +629,12 @@ export default {
     this.getParamsData();
 
     this.getImgs();
-    if(this.incidentWithConsumable == 1){
+    if (this.incidentWithConsumable == 1) {
       this.getHcBySj();
     }
     this.getHandlerRes();
     this.getDegree();
-  }
+  },
 };
 </script>
 <style lang="less" scoped>