safecheck-client 3.0.30-9 → 3.0.30-90

package/src/filiale/wensu/android/AndroidDefectDealItems.vue

@@ -0,0 +1,480 @@
+<style scoped>
+  .bg {
+    background-color: blue;
+    height: 1px;
+    border: 0;
+  }
+  .app-row {
+    background-color: white;
+    padding: 10px 10px 0 10px;
+    border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+  }
+  .search_input {
+    border: 0;
+    outline: none;
+  }
+  .font{
+    font: 15px PingFang-SC-Medium;
+    color: #666666;
+  }
+  .input-font{
+    font: 15px PingFang-SC-Medium;
+    color: #333333;
+  }
+  .btn-font{
+    font:600 16px PingFang-SC-Bold;
+    color: #499EDF;
+  }
+  .btn-color{
+    background-color: #FFFFFF;
+    border-radius: 10px ;
+    border: 1px solid #499EDF;
+  }
+  .app-text {
+    font-size: 12px;
+  }
+  .panel-self{
+    border-radius: 10px;
+    border:1px solid #499EDF;
+    background-color: #F8F8F8;
+  }
+  .yybtn-color{
+    background-color:#499edf;
+    border-radius: 4px ;
+    border: 1px solid #499EDF;
+    color: #FFFFFF;
+    font: 14px PingFang-SC-Bold;
+  }
+  .qxbtn-color{
+    background-color: #FFFFFF;
+    border-radius: 4px ;
+    color: #499edf;
+    font: 14px PingFang-SC-Bold;
+    border: 1px solid #499EDF;
+  }
+
+  .button_shrink_top {width: 35px; height: 35px; background-size:100%;background-image: url("../../../../static/newStyle/stretch_top.png")}
+  .button_shrink_bottom {width: 35px; height: 35px;  background-size:100%;background-image: url("../../../../static/newStyle/stretch_bottom.png")}
+  .button_shrink_left {width: 35px; height: 35px;  background-size:100%;background-image: url("../../../../static/newStyle/stretch_left.png")}
+  .button_shrink_right {width: 35px; height: 35px; background-size:100%;background-image: url("../../../../static/newStyle/stretch_right.png")}
+</style>
+<template>
+  <div style="height: auto;width: 100%">
+    <criteria-paged :model="model" v-ref:paged :pager="false">
+      <!--      <criteria partial='criteria' @condition-changed='search' v-ref:cri>-->
+      <!--        <div partial>-->
+      <!--          <form>-->
+      <!--            <div class="row app-row">-->
+      <!--              <div class="col-xs-4">-->
+      <!--                <img src="../../../assets/用户姓名.png" style="width: 20px;margin-bottom: 5px" alt="">-->
+      <!--                <label  class="font text-left">用户姓名：</label>-->
+      <!--              </div>-->
+      <!--              <div class="col-xs-8" >-->
+      <!--                <input  class="search_input input-font" v-model=model.f_user_name condition="tcp.f_user_name like '%{}%'" />-->
+      <!--              </div>-->
+      <!--            </div>-->
+      <!--            <div class="row app-row">-->
+      <!--              <div class="col-xs-4">-->
+      <!--                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">-->
+      <!--                <label for="f_userinfo_code" class="font text-left">用户编号：</label>-->
+      <!--              </div>-->
+      <!--              <div class="col-xs-8" >-->
+      <!--                <input id="f_userinfo_code" class="search_input input-font"-->
+      <!--                       v-model=model.f_userinfo_code condition="tcp.f_userinfo_code = '{}'" />-->
+      <!--              </div>-->
+      <!--            </div>-->
+      <!--            <div class="row app-row">-->
+      <!--              <div class="col-xs-4">-->
+      <!--                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">-->
+      <!--                <label for="f_meternumber" class="font text-left">用户表号：</label>-->
+      <!--              </div>-->
+      <!--              <div class="col-xs-8" >-->
+      <!--                <input id="f_meternumber" class="search_input input-font"-->
+      <!--                       v-model=model.f_meternumber condition="uf.f_meternumber = '{}'" />-->
+      <!--              </div>-->
+      <!--            </div>-->
+      <!--            <div class="row app-row">-->
+      <!--              <div class="col-xs-4">-->
+      <!--                <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">-->
+      <!--                <label class="font text-left">用户地址：</label>-->
+      <!--              </div>-->
+      <!--              <div class="col-xs-8">-->
+      <!--                <input class="search_input input-font"-->
+      <!--                       v-model=model.f_address condition="tcp.f_address like '%{}%'"  />-->
+      <!--              </div>-->
+      <!--            </div>-->
+      <!--            <div class="row app-row">-->
+      <!--              <div class="col-xs-4">-->
+      <!--                <img src="../../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">-->
+      <!--                <label for="f_state" class="font text-left">起始时间：</label>-->
+      <!--              </div>-->
+      <!--              <datepicker id="f_start_date"-->
+      <!--                          placeholder= '起始时间'-->
+      <!--                          :value.sync="model.f_start_date"-->
+      <!--                          :disabled-days-of-Week="[]"-->
+      <!--                          v-model="model.f_start_date"-->
+      <!--                          class="input-font"-->
+      <!--                          :format="'yyyy-MM-dd 00:00:00'"-->
+      <!--                          :show-reset-button="reset" readonly="readonly">-->
+      <!--              </datepicker>-->
+      <!--            </div>-->
+      <!--            <div class="row app-row">-->
+      <!--              <div class="col-xs-4">-->
+      <!--                <img src="../../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">-->
+      <!--                <label for="f_state" class="font text-left">结束时间：</label>-->
+      <!--              </div>-->
+      <!--              <datepicker id="f_end_date"-->
+      <!--                          placeholder= '结束时间'-->
+      <!--                          :value.sync="model.f_end_date"-->
+      <!--                          :disabled-days-of-Week="[]"-->
+      <!--                          v-model="model.f_end_date"-->
+      <!--                          class="input-font"-->
+      <!--                          :format="'yyyy-MM-dd 23:59:00'"-->
+      <!--                          :show-reset-button="reset" readonly="readonly">-->
+      <!--              </datepicker>-->
+      <!--            </div>-->
+      <!--            <div class="row text-center" style="margin-top: 20px;">-->
+      <!--              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;" @click="$parent.$parent.selfSearch">查询</button>-->
+      <!--              <div style="float: right;margin-right: 3% " class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"  @click="$parent.$parent.hidden()"></div>-->
+      <!--            </div>-->
+      <!--            <div style="height:30px;"></div>-->
+      <!--          </form>-->
+      <!--        </div>-->
+      <!--      </criteria>-->
+      <list :model="model" partial='list'>
+        <div partial>
+          <div  class="auto app-text" style="margin-top: 5px;">
+            <div class="panel" style="padding: 10px 10px 5px 10px;">
+              <div class="panel-body panel-self">
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户编号:</b></p>
+                  <p class="panel-title col-xs-5 text-left input-font" style="width: 74%">{{ row.f_userinfo_code }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户表号:</b></p>
+                  <p class="panel-title col-xs-5 text-left input-font" style="width: 74%">{{ row.f_meternumber }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户名称:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_user_name }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title text-left font" style="width: 23%;float: left"><b>用户电话:</b></p>
+                  <p class="panel-title text-left input-font" style="width: 77%">{{ row.f_user_phone }}</p>
+                </div>
+
+                <div class="col-xs-12">
+                  <p class="panel-title text-left font" style="width: 21%;float: left"><b>用户地址:</b></p>
+                  <p class="panel-title text-left input-font" style="width: 79%">{{ row.f_address }}</p>
+                </div>
+
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font"><b>检&ensp;查&ensp;项:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_device_type }}</p>
+                </div>
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font"><b>隐&ensp;患&ensp;项:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_item_name }}</p>
+                </div>
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font"><b>隐患原因:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_item_value }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right" @click="$parent.$parent.$parent.openshowModal(row.f_path)">查看</button>
+                  <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right;margin-right:10px;" @click="$parent.$parent.$parent.openshowModal1(row)">处理</button>
+                  <!--<button type="button" class="btn btn-default" @click="$parent.$parent.$parent.ceshi">确认2</button>-->
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+  <modal :show.sync="showModal">
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        隐患照片
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="from-group">
+        <div class="row">
+          <div class="col-md-6">
+            <img-self  :src="showimg"   width="300" height="400"></img-self>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-default" @click="closeshowModal">确认</button>
+    </div>
+  </modal>
+  <modal :show.sync="showModal1">
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        处理结果
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="form-group col-sm-12">
+        <div class="auto">
+          <div class="panel" style="padding: 10px 10px 5px 10px;">
+            <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+              <img-self :src="deal.f_deal_path"  alt="整改照片" :width="140" :height="170" capture="camera" type="file" ></img-self>
+              <div class="row text-right div-photo" style="height: 50px;margin-top: -30px">
+                <img src="../../../assets/remove.png"  @click="delfile('f_deal_path', deal.f_deal_path)" ></img>
+                <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_deal_path','整改照片')" >拍照</button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="form-group col-sm-12" v-if="isNeedDealSign">
+        <p class="panel-title  text-left font" style="text-align: center">用户签名:</p>
+        <div class="auto">
+          <div class="panel" style="padding: 10px 10px 5px 10px;">
+            <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+              <img :src="deal.f_dealsign_path" :width="200" :height="150"/>
+              <div class="row text-right div-photo" style="height: 50px;margin-top: 60px">
+                <button type="button" name="button" class="btn btn-primary btn-photo" @click="sign">签名</button> </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="row app-row">
+        <div class="col-xs-2">
+          <p class="panel-title  text-left font" style="text-align: center">备注</p>
+        </div>
+        <div class="col-xs-9">
+          <textarea class="input-font " v-model=deal.f_deal_remark style="width: 100%"></textarea>
+        </div>
+      </div>
+      <div class="row app-row">
+        <label class="checkbox-inline">
+          <input type="checkbox"  v-model="deletecauseBooble"> 是否需要取消拉黑
+        </label>
+      </div>
+      <div class="row app-row" v-show="deletecauseBooble">
+        <div class="col-xs-2">
+          <p class="panel-title  text-left font" style="text-align: center">取消拉黑原因：</p>
+        </div>
+        <div class="col-xs-9">
+          <textarea class="input-font " v-model="deletecause" style="width: 100%" placeholder="请输入取消限制用户购气原因"></textarea>
+        </div>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-default" @click="commitDealDefect">确认</button>
+      <button type="button" class="btn btn-default" @click="closeshowModal1">取消</button>
+    </div>
+  </modal>
+</template>
+
+<script>
+
+  import Vue from 'vue'
+  import { PagedList,HttpResetClass } from 'vue-client'
+  import * as Util from '../../Util'
+
+  export default {
+    title: '无计划安检查询',
+    props: {
+      id: {
+        type: String
+      }
+    },
+    data() {
+      return {
+        showModal:false,
+        showModal1:false,
+        showimg:'',
+        deletecause:'',
+        deletecauseBooble: false,
+        deal:{
+          result:{},
+          f_deal_path:'',
+          f_deal_remark:'',
+          f_dealsign_path:'', //签名
+          f_dealer:Vue.user.name,
+          f_dealer_id:Vue.user.id
+        },
+        f_filialeids:'',
+        model:new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/AndroidDealWith`,20,{condition:'this.condition',f_filialeids:`'${Vue.user.orgid}'`,f_checker_id:`'${Vue.user.id}'`}),
+        criteriaShow: false,
+        isNeedDealSign: this.$appdata.getSingleValue('隐患处理是否需要签名') == 'true',
+      }
+    },
+    ready(){
+      this.$androidUtil.setPreference('paper_id', this.id)
+      this.selfSearch()
+    },
+    methods: {
+      // 签名回调
+      signCallback(prop, fileName) {
+        console.log("签名回调地址" + fileName)
+        // HostApp.alert('绑定属性:' + prop + ' 文件全路径如file:///storage/sdcard0/safecheck/abc.jpg：' + fullFileName)
+        HostApp.__this__.$set('deal.f_dealsign_path', fileName)
+        HostApp.__callback__ = null
+        HostApp.__this__ = null
+      },
+      // 用户签名
+      sign() {
+        if (!this.deal.f_deal_path) {
+          this.$showMessage('请先拍摄处理后照片!!!')
+          return
+        }
+        this.delAudioFile('f_dealsign_path', this.deal.f_dealsign_path)
+        let prop = 'f_dealsign_path'
+        let idx = 'aofeng'
+        let fileName
+        if (!this.deal.f_dealsign_path) {
+          fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
+        } else {
+          fileName = Util.getFileName(this.deal.f_dealsign_path)
+        }
+        HostApp.__callback__ = this.signCallback
+        HostApp.__this__ = this
+        HostApp.getSignature({
+          file: fileName,
+          requestCode: 111,
+          callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");'
+        })
+      },
+      delAudioFile(prop, fileName) {
+        if (!fileName)
+          return
+        else {
+          HostApp.delfile(fileName)
+          this.deal[prop] = null
+        }
+      },
+      commitDealDefect(){
+        if (this.deletecauseBooble && !this.deletecause) {
+          this.$showMessage("请填写取消拉黑原因！")
+          return;
+        }
+        if (!this.deal.f_deal_path){
+          this.$showMessage('处理后照片必须上传')
+          return
+        }
+        if (this.isNeedDealSign && !this.deal.f_dealsign_path){
+          this.$showMessage('签名必须上传')
+          return
+        }
+        if (this.deletecauseBooble) {
+          let http = new HttpResetClass()
+          http.load('POST', 'http://36.108.175.152:8000/API/Secheck/SetBlackList', {
+            data: {
+              "id": this.deal.result.f_userinfo_code,
+              "bh": this.deal.result.f_meternumber,
+              "black": false,
+              "blackMemo": this.deletecause
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+            .then((res)=>{
+              if (res.data.Success) {
+                HostApp.__this__ = this
+                HostApp.logicWithHint({'logic': 'safe_dealWithDefect', 'callback': 'javascript: HostApp.__this__.commitCallBack()',
+                  'data': this.deal, 'backresult':1
+                })
+              } else {
+                this.$showMessage("取消拉黑失败，请稍后再试！")
+              }
+            })
+        } else {
+          HostApp.__this__ = this
+          HostApp.logicWithHint({'logic': 'safe_dealWithDefect', 'callback': 'javascript: HostApp.__this__.commitCallBack()',
+            'data': this.deal, 'backresult':1
+          })
+        }
+      },
+      commitCallBack(jo){
+        //tag
+        //tag)
+        if (jo.state =='ok'){
+          let ress = JSON.parse(jo.result)
+          if (ress.code == 200 ) {
+            this.$showMessage(ress.msg)
+            this.closeshowModal1()
+          } else {
+            this.$showMessage(ress.msg)
+          }
+        }else{
+          this.$showMessage('本地服务调用失败')
+        }
+      },
+      delfile(prop, fileName) {
+        if (fileName == Vue.nopic)
+          return
+        else {
+          HostApp.delfile(fileName)
+          this.deal[prop] = Vue.nopic
+        }
+      },
+      openshowModal(val){
+        //tag
+        //tag
+        this.showimg=`${this.$androidUtil.getProxyUrl()}/rs/image/file/`+val
+        this.showModal=true
+      },
+      closeshowModal(){
+        this.showimg=''
+        this.showModal=false
+      },
+      openshowModal1(val){
+        this.deal.result=val
+        //tag
+        //tag
+        this.showModal1=true
+      },
+      closeshowModal1(){
+        this.deal={
+          result: {},
+          f_deal_path:'',
+          f_deal_remark:'',
+          f_dealsign_path:'', //签名
+          f_dealer:Vue.user.name,
+          f_dealer_id:Vue.user.id
+        }
+        this.showModal1=false
+        this.selfSearch()
+      },
+      cameraCallBack(prop, fileName) {
+        HostApp.__this__.deal.f_deal_path = fileName
+        HostApp.__callback__ = null
+        HostApp.__this__ = null
+      },
+      takePic(prop, title) {
+        HostApp.__callback__ = this.cameraCallBack
+        HostApp.__this__ = this
+        let fileName
+        if (!this.deal.f_deal_path || this.deal.f_deal_path.includes("nopic.png")) {
+          fileName = Util.guid() + '-' + prop + '.jpg'
+        } else {
+          fileName = Util.getFileName(this.deal.f_deal_path)
+        }
+        //tag
+        //tag
+        HostApp._open_a_page({
+          type: 'boomerang',
+          page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
+          param: {
+            file: fileName,
+            requestCode: 111,
+            callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");',
+            watermark: title + '\t时间：' + Util.toStandardTimeString() + '\t' + Vue.user.name
+          }
+        })
+      },
+      selfSearch () {
+        this.model.search(`tcp.id = '${this.id}'`)
+      },
+
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+    }
+  }
+</script>

package/src/filiale/wensu/android.js

@@ -9,6 +9,7 @@ let specialComp = {
   'PhoneUpUserinfo': (resolve) => { require(['./android/PhoneUpUserinfo'], resolve) },
   'paper-feedback': (resolve) => { require(['./android/PaperFeedback'], resolve) },
   'android-defect-deal': (resolve) => { require(['./android/AndroidDefectDeal'], resolve) },
+  'android-defect-deal-items': (resolve) => { require(['./android/AndroidDefectDealItems'], resolve) },
   'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/wensu/pc/CheckSearchUser.vue

@@ -183,6 +183,28 @@
                         :value-single="true">
               </v-select>
             </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">用户性质</label>
+              <v-select class="select_list select"
+                        placeholder='用户性质' style="width: 60%"
+                        :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                        :options='$parent.$parent.gasproperties'
+                        close-on-select clear-button
+                        condition="f_gasproperties = '{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">片区</label>
+              <v-select class="select_list select"
+                        placeholder='片区' style="width: 60%"
+                        :value.sync="model.f_outlets" v-model="model.f_outlets"
+                        :options='$parent.$parent.userareas'
+                        close-on-select clear-button
+                        condition="f_outlets = '{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
           </div>
 
           <div class="row" v-show="$parent.$parent.$parent.showItem">
@@ -583,6 +605,8 @@ export default {
       f_defect_content:"CASE WHEN CHARINDEX( '\"result\":\"正常\"', tp.f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( tp.f_defect_content, len( tp.f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END",
       orgstrs: [{label: '全部', value: ''}],
       checkersid: [],
+      gasproperties:[],
+      userareas:[],
       SafeCheckXZ: '',
       civil: '',   //民用安检周期
       civilian: '',      //非民用安检周期
@@ -659,6 +683,8 @@ export default {
     this.model.f_OrgStr = this.$login.f.orgpathstr
     this.Mreadibook(`('${this.$login.f.orgid}')`)
     this.getAllMeterBook(`('${this.$login.f.orgid}')`)
+    this.getAllGasproperties()
+    this.getAllOutlets()
   },
   methods: {
     async blacklist(){
@@ -1037,6 +1063,44 @@ export default {
       })
       this.adjustables = [{label: '全部', value: ''}, ...arr]
     },
+    getAllGasproperties(){
+      this.gasproperties=[{
+        label:'全部',
+        value:''
+      }]
+        new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_GroupBy`, {data: {
+            items: 'f_gasproperties',
+            tablename: 't_userfiles',
+            condition: `1=1`,
+            groupitem: 'f_gasproperties'
+          }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          res.data.forEach(ress=>{
+            this.gasproperties.push({
+              label:ress.f_gasproperties,
+              value:ress.f_gasproperties
+            })
+          })
+        })
+    },
+    getAllOutlets(){
+      this.userareas=[{
+        label:'全部',
+        value:''
+      }]
+      new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_GroupBy`, {data: {
+          items: 'f_outlets',
+          tablename: 't_user_address',
+          condition: `1=1`,
+          groupitem: 'f_outlets'
+        }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        res.data.forEach(ress=>{
+          this.userareas.push({
+            label:ress.f_outlets,
+            value:ress.f_outlets
+          })
+        })
+      })
+    },
     getAllMeterBook(val){
       ////tag
       ////tag

package/src/filiale/wensu/pc/DefectPaperNew.vue

@@ -598,8 +598,10 @@ export default {
       repairers: [],
       cbcs: [],
       thead: '',
-      headData: ['入户状态', '用户编号', '用户名', '用户电话', '用户小区', '用户地址', '用户表号', '安检时间', '安检员', '计划名', '是否有隐患', '隐患数', '隐患明细'],
-      bodyData: ['f_entry_status', 'f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_residential_area', 'f_address', 'f_meternumber', 'f_offsite_time', 'f_checker_name', 'f_plan_name', 'f_has_defect', 'f_defect_count', 'f_defect_content'],
+      headData: ['入户状态', '用户编号', '用户名', '用户电话', '用户小区', '用户地址', '用户表号',
+        '安检时间', '安检员', '计划名', '是否有隐患', '隐患数','处理数','处理情况', '隐患明细','最后一次隐患处理时间'],
+      bodyData: ['f_entry_status', 'f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_residential_area', 'f_address', 'f_meternumber',
+        'f_offsite_time', 'f_checker_name', 'f_plan_name', 'f_has_defect', 'f_defect_count','f_deal_count', 'f_is_deal','f_defect_content','f_repair_date'],
       f_defect_contents: [{label:"全部",value:""}],
       DevicesConfig: [],
       DevicesSetConfig: []
@@ -1043,16 +1045,20 @@ export default {
         } else {
           //this.f_dir=res.data[0].f_dir
           try {
-            let res1 = await new HttpResetClass().load('GET', `/safecheck/rs/vue/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
+            let res = await new HttpResetClass().load('get', `/phone/rs/vue`, {}, {
+              resolveMsg: null,
+              rejectMsg: null
+            })
+            /*let res1 = await new HttpResetClass().load('post', `/safecheck/rs/vue/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
               resolveMsg: '获取居民配置项成功！',
               rejectMsg: '获取居民配置项出错！'
-            })
-            this.DevicesConfig = res1.data
-            let res2 = await new HttpResetClass().load('GET', `/safecheck/rs/vue/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
+            })*/
+            this.DevicesConfig = res.data.safecheck.DevicesConfig
+            /*let res2 = await new HttpResetClass().load('post', `/safecheck/rs/vue/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
               resolveMsg: '获取非居民配置项成功！',
               rejectMsg: '获取非居民配置项出错！'
-            })
-            this.DevicesSetConfig = res2.data
+            })*/
+            this.DevicesSetConfig = res.data.safecheck.DevicesSetConfig
           } catch (e) {
             self.$showMessage("获取配置文件失败" + e)
           }
@@ -1085,8 +1091,8 @@ export default {
       }
       if (this.DevicesSetConfig) {
         for (const key in this.DevicesSetConfig) {
-          if (Object.hasOwnProperty.call(this.DevicesConfig, key)) {
-            for (const ke in this.DevicesConfig[key]['items']) {
+          if (Object.hasOwnProperty.call(this.DevicesSetConfig, key)) {
+            for (const ke in this.DevicesSetConfig[key]['items']) {
               defectTypeSet.add(ke)
             }
           }