safecheck-client 3.0.30-62 → 3.0.30-62-t4

package/src/filiale/yuansheng/android/PaperFeedback.vue

@@ -400,7 +400,7 @@ import co from 'co'
 //               if(items.f_is_defect == true || items.f_is_defect == 'true'){
 //                 checkResult = '有隐患'
 //                 ////tag
-//                 let res = yield self.$resetpost(`${self.Url}/rs/sql/getDeviceItem`,{data:{f_device_id:codata[device][item].f_device_id,f_item_name:items.f_item_name}})
+//                 let res = yield self.$resetpost(`${self.Url}/api/af-safecheck/sql/getDeviceItem`,{data:{f_device_id:codata[device][item].f_device_id,f_item_name:items.f_item_name}})
 //                 ////tag)
 //                 self.$set('detail.f_defect_id', res.data[0].id)
 //                 self.$set('detail.f_project',`${items.f_item_name}：${items.f_item_value}`)
@@ -437,7 +437,7 @@ import co from 'co'
 //         self.undo()
 //         self.$set('paper.f_SafeToRepair_id',res.data.f_service_id)
 //         ////tag
-//         self.$resetpost(`${self.Url}/rs/logic/updatePaperRepair`,{data:{f_paper_id:self.paper.f_paper_id,f_SafeToRepair_id:res.data.f_service_id}}).then((ret)=>{
+//         self.$resetpost(`${self.Url}/api/af-safecheck/logic/updatePaperRepair`,{data:{f_paper_id:self.paper.f_paper_id,f_SafeToRepair_id:res.data.f_service_id}}).then((ret)=>{
 //           ////tag
 //           if(ret.data.code ==200){
 //             ////tag
@@ -476,7 +476,7 @@ import co from 'co'
 //       }
 //     }else{
 //       ////tag
-//       self.$resetpost(`${self.Url}/rs/sql/safeCheckgetUserInfo`,{data:{id:self.paper.f_userinfoid}},{resolveMsg: null, rejectMsg: null}).then((res)=>{
+//       self.$resetpost(`${self.Url}/api/af-safecheck/sql/safeCheckgetUserInfo`,{data:{id:self.paper.f_userinfoid}},{resolveMsg: null, rejectMsg: null}).then((res)=>{
 //         ////tag
 //         if(res.data.length != 0){
 //           self.$parent.$parent.user = res.data[0]
@@ -579,7 +579,7 @@ export default {
     },
     // async isoverDate(){
     //   ////tag
-    //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/androidGetuserinfo`, {data:{
+    //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/androidGetuserinfo`, {data:{
     //       condition:"f_plan_item_id='"+this.$parent.$parent.item.id+"'"
     //     }
     //   })
