safecheck-client 3.0.34-91 → 3.0.34-93

package/src/filiale/shanxian/pc.js

@@ -10,8 +10,8 @@ let specialComp = {
   'check-search-user': (resolve) => { require(['./pc/CheckSearchUser'], resolve) },
   'check-detail': (resolve) => { require(['./pc/CheckDetail'], resolve) },
   'check-plan': (resolve) => { require(['./pc/CheckPlan'], resolve) },
-  'hiddensituation': (resolve) => { require(['./pc/HiddenSituation'], resolve) }
-
+  'hiddensituation': (resolve) => { require(['./pc/HiddenSituation'], resolve) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) }
 }
 exports.specialComp = specialComp
 

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

@@ -721,8 +721,8 @@
         //tag ===> ' + JSON.stringify(Number(this.gasDeviation)))
         // 计算差值是否在范围内
         if (Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value) > Number(this.gasDeviation)) {
-          this.f_items[this.f_gas_aberrant_number.index].f_is_defect = true
-          this.f_items[this.f_gas_aberrant_number.index].f_defect_level = 'C'
+          this.f_items[this.f_gas_aberrant_number.index].f_is_defect = false
+          //this.f_items[this.f_gas_aberrant_number.index].f_defect_level = 'C'
         }
 
         //tag)

package/src/filiale/tongchuan/pc/checkUserList.vue

@@ -115,6 +115,21 @@
                     >
                     </v-select>
                   </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">街&ensp;&ensp;&ensp;&ensp;道:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_street"
+                      v-model="model.f_street"
+                      :options='$parent.$parent.streets'
+                      placeholder='请选择'
+                      condition="ua.f_street like '%{}%'"
+                      :search="false"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
                   <!--<div class="form-group col-sm-4" >
                     <label class="font_normal_body">小区名称:</label>
                     <input type="text" class="input_search" v-model="model.f_userinfo_code"
@@ -336,6 +351,7 @@
             meterbooks:[],
             cbc:[],
             areaList:[],
+            streets:[],
             checkAll:false,
             checkes:[],
             excelUserCondtion:false,
@@ -355,6 +371,7 @@
             this.select_search()
             this.Mreadibook()
             this.getSliceArea()
+            this.getstreets()
           },
           cancel(){
             this.showCondtion=false
@@ -418,6 +435,19 @@
 
               })
           },
+          getstreets(){
+            new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+              ////tag)
+              this.streets=[]
+              if(res.data.length>0){
+                this.streets.push({label:"全部",value:""})
+                res.data.forEach((result)=>{
+                  this.streets.push({label:result.f_street,value:result.f_street})
+                })
+              }
+
+            })
+          },
           //获取抄表册
           async Mreadibook(){
             this.cbc=[]

package/src/filiale/xilan/android/AddPlanItem.vue

@@ -7,7 +7,7 @@
             <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label class="font text-left">旧用户编号：</label>
+                <label class="font text-left" style="padding: 0">旧用户编号：</label>
               </div>
               <div class="col-xs-8" >
                 <input class="search_input input-font"

package/src/filiale/xilan/android/CurrentCreate.vue

@@ -107,7 +107,7 @@
             <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>
+                <label for="f_userinfo_code" style="padding: 0" class="font text-left">旧用户编号：</label>
               </div>
               <div class="col-xs-8" >
                 <input id="f_userinfo_code" class="search_input input-font"

package/src/filiale/xilan/android.js

@@ -4,7 +4,7 @@ import Vue from "vue";
 // 手机特殊目录注册到该文件中
 let specialComp = {
   'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) },
-  'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) },
+  'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) }
 }
 
 exports.specialComp = specialComp