safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/checkplan/checkmsg.vue

@@ -1,9 +1,9 @@
 <template>
-  <div id="print1" v-show="false">
+  <div id="print1" v-show="true">
     <div id="print2">
       <style id="style1">
         #print2 td{
-          height:32px;
+          height:28px;
           width: 100px;
           text-align: center;
         }
@@ -17,10 +17,10 @@
           text-align: center;
         }
         .border-btn{
-          border-bottom: #000000 solid 2px;
+          border-bottom: #000000 solid 1px;
         }
       </style>
-      <h1>{{company}}</h1>
+      <h1>{{loginorg}}</h1>
       <p>安检时间:{{userinfo.f_offsite_time}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -33,23 +33,23 @@
         <tr>
           <td><b>地址</b></td><td colspan="5">{{userinfo.f_address}}
         </tr>
-        <tr align="left" v-if="drowspan!=0">
-          <td><b>表具信息</b></td>
+        <tr align="left" v-if="userinfo.f_entry_status=='入户'">
+          <td><b>安检信息</b></td>
           <td colspan="5" style="padding: 0px">
             <table border="0" cellspacing="0" width="100%"  style="margin: 0px">
-              <tr v-for="devi in devices" :key="devi.id">
-                <td style="border-right:#000000 solid 2px;width: 20%!important;" :class="$index == devices.length-1?'':'border-btn'">
-                  {{devi.f_device_type}}
+              <tr v-for="devi in deviceconfig2" :key="devi.index">
+                <td style="border-right:#000000 solid 1px;width: 20%!important;" :class="$index == devices.length-1?'':'border-btn'">
+                  {{devi.checkname}}
                 </td>
                 <!--<td>{{devi.value[0].name}}</td>-->
                 <td colspan="4" style="padding: 0px;width: 80%!important;">
                   <table border="0" cellspacing="0" width="100%" style="margin: 0px">
-                    <tr v-for="deviinfo in devi.value" :key="deviinfo.id">
-                      <td style="border-right:#000000 solid 2px;width: 70%!important" :class="($parent.$index == devices.length-1 && $index == devi.value.length-1)?'':'border-btn'">
-                        {{deviinfo.name}}
+                    <tr v-for="deviinfo in devi.items" :key="deviinfo.index">
+                      <td style="border-right:#000000 solid 1px;width: 70%!important" :class="($parent.$index == devices.length-1 && $index == devi.value.length-1)?'':'border-btn'">
+                        {{deviinfo.lname}}
                       </td>
                       <td style="width: 30%!important" :class="($parent.$index == devices.length-1 && $index == devi.value.length-1)?'':'border-btn'">
-                        <label>{{deviinfo.value}}</label>
+                        <label>{{getDeviceValue(devi.index,deviinfo.lname)}}</label>
                       </td>
                     </tr>
                   </table>
@@ -58,95 +58,12 @@
             </table>
           </td>
         </tr>
-        <tr align="left" v-if="erowspan!=0">
-          <td><b>用户设备信息</b></td>
-         <td colspan="5" style="padding: 0px">
-           <table border="0" cellspacing="0" width="100%"  style="margin: 0px">
-             <tr v-for="equipmentmsg in equipmentmsgs">
-               <td style="border-right:#000000 solid 2px;width: 20%!important;" :class="$index == equipmentmsgs.length-1?'':'border-btn'">
-                 {{equipmentmsg.f_device_type}}
-               </td>
-               <td style="padding: 0px;width: 80%!important;">
-                 <table border="0" cellspacing="0" width="100%" style="margin: 0px">
-                   <tr v-for="equipment in equipmentmsg.value" :key="equipment.id">
-                     <td style="border-right:#000000 solid 2px;width: 70%!important" :class="($parent.$index == equipmentmsgs.length-1 && $index == equipmentmsg.value.length-1)?'':'border-btn'">
-                       {{equipment.name}}
-                     </td>
-                     <td style="width: 30%!important" :class="($parent.$index == equipmentmsgs.length-1 && $index == equipmentmsg.value.length-1)?'':'border-btn'">
-                       <label>{{equipment.value}}</label>
-                     </td>
-                   </tr>
-                 </table>
-               </td>
-             </tr>
-           </table>
-         </td>
-        </tr>
-        <tr align="left" v-if="hrowspan!=0">
-          <td><b>用户设备隐患</b></td>
-          <td colspan="5" style="padding: 0px">
-            <table border="0" cellspacing="0" width="100%"  style="margin: 0px">
-              <tr v-for="Hinvestigation in Hinvestigations">
-                <td style="border-right:#000000 solid 2px;width: 20%!important;" :class="$index == Hinvestigations.length-1?'':'border-btn'">
-                  {{Hinvestigation.f_device_type}}
-                </td>
-                <td style="padding: 0px;width: 80%!important;">
-                  <table border="0" cellspacing="0" width="100%" style="margin: 0px">
-                    <tr v-for="HazardDevice in Hinvestigation.value" :key="HazardDevice.id">
-                      <td style="border-right:#000000 solid 2px;width: 70%!important" :class="($parent.$index == Hinvestigations.length-1 && $index == Hinvestigation.value.length-1)?'':'border-btn'">
-                        {{HazardDevice.name}}
-                      </td>
-                      <td style="width: 30%!important" :class="($parent.$index == Hinvestigations.length-1 && $index == Hinvestigation.value.length-1)?'':'border-btn'">
-                        <label>{{HazardDevice.value}}</label>
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-        <tr>
+        <tr style="height: 80%">
           <td><b>安检结果</b></td>
           <td colspan="5">
-            {{f_defect_content}}
+            {{defectCount}}
           </td>
         </tr>
-        <!--<tr align="left" v-show="userinfo.f_check_type ==='民用'">-->
-          <!--<td >隐患类别</td>-->
-          <!--<td colspan="6">-->
-            <!--<div style="margin: auto;width: 95%">-->
-              <!--<div align="left" >-->
-                <!--<label v-for="Hiddencheck in Hiddenchecks"><input type="checkbox" :checked="Hiddencheck.key" />{{Hiddencheck.value}}；</label>-->
-              <!--</div>-->
-            <!--</div>-->
-          <!--</td>-->
-        <!--</tr>-->
-        <!--<tr align="left" v-show="userinfo.f_check_type ==='民用'">-->
-          <!--<td >建议处理措施</td>-->
-          <!--<td colspan="6">-->
-            <!--<div style="margin: auto;width: 95%">-->
-              <!--<div align="left" >-->
-                <!--<label v-for="Hiddenvalue in hiddenvalues"><input type="checkbox" :checked="Hiddenvalue.key" />{{Hiddenvalue.value}}；</label>-->
-              <!--</div>-->
-            <!--</div>-->
-          <!--</td>-->
-        <!--</tr>-->
-        <!--<tr>-->
-          <!--<td >用户意见反馈</td>-->
-          <!--<td colspan="6">-->
-            <!--<div style="margin: auto;width: 95%">-->
-              <!--<div align="left">-->
-                <!--<label v-for="customermsg in customers" ><input type="checkbox" :checked="customermsg.key" />{{customermsg.value}}；</label>-->
-                <!--<label>以上安检内容是否认真实施，请用户做出真是评价</label>-->
-                <!--<label v-for="customermsg1 in customers1" ><input type="checkbox" :checked="customermsg1.key" />{{customermsg1.value}}</label>-->
-                <!--<label>；安检人员工作内容及质量</label>-->
-                <!--<label v-for="customermsg2 in customers2" > <input type="checkbox" :checked="customermsg2.key" />{{customermsg2.value}}</label>-->
-              <!--</div>-->
-            <!--</div>-->
-          <!--</td>-->
-        <!--</tr>-->
-
         <tr>
           <td><b>用户签字</b></td><td colspan="2 "><img-self :src='userinfo.f_sign_path' alt="未签名"></img-self></td>
           <td><b>安检员</b></td><td colspan="3">{{data.f_checker_name}}</td>
@@ -168,102 +85,28 @@
       <print-element @click="getHidden" class="btn btn-success width-80" id="print1" styleid='style1' top='40' left='60' width='100%' height='100%' v-ref:printelement>打印</print-element>
     </div>
   </modal>
-  <!--<div class="row auto">-->
-    <!--<blockquote class="bg-info">-->
-      <!--用户信息-->
-    <!--</blockquote>-->
-    <!--<div class="row bg-cus-body">-->
-        <!--<div class="col-sm-3" >-->
-          <!--<label  class="control-label">用户编号：</label>-->
-          <!--<span class="form-control-static" >{{userinfo.f_userinfo_code}}</span>-->
-        <!--</div>-->
-        <!--<div class="col-sm-3" >-->
-          <!--<label  class="control-label">用户姓名：</label>-->
-          <!--<span class="form-control-static" >{{userinfo.f_user_name}}</span>-->
-        <!--</div>-->
-        <!--<div class="col-sm-3" >-->
-          <!--<label  class="control-label">用户电话：</label>-->
-          <!--<span class="form-control-static" >{{userinfo.f_user_phone}}</span>-->
-        <!--</div>-->
-        <!--<div class="col-sm-3" >-->
-          <!--<label class="control-label">安检人员：</label>-->
-          <!--<span class="form-control-static">{{userinfo.f_checker}}</span>-->
-        <!--</div>-->
-        <!--<div class="col-sm-3" >-->
-          <!--<label  class="control-label">安检日期：</label>-->
-          <!--<span class="form-control-static">{{userinfo.f_offsite_time}}</span>-->
-        <!--</div>-->
-      <!--</div>-->
-      <!--<blockquote>-->
-        <!--用户地址-->
-      <!--</blockquote>-->
-      <!--<div class="row auto bg-cus-body">-->
-        <!--<div class="col-sm-12" >-->
-          <!--<label class="control-label">地址：</label>-->
-          <!--<span class="form-control-static" >{{userinfo.f_address}}</span>-->
-        <!--</div>-->
-        <!--<div class="col-sm-3" >-->
-          <!--<label  class="control-label">街道：</label>-->
-          <!--<span class="form-control-static">{{userinfo.f_street}}</span>-->
-        <!--</div>-->
-        <!--<div class="col-sm-3" >-->
-          <!--<label  class="control-label">小区：</label>-->
-          <!--<span class="form-control-static">{{userinfo.f_residential_area}}</span>-->
-        <!--</div>-->
-        <!--<div class="col-sm-3" >-->
-          <!--<label  class="control-label">楼号：</label>-->
-          <!--<span class="form-control-static">{{userinfo.f_building}}</span>-->
-        <!--</div>-->
-        <!--<div class="col-sm-3" >-->
-          <!--<label  class="control-label">单元：</label>-->
-          <!--<span class="form-control-static">{{userinfo.f_unit}}</span>-->
-        <!--</div>-->
-        <!--<div class="col-sm-3" >-->
-          <!--<label  class="  control-label">楼层：</label>-->
-          <!--<span class="form-control-static">{{userinfo.f_floor}}</span>-->
-        <!--</div>-->
-        <!--<div class="col-sm-3" >-->
-          <!--<label  class="  control-label">门牌号：</label>-->
-          <!--<span class="form-control-static">{{userinfo.f_room}}</span>-->
-        <!--</div>-->
-    <!--</div>-->
-    <!--<blockquote class="bg-info">-->
-      <!--设备信息-->
-    <!--</blockquote>-->
-    <!--<div class="bg-cus-body">-->
-      <!--<equipment-msg :data='data' v-if="data.f_check_type === '民用' "></equipment-msg>-->
-      <!--<fequipment-msg :data='data' v-if="data.f_check_type === '非民用'"></fequipment-msg>-->
-    <!--</div>-->
-    <!--<blockquote class="bg-info">-->
-      <!--隐患信息-->
-    <!--</blockquote>-->
-    <!--<div class="bg-cus-body">-->
-      <!--<hidden-check :data='data' v-if="data.f_check_type === '民用' || data.f_check_type === null"></hidden-check>-->
-      <!--<fhidden-check :data='data' v-if="data.f_check_type === '非民用'"></fhidden-check>-->
-    <!--</div>-->
-    <!--<blockquote class="bg-info">-->
-      <!--用户意见-->
-    <!--</blockquote>-->
-    <!--<div class="bg-cus-body">-->
-      <!--<user-opinion :data='data'v-if="data.f_check_type === '民用'"></user-opinion>-->
-      <!--<fuser-opinion :data='data'v-if="data.f_check_type === '非民用'"></fuser-opinion>-->
-    <!--</div>-->
-
-
-    <!--<div class="row">-->
-      <!--<div class="col-sm-11 text-right">-->
-        <!-- <print-element @click="getHidden" class="btn btn-success width-80" id="print1" styleid='style1' top='40' left='60' width='100%' height='100%' v-ref:printelement>打印</print-element> -->
-      <!--</div>-->
-    <!--</div>-->
-  <!--</div>-->
 </template>
 
 <script>
 
 import co from 'co'
-import { PagedList } from 'vue-client'
+import { PagedList,HttpResetClass } from 'vue-client'
 import * as Util from '../Util'
-
+import ObjConfig from '../../utils/GerJsonObjectConfig'
+import {jsonSort} from '../../utils/LdapHelper'
+import Vue from "vue";
+let asyncReady = async function (self) {
+  // 获取配置信息
+  try {
+    let res = await Vue.resetget(`/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
+    Vue.config = res.data
+  } catch (error) {
+    // 忽略704,文件找不到异常R
+    if (error.status !== 704) {
+      throw error
+    }
+  }
+}
 export default {
   title: '安检信息',
   data () {
@@ -284,6 +127,7 @@ export default {
       Hinvestigation:{},
       defect:{},//隐患信息
       normal:{},
+      loginorg:this.$login.f.orgs+'安检单',
       normalDevice:[],
       Hiddenchecks:[],
       hiddenvalues:[],
@@ -292,47 +136,147 @@ export default {
       printtime:'',
       print_id:'',
       showAdd:true,
-      company:'',
+      defectCount:'',
+      deviceconfig:{},
+      deviceconfig2:[],
+      config: {
+        "燃气表":{
+          "checkmust":true,
+          "index":1,
+          "items":{
+            //"燃气表照片":{"index":1,"type":"picture","remark":"(拍摄清晰的表具编号、字轮数、剩余气量等)"},
+            "基表编号":{"index":1,"type":"string","readonly":true},
+            "气表型号":{"index":2,"type":"string","readonly":true},
+            "气表品牌":{"index":3,"type":"string","readonly":true},
+            "进气方向":{"index":4,"type":"string","readonly":true},
+            // "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
+            "上期表读数":{"index":5,"type":"number","readonly":true,isshow:false},
+            "累购气量":{"index":6,"type":"number","readonly":true},
+            "已用气量":{"index":7,"type":"number","checkmust": true},//基表数
+            "剩余气量":{"index":8,"type":"number","checkmust": true},//累购-已用
+            //显示屏数  --实际剩余气量
+            "气量异常差值":{"index":9,"type":"number","readonly": true}
+          }
+          // 注意，配置项的index必须与上面的固定配置保持'顺序'
+        }
+      },
+      //金额
+      config2: {
+        "燃气表":{
+          "checkmust":true,
+          "index":1,
+          "items":{
+            //"燃气表照片":{"index":1,"type":"picture","remark":"(拍摄清晰的表具编号、字轮数、剩余气量等)"},
+            "基表编号":{"index":1,"type":"string","readonly":true},
+            "气表型号":{"index":2,"type":"string","readonly":true},
+            "气表品牌":{"index":3,"type":"string","readonly":true},
+            "进气方向":{"index":4,"type":"string","readonly":true},
+            // "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
+            "上期表读数":{"index":5,"type":"number","readonly":true,isshow:false},
+            "累购金额":{"index":6,"type":"number","readonly":true},
+            "已用金额":{"index":7,"type":"number","checkmust": true},
+            //显示屏数  --实际剩余气量
+            "剩余金额":{"index":8,"type":"number","checkmust": true},
+            "金额异常差值":{"index":9,"type":"number","readonly": true}
+          }
+        }
+      },
       isBack:false
     }
   },
   props: ['data','show'],
   ready () {
-    // let value = f_fengongsi
-    // let index = value.indexOf('.')
-    // this.company = value.substring(index+1,value.length)
-    this.$resetpost('rs/path/getUserinfomation', {data:{condition:`id = '${this.data.id}'`}}).then((res)=>{
-      console.log('res',res.data)
-      if(res.data.length>0){
-        this.userinfo = res.data[0]
-        if(this.userinfo.f_sign_path != ''){
-          this.userinfo.f_sign_path = 'rs/image/file/' + this.userinfo.f_sign_path
-        }
-        this.$resetpost('rs/sql/getCompany', {data:{f_filialeid:this.$login.f.orgid}}).then((res)=>{
-          console.log('res===>',res)
-          if(res.data.length >0){
-            this.company = res.data[0].value
-          }else{
-            this.$showMessage('公司名称未设置，请前往参数管理中的单值表中进行设置！')
-            this.$parent.showcheckmsg = false
+    console.log("登录信息",this.$login)
+    asyncReady(this).then(() => {
+
+      this.$resetpost('rs/path/getUserinfomation', {data:{condition:`id = '${this.data.id}'`}}).then((res)=>{
+        console.log('res',res.data)
+        if(res.data.length>0){
+          this.userinfo = res.data[0]
+          console.log("88888888888888888")
+          console.log(JSON.stringify(this.userinfo))
+          if(this.userinfo.f_sign_path != ''){
+            this.userinfo.f_sign_path = 'rs/image/file/' + this.userinfo.f_sign_path
           }
-        })
-      }else{
-        console.log('没找到')
-        this.$showMessage('未查询到该用户安检单信息')
-        this.$parent.showcheckmsg = false
-      }
-    })
-  },
+        }else{
+          console.log('没找到')
+          this.$showMessage('未查询到该用户安检单信息')
+          this.$parent.showcheckmsg = false
+        }
+
+        if (this.userinfo.f_check_type=='民用'){
+          this.deviceconfig=Vue.config.safecheck.DevicesConfig
+         // console.log("deviceconfig1==>"+JSON.stringify(this.deviceconfig))
+        }else if (this.userinfo.f_check_type=='非民用'){
+          this.deviceconfig=Vue.config.safecheck.DevicesSetConfig
+          //console.log("deviceconfig2==>"+JSON.stringify(this.deviceconfig))
+        }
+        if (this.userinfo.f_collection_type=='按气量'){
+          this.deviceconfig["燃气表"]=this.config["燃气表"]
+          //console.log("deviceconfig3==>"+JSON.stringify(this.deviceconfig))
+        }else if (this.userinfo.f_collection_type=='按金额'){
+          this.deviceconfig["燃气表"]=this.config2["燃气表"]
+          //console.log("deviceconfig4==>"+JSON.stringify(this.deviceconfig))
+        }
+       // console.log("dddd1"+JSON.stringify(this.deviceconfig))
+        this.deviceconfig2=ObjConfig.getObjConfig(this.deviceconfig)
+        //console.log("dddd2"+JSON.stringify(this.deviceconfig))
+        this.deviceconfig2[0].items=jsonSort(this.deviceconfig2[0].items,"index")
+        //console.log("dddd3"+JSON.stringify(this.deviceconfig2))
+        this.deviceconfig2[1].items=jsonSort(this.deviceconfig2[1].items,"index")
+        //console.log("dddd4"+JSON.stringify(this.deviceconfig2))
+        this.deviceconfig2=jsonSort(this.deviceconfig2,"index")
+        //console.log("dddd5"+JSON.stringify(this.deviceconfig2))
+        this.defectcontent()
+      })
+
+    }).catch(
+      (respanse) => {
+        alert('获取配置文件失败')
+      })
+      },
   methods: {
     cancel(){
       this.$parent.showcheckmsg = false
     },
-    gotoPage(val,data,self='tab'){
-      console.log(data)
-      data.f_type = '回访'
-      data.f_telvisit_type = '安检'
-      this.$goto(val,{row:data},self)
+    getDeviceValue(val1,val2){
+
+        for (let i = 0; i < this.userinfo.f_devices[0].f_items.length; i++) {
+          if (this.userinfo.f_devices[0].f_items[i].f_item_name==val2){
+            return this.userinfo.f_devices[0].f_items[i].f_item_lists[0].f_item_value
+          }
+        }
+        for (let i = 0; i < this.userinfo.f_devices[1].f_items.length; i++) {
+          if (this.userinfo.f_devices[1].f_items[i].f_item_name==val2){
+            return this.userinfo.f_devices[1].f_items[i].f_item_lists[0].f_item_value
+          }
+        }
+      for (let i = 0; i < this.userinfo.f_devices[1].f_items.length; i++) {
+        if (this.userinfo.f_devices[2].f_items[i].f_item_name==val2){
+          return this.userinfo.f_devices[2].f_items[i].f_item_lists[0].f_item_value
+        }
+      }
+
+
+    },
+    defectcontent(){
+      let val1=this.userinfo.f_devices[1].f_items
+      let val2=this.userinfo.f_devices[0].f_items
+
+      for (let i = 0; i < val1.length; i++) {
+      if (val1[i].f_item_lists[0].f_is_defect=='true'){
+        this.defectCount='有隐患'
+        return
+      }
+      }
+      for (let i = 0; i < val2.length; i++) {
+        if (val2[i].f_item_lists[0].f_is_defect=='true'){
+          this.defectCount='有隐患'
+          return
+        }
+      }
+      this.defectCount='正常'
+      return '正常'
     },
     //获取当前时间
     getNowFormatDate() {
@@ -354,141 +298,6 @@ export default {
     // },
     //获取隐患信息
     getHidden(){
-      //清空所有数据
-      this.equipmentmsgs = []
-      this.devices = []
-      this.normalDevices = {}
-      this.Hinvestigations = []
-      this.device = []
-      this.normalDevice = []
-      //用户设备信息
-      let normal = ''
-      let deviceInfo
-      let f_device_type
-      for(let item in this.userinfo.f_devices){
-        let device = this.userinfo.f_devices[item]
-        f_device_type = device.f_device_type
-        //判断当前设备是否已存在，已存在命名加1
-        console.log('=======>>',this.equipmentmsgs)
-        if (this.equipmentmsgs.length == 0){
-          if(this.Hinvestigations.length != 0){
-            let m = 0
-            for (let i in this.Hinvestigations){
-              if(this.Hinvestigations[i].f_device_type.indexOf(f_device_type) != -1){
-                m = m+1
-              }
-            }
-            if(m>0){
-              f_device_type = `${device.f_device_type}${m}`
-            }
-          }
-        }else{
-          let m = 0
-          let n = 0
-          for (let n in this.equipmentmsgs){
-            console.log('是否有正常设备')
-            if(this.equipmentmsgs[n].f_device_type.indexOf(f_device_type) != -1){
-              m = m+1
-            }
-          }
-          for (let i in this.Hinvestigations){
-            console.log('隐患设备循环')
-            if(this.Hinvestigations[i].f_device_type.indexOf(f_device_type) != -1){
-              n = n+1
-            }
-          }
-          if(m>=n && m!=0){
-            f_device_type = `${device.f_device_type}${m}`
-          }else{
-            if( n!=0){
-              f_device_type = `${device.f_device_type}${n}`
-            }
-          }
-        }
-
-        //取出除燃气表外正常设备信息
-          for (let i in device.f_items){
-            console.log('=========')
-            console.log('device.f_items[i].f_is_defect')
-            console.log(device.f_items[i].f_is_defect)
-            console.log('device.f_items[i].f_is_defect != true')
-            console.log(!device.f_items[i].f_is_defect)
-            console.log('')
-            console.log(device.f_items[i].f_item_value != '' && !device.f_items[i].f_is_defect)
-            if(device.f_items[i].f_item_value != '' && device.f_items[i].f_is_defect != 'true'){
-              if(device.f_device_type == '燃气表'){
-                this.$set('deviceInfo.name',device.f_items[i].f_item_name)
-                this.$set('deviceInfo.value',device.f_items[i].f_item_value)
-                console.log('this.deviceInfo,',this.deviceInfo)
-                this.device.push(JSON.parse(JSON.stringify(this.deviceInfo)))
-                // deviceInfo = deviceInfo + `,${f_device_type}${device.f_items[i].f_item_name}${device.f_items[i].f_item_value}`
-              }else{
-                this.$set('normal.name',device.f_items[i].f_item_name)
-                this.$set('normal.value',device.f_items[i].f_item_value)
-                console.log('this.normal,',JSON.parse(JSON.stringify(this.normal)))
-                this.normalDevice.push(JSON.parse(JSON.stringify(this.normal)))
-              }
-            }else if(device.f_items[i].f_item_value != '' && device.f_items[i].f_is_defect == 'true'){
-              //隐患设备信息
-              if(device.f_items[i].f_item_value != '' && device.f_items[i].f_is_defect == 'true'){
-                if(device.f_device_type != '燃气表'){
-                  this.$set('Hinvestigation.name',device.f_items[i].f_item_name)
-                  this.$set('Hinvestigation.value',device.f_items[i].f_item_value)
-                  console.log('this.Hinvestigation,',JSON.parse(JSON.stringify(this.Hinvestigation)))
-                  this.HazardDevice.push(JSON.parse(JSON.stringify(this.Hinvestigation)))
-                }
-              }
-              console.log('f_device_type',f_device_type)
-            }
-            console.log('f_device_type',f_device_type)
-          }
-          if(this.device.length != 0){
-            if(device.f_device_type == '燃气表'){
-              console.log('燃气表信息===》',this.device)
-              this.$set('deviceInfos.f_device_type',f_device_type)
-              this.$set('deviceInfos.value',this.device)
-              this.device = []
-              this.devices.push(JSON.parse(JSON.stringify(this.deviceInfos)))
-              console.log('this.devices',this.devices)
-              // this.devices.push(this.device)
-            }
-          }
-
-          if(this.normalDevice.length != 0){
-            if(device.f_device_type != '燃气表'){
-              let values
-              this.$set('normalDevices.f_device_type',f_device_type)
-              this.$set('normalDevices.value',this.normalDevice)
-              this.normalDevice = []
-              console.log('this.normalDevices',this.normalDevices)
-              values = JSON.parse(JSON.stringify(this.normalDevices))
-              this.equipmentmsgs.push(values)
-            }
-          }
-        if(this.HazardDevice.length != 0){
-          let values
-          this.$set('HazardDevices.f_device_type',f_device_type)
-          this.$set('HazardDevices.value',this.HazardDevice)
-          this.HazardDevice = []
-          console.log('this.normalDevices',this.HazardDevices)
-          values = JSON.parse(JSON.stringify(this.HazardDevices))
-          this.Hinvestigations.push(values)
-        }
-      }
-      this.drowspan = this.devices.length
-      this.erowspan = this.equipmentmsgs.length
-      //设备隐患
-      console.log('结束',this.userinfo.f_defect_content)
-      let f_defect_content = JSON.parse(JSON.stringify(JSON.parse(this.userinfo.f_defect_content)))
-      this.f_defect_content = f_defect_content.result
-      // for (let defect of f_defect_content.data){
-      //   for (let key in defect){
-      //     this.$set('defect.f_defect_level',key)
-      //     this.$set('defect.value',defect[key])
-      //   }
-      //   this.Hinvestigations.push(JSON.parse(JSON.stringify(this.defect)))
-      // }
-      this.hrowspan = this.Hinvestigations.length
       setTimeout(()=> {
         console.log('关闭打印提示框')
         this.$parent.showcheckmsg = false

package/src/components/cockpit/Splash.vue

@@ -48,7 +48,7 @@ import co from 'co'
 import Vue from 'vue'
 
 let search = function * (self) {
-  let splash = yield self.$resetpost('rs/sql/汇总查询', {data: {f_plan_year: self.c_plan_year[0], f_subcompany: self.f_subcompany}}, {resolveMsg: null, rejectMsg: '查询出错！'})
+  let splash = yield self.$resetpost('api/af-safecheck/sql/汇总查询', {data: {f_plan_year: self.c_plan_year[0], f_subcompany: self.f_subcompany}}, {resolveMsg: null, rejectMsg: '查询出错！'})
   self.$set('model.rows', splash.data)
 }
 

package/src/components/cockpit/SplashDetail.vue

@@ -41,7 +41,7 @@ import co from 'co'
 import Vue from 'vue'
 
 let search = function * (self) {
-  let splash = yield self.$resetpost('rs/sql/汇总明细查询', {data: {f_plan_year: self.f_plan_year, f_subcompany: self.f_subcompany}}, {resolveMsg: null, rejectMsg: '查询出错！'})
+  let splash = yield self.$resetpost('api/af-safecheck/sql/汇总明细查询', {data: {f_plan_year: self.f_plan_year, f_subcompany: self.f_subcompany}}, {resolveMsg: null, rejectMsg: '查询出错！'})
   self.$set('rows', splash.data)
 }