@@ -1156,7 +1156,7 @@ export default {
       ////tag)
       let http = new HttpResetClass()
       ////tag
-      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
           items: "version",
           tablename: "t_userinfo",
@@ -1166,7 +1166,7 @@ export default {
       }, {resolveMsg: null, rejectMsg: null})
       ////tag)
       ////tag
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
         data: {
           "f_operat_type": "取消拉黑",
           "f_state": "有效",
@@ -1208,7 +1208,7 @@ export default {
       ////tag)
       let http = new HttpResetClass()
       ////tag
-      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
           items: "version",
           tablename: "t_userinfo",
@@ -1218,7 +1218,7 @@ export default {
       }, {resolveMsg: null, rejectMsg: null})
       ////tag)
       ////tag
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
         data: {
           data:this.$parent.$parent.data,
           item:this.$parent.$parent.data.item,
@@ -1270,7 +1270,7 @@ export default {
         ////tag
         this.$parent.$parent.model.serviceacitivity[0].f_reciever = val.name
         let http1 = new HttpResetClass()
-        http1.load('POST', `${this.Url}/rs/sql/tel_singleTable_OrderBy`, {
+        http1.load('POST', `${this.Url}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
           data: {
             items: 'f_user_telephone',
             tablename: 't_user',

package/src/filiale/yuansheng/android/PhoneUpUserinfo.vue

@@ -434,7 +434,7 @@ export default {
       //tag
       if(this.selectStreet.id){
         let pcdText=text?`and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'`:`and f_street_id=${this.selectStreet.id}`
-        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
           //tag)
           if(res.data.length>0){
             this.area=[]
@@ -510,7 +510,7 @@ export default {
           this.userinfo_old.meterinfo[0].devicesinfo=this.model
           userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
           //tag)
-          new HttpResetClass().load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_fileSave`, {data: {userinfo: userinfoms,modifyReason:this.f_source?`${this.f_source}维护档案信息`:'',address:{id:this.userinfo_old.addressinfo.id,oldid:this.userinfo_old.addressinfo.id}}},{resolveMsg: null, rejectMsg: null}).then((res1)=>{
+          new HttpResetClass().load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_fileSave`, {data: {userinfo: userinfoms,modifyReason:this.f_source?`${this.f_source}维护档案信息`:'',address:{id:this.userinfo_old.addressinfo.id,oldid:this.userinfo_old.addressinfo.id}}},{resolveMsg: null, rejectMsg: null}).then((res1)=>{
             //tag+res1.data.status)
             if(res1.data.status==200){
               //本次修改信息包含需要审核信息
@@ -622,7 +622,7 @@ export default {
         this.selectArea={id:''}
         this.area=[]
         let pcdText=` and f_street_id=${this.selectStreet.id}`
-        let res= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null})
+        let res= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null})
         ////tag)
         res.data.forEach((result)=>{
           this.area.push({label:result.f_residential_area,value:result})
@@ -651,7 +651,7 @@ export default {
         this.userinfo.addressinfo.f_slice_area=''
         this.streets=[]
         let pcdText=`and f_pcd_id=${this.selectPcd.id}`
-        let streetlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
+        let streetlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
         streetlist.data.forEach((result)=>{
           this.streets.push({label:result.f_street,value:result})
         })
@@ -735,7 +735,7 @@ export default {
       if(this.selectStreet.id){
         this.area=[]
         let pcdText=text?`and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'`:`and f_street_id=${this.selectStreet.id}`
-        let res= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
+        let res= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
         ////tag)
         res.data.forEach((result)=>{
           this.area.push({label:result.f_residential_area,value:result})
@@ -752,7 +752,7 @@ export default {
         //tag
         this.streets=[]
         let pcdText=`and f_pcd_id=${this.selectPcd.id}`
-        let streetlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
+        let streetlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
         streetlist.data.forEach((result)=>{
           //如果第一次进来有地址id 就拿下地址区域
           if(this.selectStreet.id && this.selectStreet.id==result.id){
@@ -831,13 +831,13 @@ export default {
       this.excessive=true
       //Vue.user.orgid ${this.f_userinfo_id} 10101    ${Vue.user.orgid}
 
-      let pcdlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_pcd",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}'`}}, {resolveMsg: null, rejectMsg: null})
+      let pcdlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_pcd",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}'`}}, {resolveMsg: null, rejectMsg: null})
       //tag)
       pcdlist.data.forEach((result)=>{
         this.pcds.push({label:result.f_pcd,value:result})
       })
       ////tag)
-      let res=await new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_getFilesDetail`, {
+      let res=await new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_getFilesDetail`, {
         //f_userinfo_code:'12381344',
         f_userinfo_id:this.f_userinfo_id
       }, {resolveMsg: null, rejectMsg: null})

package/src/filiale/yuansheng/android/SafecheckDevices.vue

@@ -713,7 +713,6 @@ export default {
       //tag ===> ' + Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value))
       //tag ===> ' + JSON.stringify(Number(this.gasDeviation)))
       // 计算差值是否在范围内
-
       if (Math.abs(this.f_items[this.f_meter_aberrant_number2.index].f_item_value) > Number(this.gasDeviation)) {
         this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = true
         this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = '未处理'
@@ -721,6 +720,17 @@ export default {
         this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = null
         this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = null
       }
+      if( this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = true){
+        this.$showMessage(`表底数异常差值为:${this.f_items[this.f_meter_aberrant_number2.index].f_item_value},是否为隐患？`, ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = true
+            this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = '未处理'
+          }else{
+            this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = null
+            this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = null
+          }
+        })
+      }
     },
 
     getGasAberrantNumber(val) {

package/src/filiale/yuansheng/android/SafecheckOrderV.vue

@@ -578,7 +578,7 @@ export default {
     },
     getImgGen(){
       let http = new HttpResetClass()
-      http.load('POST','rs/sql/tel_singleTable_OrderBy', {data: {
+      http.load('POST','api/af-safecheck/sql/tel_singleTable_OrderBy', {data: {
           items: '*',
           tablename: 't_files',
           condition: `id in (${this.ids})`,
@@ -1760,7 +1760,7 @@ export default {
       return obj;
     },
     // async isoverDate(){
-    //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/androidGetuserinfo`, {data:{
+    //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/androidGetuserinfo`, {data:{
     //       condition:"f_plan_item_id='"+this.item.id+"'"
     //     }
     //   })

package/src/filiale/yuansheng/android/SafecheckUserInfo.vue

@@ -283,7 +283,7 @@ export default {
       this.$showMessage('将用户 ' + this.userinfo.f_user_name + '的机表表号从' + this.userinfo.planmeterss.f_meter_no + '修改为' + f_meter_no, ['confirm', 'cancel']).then((butt) => {
         if (butt == 'confirm') {
           let http = new HttpResetClass()
-          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/safecheckUpdateBiaoHao`, {
+          http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/safecheckUpdateBiaoHao`, {
             f_meter_no: f_meter_no,
             f_userinfo_id: f_userinfo_id
           }, {resolveMsg: null, rejectMsg: null}).then((res) => {
@@ -306,7 +306,7 @@ export default {
       this.$showMessage('是否确定进行修改?', ['confirm', 'cancel']).then((butt) => {
         if (butt == 'confirm') {
           let http = new HttpResetClass()
-          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/safecheckUpdateBiaoXingHao`, {
+          http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/safecheckUpdateBiaoXingHao`, {
             biaoxinghao: this.biaoxinghao,
             f_userinfo_id: this.userinfo.f_userinfoid
           }, {resolveMsg: null, rejectMsg: null}).then((res) => {
@@ -330,7 +330,7 @@ export default {
       //tag)
       //tag
       let http1 = new HttpResetClass()
-      http1.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+      http1.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
         data: {
           items: 'gm.id,gm.f_meter_style',
           tablename: 't_gasbrand gb LEFT JOIN t_gasmodel gm ON gb.id= gm.f_gasbrand_id ',
@@ -355,7 +355,7 @@ export default {
       this.$showMessage('将用户 ' + this.userinfo.f_user_name + '的电话号码从' + this.beforephone + '修改为' + f_user_phone, ['confirm', 'cancel']).then((butt) => {
         if (butt == 'confirm') {
           let http = new HttpResetClass()
-          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/safecheckUpdatePhone`, {
+          http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/safecheckUpdatePhone`, {
             f_user_phone: f_user_phone,
             f_userinfo_id: f_userinfo_id
           }, {resolveMsg: null, rejectMsg: null}).then((res) => {

package/src/filiale/yuansheng/android/SwitchValve.vue

@@ -0,0 +1,322 @@
+<style scoped>
+.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;
+}
+</style>
+
+<template>
+  <div class="auto">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div partial>
+          <p align="center" style="color: maroon" v-if="!$parent.$parent.isHaveJiBiao">只限物联网表进行开关阀操作</p>
+          <p align="center" style="color: maroon" v-if="$parent.$parent.isHaveJiBiao">只限物联网表和机表进行操作</p>
+          <form>
+            <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="$parent.$parent.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="$parent.$parent.f_meternumber" />
+              </div>
+            </div>
+            <div class="row app-row" v-if="$parent.$parent.isHaveJiBiao">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户类型.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_meternumber" class="font text-left">气表类型：</label>
+              </div>
+              <div class="col-xs-8" >
+                <v-select
+                  class="input-font"
+                  placeholder='请选择气表类型'
+                  :value.sync="$parent.$parent.f_meter_type"
+                  v-model="$parent.$parent.f_meter_type"
+                  :options='$parent.$parent.meterTypeOptions'
+                  close-on-select
+                  clear-button>
+                </v-select>
+              </div>
+            </div>
+            <div class="row text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="search">查询</button>
+            </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="float: left"><b>用户编号:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" >{{ row.f_userinfo_code }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="float: left"><b>用户名称:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" >{{ row.f_user_name }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_user_type }}
+                  </p>
+                </div>
+                <div class="col-xs-12">
+                  <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_user_phone }}
+                  </p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title text-left font" style="float: left"><b>用户地址:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" >{{ row.f_address }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_meternumber }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_aroundmeter }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_meter_brand }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_meter_type }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_meter_base }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_balance_amount }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_batteryLevel2 }}</p>
+                </div>
+                <div class="col-xs-6" v-if="row.f_meter_type == '物联网表'">
+                  <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_valve_state }}</p>
+                </div>
+                <div class="col-xs-6" v-if="row.f_meter_type == '物联网表'">
+                  <button class="btn  btn-font btn-color"  type="button"  style="width: 28%;padding: 2px 5px;"  v-if="row.f_valve_state == '关阀'" @click="$parent.$parent.$parent.openvalve(row)">开阀</button>
+                  <button class="btn  btn-font btn-color" type="button"  style="width: 28%;padding: 2px 5px;" v-if="row.f_valve_state == '开阀'" @click="$parent.$parent.$parent.clonevalve(row)">关阀</button>
+                  <button class="btn  btn-font btn-color" type="button"  style="width: 28%;padding: 2px 5px;" v-if="row.f_meter_brand.includes('西美')"  @click="$parent.$parent.$parent.clearBarrier(row)">清除障碍</button>
+                </div>
+                <div class="col-xs-6" v-if="row.f_meter_type == '机表'">
+                  <button class="btn  btn-font btn-color" type="button"  style="width: 50%;padding: 2px 5px;" @click="$parent.$parent.$parent.goVindicate(row)">档案维护</button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+    <modal :show.sync="showModal">
+      <div slot="modal-header" class="modal-header">
+        <h4 class="modal-title">
+          {{modalTitle}}
+        </h4>
+      </div>
+      <div slot="modal-body" class="modal-body">
+        <div class="row" style="margin-top: 6px">
+          <textarea id="el_ca_txt" v-model.trim="f_comments" style="border-radius:4px;width: 100%;" placeholder="请输入开关阀原因" >
+          </textarea>
+        </div>
+      </div>
+      <div slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-default" @click="showModal = false">取消</button>
+        <button type="button" class="btn btn-success" @click="openOrCloneValveMethod(istype)">{{istype}}</button>
+      </div>
+    </modal>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+import { PagedList } from 'vue-client'
+import PhoneUpUserinfo from './PhoneUpUserinfo'
+
+
+export default {
+  title: '开关阀',
+  data () {
+    return {
+      model: Vue.android ? new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/SwitchValveSeachUser`, 5) : new PagedList( 'AndroidRest/api/af-safecheck/sql/SwitchValveSeachUser',5),
+      f_meternumber: '',
+      f_userinfo_code: '',
+      f_operator: Vue.user.name,
+      filialeid: Vue.user.orgid,
+      // f_operator: '温艺轩',
+      // filialeid: '453',
+      type: '',
+      showModal: false,
+      modalTitle: '', //开关阀标题
+      f_comments: '', //开关阀原因
+      istype: '', //
+      thisOneData: '', //当前操作的用户
+      f_meter_type: '',
+      condition: '',
+      isHaveJiBiao: false,
+      meterTypeOptions: [{label: '全部', value: ''}, {label: '物联网表', value: '物联网表'}, {label: '机表', value: '机表'}]
+    }
+  },
+  ready () {
+    this.isHaveJiBiao = this.$appdata.getSingleValue('开关阀是否查询机表') === '是'
+    if (this.isHaveJiBiao) {
+      this.condition = " and f_meter_type in ('物联网表', '机表')"
+    } else {
+      this.condition = " and f_meter_type in ('物联网表')"
+    }
+  },
+  methods: {
+    clearBarrier(val){
+      // 127.0.0.1:8445
+      // 参数
+      let datas =  {
+        moduleName:"XiMeiSystem", // 固定值
+        content:{
+          tradeCode:"3015",// 固定值
+          appid: "yysf", // 固定值
+          partner: "cqsemay_bcts", // 固定值
+          version:"v1", // 固定值
+          tasked:this.getuuid(), // 任务id
+          notifyUrl:"http://192.168.2.10:8445/webmeter/api/af-safecheck/logic/XiMeiSystemCallBack", // 固定值
+          meterNo: val.f_meternumber,// 表号
+          signType:" MD5" //固定值
+        },
+        title: "清除异常", // 固定值
+        type: "清除异常", // 固定值
+        inputtor:this.f_operator, // 操作人
+        userId:val.f_userfiles_id,   // 表档案ID
+        dataId: null // 操作记录ID
+      }
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/webmeter/api/af-safecheck/logic/syncSaveSetParamsTemplate`, {data: datas},{resolveMsg: `清理成功`, rejectMsg: `清理失败`}).then(res => {
+      })
+    },
+    getuuid(){
+      let uuidA = '';
+      var s = [];
+      var hexDigits = '0123456789abcdef';
+      for (var i = 0; i < 36; i++) {
+        s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+      }
+      s[14] = '4';
+      s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+      s[8] = s[13] = s[18] = s[23] = '-';
+      uuidA = s.join('');
+      return uuidA;
+    },
+    selfSearch () {
+      //tag
+      // let condition =  ` uf.f_filialeid = '${this.filialeid}'`
+      let condition =  ` 1=1 `
+      condition += this.condition
+      condition += this.f_meternumber ? ` and uf.f_meternumber = '${this.f_meternumber}'` : ""
+      condition += this.f_userinfo_code ? ` and f_userinfo_code = '${this.f_userinfo_code}'` : ""
+      condition += this.f_meter_type != '' && this.f_meter_type != [] ? ` and f_meter_type = '${this.f_meter_type}'` : ""
+      console.log(condition)
+      //tag
+      this.model.search(condition)
+    },
+    openvalve (val) {
+      //tag
+      this.modalTitle = '对表号为'+ val.f_meternumber+'开阀'
+      this.istype = '开阀'
+      this.showModal = true;
+      this.thisOneData = val;
+    },
+    clonevalve (val) {
+      //tag
+      this.modalTitle = '对表号为'+ val.f_meternumber+'关阀'
+      this.istype = '关阀'
+      this.showModal = true;
+      this.thisOneData = val;
+    },
+    openOrCloneValveMethod (msg) {
+      if (this.f_comments=='') {
+        return  this.$showMessage("请输入开关阀原因")
+      }
+      var data = {
+        instructType: '阀门控制',
+        instructTitle: `手动${msg}`,
+        condition: `t_userfiles.f_userfiles_id='${this.thisOneData.f_userfiles_id}'`,
+        meterBrandName: this.thisOneData.f_alias,  // 气表别名
+        f_instruct_state: '待发送',
+        inputtor: this.f_operator,
+        reasonInfo: this.f_comments,   //操作原因
+        meternumberf: this.thisOneData.f_meternumber,  //表号
+        contentData: {isOpen: msg=='开阀' ? 1 : 0},  // oper 为true 时为开阀   false 为关阀
+      }
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/iot_saveInstruct`, {data: data}).then((row) => {
+        this.$showMessage(`${msg}指令发送成功，请等候2分钟进行查询`)
+        //tag
+        this.thisOneData = '';
+        this.istype = '';
+        this.f_comments = '';
+        this.showModal = false
+        this.selfSearch()
+      })
+    },
+    //  档案维护
+    goVindicate(row) {
+      console.log(row)
+      var pardate = {
+        title:'档案维护',
+        safe:true
+      }
+      this.$dispatch('gotoson',pardate)
+      this.$goto('PhoneUpUserinfo', {f_userinfo_id: row.f_userinfo_id},'self')
+    }
+  },
+  components: {
+    'PhoneUpUserinfo': PhoneUpUserinfo
+  }
+}
+</script>

package/src/filiale/yuansheng/android.js

@@ -4,10 +4,12 @@ import Vue from "vue";
 // 手机特殊目录注册到该文件中
 let specialComp = {
   'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'switch-valve': (resolve) => { require(['./android/SwitchValve'], resolve) },
   'paper-feedback' : (resolve) => { require(['./android/PaperFeedback'], resolve) },
   'paper-state': (resolve) => { require(['./android/PaperState.vue'], resolve) },
   'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices.vue'], resolve) },
   'PhoneUpUserinfo': (resolve) => { require(['./android/PhoneUpUserinfo.vue'], resolve) },
+  'android-defect-deal': (resolve) => { require(['./android/AndroidDefectDeal'], resolve) },
   'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo.vue'], resolve) }
 }
 

package/src/filiale/yuansheng/pc/DefectListNew.vue

@@ -199,7 +199,7 @@ import Vue from "vue";
 const upSolveDefect = function * (self) {
   let uploadData = self.solveModal.uploadData
   //tag)
-  self.$resetpost('/rs/logic/pcRepairDefectNew', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
+  self.$resetpost('/api/af-safecheck/logic/pcRepairDefectNew', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
     .then(res => {
       if (res.data.code === 200) {
         self.$showMessage('隐患已处理。')
@@ -231,7 +231,7 @@ const sendRepair = function* (self) {
     uploadData.model.f_filiale_id = self.$login.f.orgid
     uploadData.toRepair = '一级派单'
   }
-  let res = yield self.$resetpost('/rs/sql/GetUserForRepaireNew', {data: {f_userinfo_id: self.check.f_userinfo_id}})
+  let res = yield self.$resetpost('/api/af-safecheck/sql/GetUserForRepaireNew', {data: {f_userinfo_id: self.check.f_userinfo_id}})
   preData.userInfo = res.data[0]
   uploadData.model = Object.assign(uploadData.model, preData.userInfo)
   uploadData.user.f_userinfo_id = preData.userInfo.f_userinfo_id
@@ -293,7 +293,7 @@ const sendRepair = function* (self) {
   uploadData.model.f_repairitems = repairitems
   //tag)
   // 调工单接口
-  let result = yield self.$resetpost('/rs/logic/callerSend', uploadData)
+  let result = yield self.$resetpost('/api/af-safecheck/logic/callerSend', uploadData)
   //tag)
   if (result.data.f_service_id) {
     const data = {
@@ -302,7 +302,7 @@ const sendRepair = function* (self) {
       itemsId: self.$login.convertToIn(rows.map(row => row.id))
     }
     //tag
-    let updateRes = yield self.$resetpost('/rs/logic/updateDefectStateNew', data)
+    let updateRes = yield self.$resetpost('/api/af-safecheck/logic/updateDefectStateNew', data)
     if (updateRes.data.code == 200) {
       self.$showMessage('隐患已转维修。')
       self.model.search(`f_repaire_type != '无隐患'`, {})
@@ -314,7 +314,7 @@ export default {
   title: '隐患项列表',
   data() {
     return {
-      model: new PagedList('rs/sql/GetDefectByPaperIdNew', 100, {
+      model: new PagedList('api/af-safecheck/sql/GetDefectByPaperIdNew', 100, {
         f_paper_id: 'this.f_paper_id',f_item_value: 'this.f_item_value'
       }),
       showSolveModal: false,
@@ -417,7 +417,7 @@ export default {
         info:info
       }
       let http = new HttpResetClass()
-      http.load('POST', 'rs/logic/DefectAuditUpdate', data, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      http.load('POST', 'api/af-safecheck/logic/DefectAuditUpdate', data, {resolveMsg: null, rejectMsg: null}).then((res) => {
         if(res.data.code == 200){
           this.model.search(`f_repaire_type != '无隐患'`, {})
           this.showSolveModal = false
@@ -477,7 +477,7 @@ export default {
       http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
         res.data.forEach((item) => {
           let http1 = new HttpResetClass()
-          http1.load('POST', 'rs/sql/tel_singleTable_OrderBy', {
+          http1.load('POST', 'api/af-safecheck/sql/tel_singleTable_OrderBy', {
             data: {
               items: 'f_user_telephone',
               tablename: 't_user',