11月26 检验检查

src/xt_pages/user/inspection_new.vue

@@ -104,6 +104,7 @@
           </div>
           <div>
             <el-table
+              class="jianyan"
               stripe
               :header-cell-style="{
               backgroundColor: 'rgb(245, 247, 250)',
@@ -638,33 +639,33 @@ export default {
         console.log(this.form.remind_cycle)
 
         this.form.formItem = []
-        console.log("hhhhhhhhhhhhh",this.list)
-        console.log("inspectionsMap",row)
+        console.log("hhhhhhhhhhhhhthis.list",this.list)
+        console.log("inspectionsMaprow",row)
+        console.log("item",this.items)
         for (var index in this.list) {
           if(this.org_id ==10138){
             this.form.formItem.push({
-              id: this.list[index].id,
+              id: this.getid(this.list[index].item_id!=0 ? this.list[index].item_id : this.list[index].id ,row.inspect_date),
               project_id: this.list[index].project_id,
               project_name: this.list[index].project_name,
-              item_id: this.list[index].item_id,
-              item: this.list[index].item,
+              item_id: (this.list[index].item_id)*1,
               item_name: this.list[index].item_name,
               range_type: this.list[index].range_type,
-              value: this.getvalue(this.list[index].item_id,row.inspect_date),
+              value: this.getvalue(this.list[index].item_id!=0 ? this.list[index].item_id : this.list[index].id ,row.inspect_date) ,
               select_options: this.list[index].range_options.split(','),
               unit: this.list[index].unit,
-              item_id:parseInt(this.list[index].item_id) ,
+              // item_id:parseInt(this.list[index].item_id) ,
             })
           }else{
             this.form.formItem.push({
               // id: this.list[index].item_id,
-              id: this.getid(this.list[index].item_id,row.inspect_date),
+              id: this.getid(this.list[index].item_id!=0 ? this.list[index].item_id : this.list[index].id ,row.inspect_date),
               project_id: this.list[index].project_id,
               project_name: this.list[index].project_name,
               item_id: (this.list[index].item_id)*1,
               item_name: this.list[index].item_name,
               range_type: this.list[index].range_type,
-              value: this.getvalue(this.list[index].item_id,row.inspect_date) ,
+              value: this.getvalue(this.list[index].item_id!=0 ? this.list[index].item_id : this.list[index].id ,row.inspect_date) ,
               select_options: this.list[index].range_options.split(','),
               unit: this.list[index].unit
             })
@@ -1162,14 +1163,13 @@ export default {
 
     },
     getvalue(val,time){
-      // console.log('val',this.items,val);
       const options = this.items
       for(let i in options){
         if( options[i].inspect_date == time){
           for(let j in options[i].Child){
             if(options[i].Child[j].item_id == val){
-              // console.log('options[i].inspect_value',options[i].inspect_value);
-              return options[i].Child[j].inspect_value
+              console.log('options[i].inspect_value',options[i].inspect_value);
+              return options[i].Child[j].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
             }
 
           }
@@ -1192,7 +1192,8 @@ export default {
         }
 
       }
-    }
+    },
+    
   },
   created() {
     const id = this.$route.query && this.$route.query.id
@@ -1215,13 +1216,21 @@ export default {
 }
 </script>
 
-<style>
+<style lang="scss">
 #oictable ::-webkit-scrollbar {
   height: 15px;
 }
+.jianyan{
+  .el-table__fixed{
+    height: 98% !important;
+  }
+  .el-table__fixed-right{
+    height: 98% !important;
+  }
+}
 </style>
 
-<style>
+<style scoped>
 #user-inspection-order td {
   border-bottom: 0px !important;
   border-right: 0px !important;