巡检

config/index.js

@@ -41,7 +41,7 @@ module.exports = {
 
     // https://webpack.js.org/configuration/devtool/#development
     // 住了一行
-    devtool: 'source-map',
+    devtool: 'cheap-module-eval-source-map',
 
     // If you have problems debugging vue-files in devtools,
     // set this to false - it *may* help

src/App.vue

@@ -97,12 +97,12 @@ export default {
 
 // 巡检详情按钮
 .inspedtionDetail {
-  .cube-switch-ui::before {
+  .cube-switch-ui {
     border-color: #ccc !important;
     background-color: green !important;
   }
   .abnormal {
-    .cube-switch-ui{
+    .cube-switch-ui::before{
       border-color: #ccc !important;
       background-color: red !important;
     }

src/views/Inspection.vue

@@ -30,7 +30,7 @@
               @change="stateChange()"
             ></cube-select>-->
             <div class="conentBox">
-              <div class="conent" v-for="item in items" @click="toDetail(item)">
+              <div class="conent" v-for="(item,index) in items" @click="toDetail(item)" :key="index">
                 <div class="head">
                   <p>
                     <i class="iconfont icon-zuixinbaoxiu newPapir"></i>

src/views/InspectionDetail.vue

@@ -5,52 +5,72 @@
       <p>
         <i class="iconfont icon-zuixinbaoxiu newPapir"></i>
         巡检单号
-        <span class="num">{{baseInfo.sign}}</span>
-        <span class="btn zhixingzhong">{{baseInfo.stateName}}</span>
+        <span class="num">{{ baseInfo.sign }}</span>
+        <span class="btn zhixingzhong">{{ baseInfo.stateName }}</span>
       </p>
     </div>
     <div class="info">
       <p>
         <span class="fl">巡检类型</span>
-        <span class="fr">{{baseInfo.inspectionType.type}}</span>
+        <span class="fr">{{ baseInfo.inspectionType.type }}</span>
       </p>
       <p>
         <span class="fl">计划主题</span>
-        <span class="fr">{{baseInfo.inspection.title}}</span>
+        <span class="fr">{{ baseInfo.inspection.title }}</span>
       </p>
       <p>
         <span class="fl">计划内容</span>
-        <span class="fr showwrap">{{baseInfo.inspection.content}}</span>
+        <span class="fr showwrap">{{ baseInfo.inspection.content }}</span>
       </p>
       <p>
         <span class="fl">巡检状态</span>
-        <span class="fr">{{baseInfo.stateName}}</span>
+        <span class="fr">{{ baseInfo.stateName }}</span>
       </p>
       <p>
         <span class="fl">巡检策略</span>
-        <span class="fr">{{baseInfo.inspection.planStrategy.name}}</span>
+        <span class="fr">{{ baseInfo.inspection.planStrategy.name }}</span>
       </p>
       <p>
         <span class="fl">执行时长</span>
-        <span class="fr">{{baseInfo.inspection.executionTime}}分钟</span>
+        <span class="fr">{{ baseInfo.inspection.executionTime }}分钟</span>
       </p>
       <p>
         <span class="fl">开始时间</span>
-        <span class="fr">{{baseInfo.inspection.planStartTime.slice(0,baseInfo.inspection.planStartTime.length-2)}}</span>
+        <span class="fr">{{
+          baseInfo.inspection.planStartTime.slice(
+            0,
+            baseInfo.inspection.planStartTime.length - 2
+          )
+        }}</span>
       </p>
       <p>
         <span class="fl">逾期时间</span>
-        <span class="fr">{{baseInfo.overdueTime}}</span>
+        <span class="fr">{{ baseInfo.overdueTime }}</span>
       </p>
     </div>
     <div class="label">巡检结果</div>
     <div class="form">
-      <p v-for="(item,index) in forms" >
-        <span v-if="index%2==0">{{item.templateOptions.placeholder}}</span>
-        <cube-switch v-if="index%2==1" v-model="param[item.key]" :class="{'abnormal':param[item.key]}" :data-label="forms[index-1].templateOptions.placeholder" ></cube-switch>
+      <p v-for="(item, index) in forms" :key="index">
+        <span>{{ item.name }}：</span>
+        <cube-switch
+          v-model="param[item.key]"
+          :class="{ abnormal: !param[item.key] }"
+          :data-label="item.key"
+        ></cube-switch>
       </p>
     </div>
     <div class="label formLabel">
+      {{ xj_beizhu.name }}
+    </div>
+    <div class="textarea_div">
+      <cube-textarea
+        class="textarea"
+        v-model="param[xj_beizhu.key]"
+        placeholder="请输入整改意见"
+      ></cube-textarea>
+    </div>
+    <div></div>
+    <div class="label formLabel">
       图片上传
       <span>(最多可上传3张JPG或PNG,每张不能超过10M)</span>
     </div>
@@ -84,11 +104,24 @@ export default {
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       baseInfo: {}, //巡检基础信息
       items: [], //巡检项目
-      labels: [], //巡检项目label
-      status: [], //巡检项目的状态
+      xj_arr: [], //巡检项目数组key和name
+      xj_beizhu: {}, //巡检-整改意见（备注）
       forms: [], //巡检结果
-      abnormal:'',//异常项
+      abnormal: "", //异常项
       param: {
+        sdCheckEnable1: true,
+        sdCheckEnable2: true,
+        sdCheckEnable3: true,
+        sdCheckEnable4: true,
+        sdCheckEnable5: true,
+        sdCheckEnable6: true,
+        sdCheckEnable7: true,
+        sdCheckEnable8: true,
+        sdCheckEnable9: true,
+        sdCheckEnable10: true,
+        sdCheckEnable11: true,
+        sdCheckEnable12: true,
+        descriptionTextarea: "",
         inspectionProcessActual: {}
       },
       model: {}
@@ -120,10 +153,12 @@ export default {
       var that = this;
       that.$http
         .get(
-          "/service/form/renderForm/inspection_confirm/" +
+          "/service/form/renderForm/inspection_LinHu_confirm/" +
             that.baseInfo.processInstanceId +
             "/" +
-            that.loginUser.id+'/'+that.baseInfo.id,
+            that.loginUser.id +
+            "/" +
+            that.baseInfo.id,
           {}
         )
         .then(function(res) {
@@ -132,27 +167,24 @@ export default {
           var fields = res.data.fields;
           console.log(fields);
           fields.forEach(v => {
-            if (v.templateOptions.label == "检查项目") {
-              that.labels.push(v);
+            v.key = v.key || "";
+            if (v.key.indexOf("sdCheckEnable") > -1) {
+              that.xj_arr.push(v);
             }
-            if (v.templateOptions.label == "状态") {
-              that.status.push(v);
+            if (v.key.indexOf("descriptionTextarea") > -1) {
+              that.xj_beizhu = {
+                key: v.key,
+                name: v.templateOptions.label
+              };
             }
           });
-          // console.log(that.labels);
-          // console.log(that.status);
-          let labels = that.labels;
-          let status = that.status;
-          let j = 0,
-            newArr = new Array();
-          for (let i = 0; i < that.labels.length; i++) {
-            j = i * 2;
-            newArr[j] = that.labels[i];
-            newArr[j + 1] = that.status[i];
-          }
-          console.log(newArr);
-          that.forms = newArr;
-          window.localStorage.setItem('forms',JSON.stringify(that.forms));
+          console.log(that.xj_arr);
+          console.log(that.xj_beizhu);
+          that.forms = that.xj_arr.map(v => ({
+            key: v.key,
+            name: v.templateOptions.label
+          }));
+          window.localStorage.setItem("forms", JSON.stringify(that.forms));
         });
     },
     // 提交
@@ -177,7 +209,9 @@ export default {
         .then(function(res) {
           console.log(res.data);
           if (res.data.status == 200) {
-            that.action.target = that.action.target + that.param.inspectionProcessActual.processInstanceId;
+            that.action.target =
+              that.action.target +
+              that.param.inspectionProcessActual.processInstanceId;
             setTimeout(function() {
               that.$refs.upload.start();
             }, 100);
@@ -203,30 +237,41 @@ export default {
     },
     // 取消
     cancle() {
-      var that=this;
+      var that = this;
       that.$router.go(-1);
     },
     // 生成事件
-    createIncident(){
-      for(var i =0;i<$('.cube-switch.abnormal').length;i++){
-        this.abnormal+=$('.cube-switch.abnormal')[i].dataset.label+','
+    createIncident() {
+      for (var i = 0; i < $(".cube-switch.abnormal").length; i++) {
+        this.abnormal += $(".cube-switch.abnormal")[i].dataset.label + ",";
       }
-      this.$router.push({name:'NewIncident',params:{data:this.baseInfo,abnormal:this.abnormal}});
+      this.$router.push({
+        name: "NewIncident",
+        params: { data: this.baseInfo, abnormal: this.abnormal }
+      });
     }
   },
   created() {
-    this.baseInfo = this.$route.params.data||JSON.parse(window.localStorage.getItem('insDetailInfo'));
-    this.forms=JSON.parse( window.localStorage.getItem('forms'))||[];
+    this.baseInfo =
+      this.$route.params.data ||
+      JSON.parse(window.localStorage.getItem("insDetailInfo"));
+    this.forms = JSON.parse(window.localStorage.getItem("forms")) || [];
     this.title = this.baseInfo.inspectionType.type;
     this.getItems();
   },
-  mounted(){
+  mounted() {
     this.$refs.upload.pause();
   }
 };
 </script>
 <style lang="less" scoped>
 .inspedtionDetail {
+  .textarea_div {
+    margin: 0.4rem;
+    .textarea {
+      height: 2rem;
+    }
+  }
   .uplod {
     padding: 0.24rem;
     border-bottom: 0.02rem solid rgb(245, 245, 245);
@@ -281,11 +326,13 @@ export default {
     justify-content: space-between;
     align-items: center;
     flex-wrap: wrap;
+    .cube-switch {
+      margin-top: 0.2rem;
+    }
     p {
       line-height: 0.4rem;
       padding: 0.2rem 0.24rem;
-      // border-bottom: 0.01rem solid #ccc;
-      width: 35%;
+      width: 100%;
     }
   }
 

src/views/inspectionDoneDetail.vue

@@ -5,53 +5,66 @@
       <p>
         <i class="iconfont icon-zuixinbaoxiu newPapir"></i>
         巡检单号
-        <span class="num">{{baseInfo.sign}}</span>
-        <span class="btn zhixingzhong">{{baseInfo.stateName}}</span>
+        <span class="num">{{ baseInfo.sign }}</span>
+        <span class="btn zhixingzhong">{{ baseInfo.stateName }}</span>
       </p>
     </div>
     <div class="info">
       <p>
         <span class="fl">巡检类型</span>
-        <span class="fr">{{baseInfo.inspectionType.type}}</span>
+        <span class="fr">{{ baseInfo.inspectionType.type }}</span>
       </p>
       <p>
         <span class="fl">计划主题</span>
-        <span class="fr">{{baseInfo.inspection.title}}</span>
+        <span class="fr">{{ baseInfo.inspection.title }}</span>
       </p>
       <p>
         <span class="fl">计划内容</span>
-        <span class="fr showwrap">{{baseInfo.inspection.content}}</span>
+        <span class="fr showwrap">{{ baseInfo.inspection.content }}</span>
       </p>
       <p>
         <span class="fl">巡检状态</span>
-        <span class="fr">{{baseInfo.stateName}}</span>
+        <span class="fr">{{ baseInfo.stateName }}</span>
       </p>
       <p>
         <span class="fl">巡检策略</span>
-        <span class="fr">{{baseInfo.inspection.planStrategy.name}}</span>
+        <span class="fr">{{ baseInfo.inspection.planStrategy.name }}</span>
       </p>
       <p>
         <span class="fl">执行时长</span>
-        <span class="fr">{{baseInfo.inspection.executionTime}}分钟</span>
+        <span class="fr">{{ baseInfo.inspection.executionTime }}分钟</span>
       </p>
       <p>
         <span class="fl">开始时间</span>
-        <span
-          class="fr"
-        >{{baseInfo.inspection.planStartTime.slice(0,baseInfo.inspection.planStartTime.length-2)}}</span>
+        <span class="fr">{{
+          baseInfo.inspection.planStartTime.slice(
+            0,
+            baseInfo.inspection.planStartTime.length - 2
+          )
+        }}</span>
       </p>
       <p>
         <span class="fl">逾期时间</span>
-        <span class="fr">{{baseInfo.overdueTime}}</span>
+        <span class="fr">{{ baseInfo.overdueTime }}</span>
       </p>
     </div>
     <div class="label">巡检结果</div>
     <div class="form">
-      <p v-for="(item,index) in forms">
-        <span v-if="index%2==0">{{item.templateOptions.placeholder}}</span>
-        <span v-if="index%2==1" class="colorGray">{{param[item.key]?'不正常':'正常'}}</span>
+      <p v-for="(item, index) in forms" :key="index">
+        <span>{{ item.name }}：</span>
+        <span class="colorGray">{{
+          param[item.key] === "false" ? "异常" : "正常"
+        }}</span>
       </p>
     </div>
+    <div class="label">{{ xj_beizhu.name }}</div>
+    <div class="textarea_div">
+      <cube-textarea
+        class="textarea"
+        v-model="param[xj_beizhu.key]"
+        disabled
+      ></cube-textarea>
+    </div>
     <div class="label">图片列表</div>
     <div class="imgs-c">
       <div class="imgs-container" v-if="imgs.length">
@@ -59,11 +72,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"
@@ -81,16 +94,29 @@
 export default {
   data() {
     return {
-      imgs:[],//图片
+      imgs: [], //图片
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       baseInfo: {}, //巡检基础信息
       items: [], //巡检项目
-      labels: [], //巡检项目label
-      status: [], //巡检项目的状态
+      xj_arr: [], //巡检项目数组key和name
+      xj_beizhu: {}, //巡检-整改意见（备注）
       forms: [], //巡检结果
       abnormal: "", //异常项
       param: {
+        sdCheckEnable1: false,
+        sdCheckEnable2: false,
+        sdCheckEnable3: false,
+        sdCheckEnable4: false,
+        sdCheckEnable5: false,
+        sdCheckEnable6: false,
+        sdCheckEnable7: false,
+        sdCheckEnable8: false,
+        sdCheckEnable9: false,
+        sdCheckEnable10: false,
+        sdCheckEnable11: false,
+        sdCheckEnable12: false,
+        descriptionTextarea: "",
         inspectionProcessActual: {}
       },
       model: {}
@@ -102,10 +128,12 @@ export default {
       var that = this;
       that.$http
         .get(
-          "/service/form/renderForm/inspection_confirm/" +
+          "/service/form/renderForm/inspection_LinHu_detail/" +
             that.baseInfo.processInstanceId +
             "/" +
-            that.loginUser.id,
+            that.loginUser.id +
+            "/" +
+            that.baseInfo.id,
           {}
         )
         .then(function(res) {
@@ -114,26 +142,27 @@ export default {
           var fields = res.data.fields;
           console.log(fields);
           fields.forEach(v => {
-            if (v.templateOptions.label == "检查项目") {
-              that.labels.push(v);
+            v.key = v.key || "";
+            if (v.key.indexOf("sdCheckEnable") > -1) {
+              that.xj_arr.push(v);
             }
-            if (v.templateOptions.label == "状态") {
-              that.status.push(v);
+            if (v.key.indexOf("descriptionTextarea") > -1) {
+              that.xj_beizhu = {
+                key: v.key,
+                name: v.templateOptions.label
+              };
             }
           });
-          console.log(that.labels);
-          console.log(that.status);
-          let labels = that.labels;
-          let status = that.status;
-          let j = 0,
-            newArr = new Array();
-          for (let i = 0; i < that.labels.length; i++) {
-            j = i * 2;
-            newArr[j] = that.labels[i];
-            newArr[j + 1] = that.status[i];
-          }
-          console.log(newArr);
-          that.forms = newArr;
+          console.log(that.xj_beizhu);
+          that.forms = that.xj_arr.map(v => ({
+            key: v.key,
+            name: v.templateOptions.label
+          }));
+          console.log(that.forms);
+          that.forms.forEach(v => {
+            that.param[v.key] = that.model[v.key];
+          });
+          that.param.descriptionTextarea = that.model.descriptionTextarea;
           window.localStorage.setItem("forms", JSON.stringify(that.forms));
         });
     },
@@ -153,7 +182,9 @@ export default {
           "/service/bpm/bpm/completeTask/" +
             that.baseInfo.processInstanceId +
             "/" +
-            that.loginUser.id+'/'+that.baseInfo.id,
+            that.loginUser.id +
+            "/" +
+            that.baseInfo.id,
           that.param
         )
         .then(function(res) {
@@ -195,10 +226,10 @@ export default {
       });
     },
     //展示图片
-    showImgs(imgs){
+    showImgs(imgs) {
       this.$createImagePreview({
-        imgs:imgs.map(v=>v.previewUrl)
-      }).show()
+        imgs: imgs.map(v => v.previewUrl)
+      }).show();
     },
     // 获取图片
     getImgs() {
@@ -209,10 +240,10 @@ export default {
             that.baseInfo.processInstanceId,
           {}
         )
-        .then(function (res) {
+        .then(function(res) {
           that.imgs = res.data.data.splice(0, 3);
         });
-    },
+    }
   },
   created() {
     this.baseInfo =
@@ -221,13 +252,19 @@ export default {
     this.forms = JSON.parse(window.localStorage.getItem("forms")) || [];
     this.title = this.baseInfo.inspectionType.type;
     this.getItems();
-    this.getImgs();//获取图片
+    this.getImgs(); //获取图片
   }
 };
 </script>
 <style lang="less" scoped>
 .inspedtionDetail {
-  .imgs-c{
+  .textarea_div {
+    margin: 0.4rem;
+    .textarea {
+      height: 2rem;
+    }
+  }
+  .imgs-c {
     padding: 0.28rem;
   }
   .imgs-container {
@@ -237,7 +274,7 @@ export default {
         color: #551a8b !important;
       }
     }
-    .imgs-cont{
+    .imgs-cont {
       display: flex;
     }
     img {
@@ -246,8 +283,8 @@ export default {
       margin-right: 0.5rem;
     }
   }
-  .colorGray{
-      color: #999;
+  .colorGray {
+    color: #999;
   }
   .label {
     background-color: #eee;
@@ -302,11 +339,10 @@ export default {
     p {
       line-height: 0.4rem;
       padding: 0.2rem 0.24rem;
-      // border-bottom: 0.01rem solid #ccc;
-      width: 35%;
-      &:nth-child(2n){
-          text-align: right;
-      }
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
     }
   }