safecheck-client 3.0.34-gongyi → 3.0.35-2

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

@@ -0,0 +1,284 @@
+<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">只限物联网表进行开关阀操作</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 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" :style="{'color': ((row.f_table_state)=='停用'?'red':'')}"><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" :style="{'color': ((row.f_table_state)=='停用'?'red':'')}"><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" :style="{'color': ((row.f_table_state)=='停用'?'red':'')}"><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" :style="{'color': ((row.f_table_state)=='停用'?'red':'')}"><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" :style="{'color': ((row.f_table_state)=='停用'?'red':'')}"><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" :style="{'color': ((row.f_table_state)=='停用'?'red':'')}"><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" :style="{'color': ((row.f_table_state)=='停用'?'red':'')}"><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" :style="{'color': ((row.f_table_state)=='停用'?'red':'')}"><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" :style="{'color': ((row.f_table_state)=='停用'?'red':'')}"><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-6">
+                  <p class="panel-title col-xs-5 text-left font" :style="{'color': ((row.f_table_state)=='停用'?'red':'')}"><b>表状态</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_table_state }}</p>
+                </div>
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font" :style="{'color': ((row.f_table_state)=='停用'?'red':'')}"><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_valve_state==='关阀'">
+                  <p class="panel-title col-xs-5 text-left font" :style="{'color': ((row.f_table_state)=='停用'?'red':'')}"><b>关阀原因</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_off_valve_reason}}</p>
+                </div>
+                <div class="col-xs-6">
+                  <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>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+  <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>
+</template>
+
+<script>
+  import LocalPagedList from '../../../plugins/LocalPagedList'
+  import Vue from 'vue'
+  import { PagedList } from 'vue-client'
+
+  export default {
+    title: '开关阀',
+    data () {
+      return {
+        model: Vue.android ? new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/SwitchValveSeachUser`, 5) : new PagedList( 'AndroidRest/rs/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: '', //当前操作的用户
+      }
+    },
+    ready () {
+    },
+    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/rs/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/rs/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.f_meternumber ? ` and uf.f_meternumber = '${this.f_meternumber}'` : " "
+        condition += this.f_userinfo_code ? ` and ui.f_userinfo_code = '${this.f_userinfo_code}'` : " "
+        //tag
+        this.model.search(condition)
+      },
+      openvalve (val) {
+        if(val.f_table_state=='停用'){
+            return this.$showMessage("该用户已被停用")
+        }
+        //tag
+        this.modalTitle = '对表号为'+ val.f_meternumber+'开阀'
+        this.istype = '开阀'
+        this.showModal = true;
+        this.thisOneData = val;
+      },
+      clonevalve (val) {
+        if(val.f_table_state=='停用'){
+          return this.$showMessage("该用户已被停用")
+        }
+        //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()}/rs/logic/iot_saveInstruct`, {data: data}).then((row) => {
+           this.$showMessage(`${msg}指令发送成功，请等候2分钟进行查询`)
+          //tag
+          this.thisOneData = '';
+          this.istype = '';
+          this.f_comments = '';
+          this.showModal = false
+           this.selfSearch()
+        })
+      },
+    }
+  }
+</script>

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

@@ -28,7 +28,7 @@
 
 
   <div class="auto">
-      <div class="row text-center" style="margin-top: 20px;">
+      <div id="uploadAllbut" class="row text-center" style="margin-top: 20px;" >
         <button class="btn  btn-primary" style="width: 15%;  border-radius: 5px ;" @click= "upload()">上传</button>
       </div>
 
@@ -97,6 +97,7 @@
   import Vue from 'vue'
   import LocalPathList from '../../../components/android/LocalPathList'
   import { PagedList } from 'vue-client'
+  import $ from "jquery";
 
   export default {
     title:'抄表用户信息',
@@ -116,7 +117,7 @@
       inspect(row){
         if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检')) {
           this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
-            console.log(JSON.stringify(response))
+            //tag)
             row['f_plan_meters'] = response.data
             let pardate = {
               _this:this,
@@ -135,10 +136,20 @@
           this.$showMessage("该安检单已被上传！")
         )
       },
+      saveNoclick() {
+        // 禁用点击事件
+        $("#uploadAllbut").addClass("noclickbut");
+        //tag
+
+        // 5秒后启用点击事件
+        setTimeout(function(){
+          $("#uploadAllbut").removeClass("noclickbut");
+        },5000);
+      },
       // 上传所有未成功上传的数据
       async uploadAll() {
-        console.log(`this.model==>${this.model}`)
-        console.log(`this.model.rows.length==>${this.model.length}`)
+        //tag
+        //tag
         // if(this.model.rows.length <= 0){
         //   this.model.rows = this.result
         // }
@@ -166,18 +177,19 @@
         }
       },
       upload(){
+        this.saveNoclick()
         this.uploadAll().then((res)=>{
-          console.log('批量上传执行结果===》'+JSON.stringify(res))
+          //tag)
           this.refresh()
         })
 
       },
       uploadCallBack(jo){
-        console.log('jo -->' + JSON.stringify(jo))
-        console.log('jo.state -->' + JSON.stringify(jo.state))
+        //tag)
+        //tag)
         if(jo.state == 'ok'){
           let ret = JSON.parse(jo.result)
-          console.log('ret ===> '+ JSON.stringify(ret))
+          //tag)
           if(ret.state == 0){
             HostApp.alert(`${ret.successcount}条安检单上传成功，${ret.invalidcount}条安检单已作废，${ret.failedcount}条安检单上传失败！`)
             this.refresh()
@@ -188,13 +200,13 @@
       },
       // 查询所有未上传斌保存在手机上的数据
       // download() {
-      //   console.log(`Vue.user========>${Vue.user}`)
+      //   //tag
       //   let res = this.$androidUtil.bzLogic('getCheckPlanInfo',{condition:this.condition})
-      //   console.log(`res.data.data===>${res.data.data}`)
-      //   console.log(`res.data.code===>${res.data.code}`)
+      //   //tag
+      //   //tag
       //
       //   if (res.data && res.data.code === 200) {
-      //     console.log("查询到结果")
+      //     //tag
       //       if (res.data.data.length > 0) {
       //         this.context = `有${res.data.data.length}条数据未上传，请点击上传按钮，自动上传`
       //         this.resultdata  = [...res.data.data]
@@ -205,7 +217,7 @@
       //   }
       // },
       refresh() {
-        console.log("批量上传页面刷新")
+        //tag
         // hard code relationship
         //安卓
         let value = this.$androidUtil.path({alias: 'getCheckPlan', data:{}})
@@ -216,7 +228,7 @@
         }
         // //PC模拟安卓
         // this.$androidUtil.path({alias: 'getCheckPlan', data:{}}).then((value)=>{
-        //   console.log(value)
+        //   //tag
         //   if(value.data.length > 0){
         //     this.model = value.data
         //   }

package/src/filiale/tongchuan/android.js

@@ -4,9 +4,17 @@ import Vue from "vue";
 // 手机特殊目录注册到该文件中
 let specialComp = {
   'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'v-select': (resolve) => { require(['./android/Select'], resolve) },
   'paper-feedback' : (resolve) => { require(['./android/PaperFeedback'], resolve) },
-  'safecheck-userinfo' : (resolve) => { require(['./android/SafecheckUserinfo'], resolve) },
-  'safecheck-devices' : (resolve) => { require(['./android/SafecheckDevices'], resolve) }
+  'safecheck-userinfo' : (resolve) => { require(['./android/SafecheckUserInfo'], resolve) },
+  'safecheck-devices' : (resolve) => { require(['./android/SafecheckDevices'], resolve) },
+  'switch-valve' : (resolve) => { require(['./android/SwitchValve'], resolve) },
+  'current-create' : (resolve) => { require(['./android/CurrentCreate'], resolve) },
+  'add-plan-item' : (resolve) => { require(['./android/AddPlanItem'], resolve) },
+  'PhoneUpUserinfo' : (resolve) => { require(['./android/PhoneUpUserinfo'], resolve) },
+  'PhoneUpDetail': (resolve) => { require(['./android/PhoneUpDetail'], resolve) },
+  'phone-record-info' : (resolve) => { require(['./android/PhoneRecordInfo'], resolve) },
+  'android-defect-deal' : (resolve) => { require(['./android/AndroidDefectDeal'], resolve) }
 }
 
 exports.specialComp = specialComp

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

@@ -0,0 +1,145 @@
+<template>
+  <div class="auto select-overspread">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group col-sm-3" >
+              <label class="font_normal_body">小区名称</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_residential_area" placeholder='小区名称'
+                     condition="f_residential_area like '%{}%'" @keyup.enter="search()">
+            </div>
+            <div class="form-group col-sm-2 button-range" >
+              <button class="button_search" style="margin-right: 10px"  @click="search()" v-el:cba>查询</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid >
+        <template partial='head' >
+          <tr>
+            <th><nobr><input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.checkAll" @change="$parent.$parent.$parent.setCheckAll()"/>全选</nobr></th>
+            <th><nobr>省市区/县</nobr></th>
+            <th><nobr>街道/乡镇</nobr></th>
+            <th><nobr>小区名称</nobr></th>
+            <th><nobr>用户数量</nobr></th>
+            <th><nobr>详细地址</nobr></th>
+            <th><nobr>小区备注</nobr></th>
+          </tr>
+        </template>
+        <template partial='body' >
+          <tr >
+            <td  style="text-align: center;"><input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.isChecked(row.id)"  @change="$parent.$parent.$parent.setCheckes(row.id)" /></td>
+            <td style="text-align:center">{{row.f_pcd}}</td>
+            <td style="text-align:center">{{row.f_street}}</td>
+            <td style="text-align:center">{{row.f_residential_area}}</td>
+            <td style="text-align:center"> <button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.num?row.num:0}}</b></button></td>
+            <td style="text-align:center">{{row.f_area_address}}</td>
+            <td style="text-align:center">{{row.f_comments}}</td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+    <modal :show.sync="showSendModal" :backdrop="false" width="90%" height="90%">
+      <article slot="modal-body" class="modal-body" style="height: 80vh">
+        <check-book-search-user-list  v-if="showSendModal" :row="row" :addcondata="addcondata" :bookrowsdata="{bookrows:checkes,checkAll:checkAll}" :needprops="needprops":userlogin="userlogin"></check-book-search-user-list>
+      </article>
+      <footer slot="modal-footer">
+      </footer>
+
+    </modal>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+
+export default {
+  title: '安检记录列表',
+  props: ['row','needprops'],
+  data () {
+    return {
+      rowdata: this.row,
+      showSendModal:false,
+      checkBookRow:{
+      },
+      userlogin:{
+        id:this.$login.f.id,
+        name:this.$login.f.name,
+        orgid:this.$login.f.orgid,
+        orgstr:this.$login.f.orgs,
+      },
+      model: new PagedList('rs/sql/getCheckBookArea', 50),
+      checkAll:false,
+      checkes:[],
+      addcondata:''
+    }
+  },
+  ready(){
+    console.log(this.row)
+    const val = this.row
+    if (val) {
+      this.checkAll=false
+      this.checkes=[]
+      this.rowdata = val
+      const condition  = `f_check_book_id =${val.id}`
+      this.model.search(condition)
+    }
+  },
+  watch: {
+    'row' (val) {
+      if (val) {
+        this.checkAll=false
+        this.checkes=[]
+        this.rowdata = val
+        const condition =  `f_check_book_id =${val.id}`
+        this.model.search(condition)
+      }
+    }
+  },
+  methods: {
+    setCheckAll() {
+      this.checkAll=this.checkAll?false:true;
+      // 全选改变后，清空选中数据
+      this.checkes = []
+    },
+    isChecked(v) {
+      // 如果全选，不在的按选中算，否则，在的按选中算
+      if (this.checkAll) {
+        return this.checkes.indexOf(v) == -1
+      } else {
+        return this.checkes.indexOf(v) != -1
+      }
+    },
+    setCheckes(id) {
+      let index=this.checkes.indexOf(id)
+      if(index<0){
+        this.checkes.push(id)
+      }else{
+        this.checkes.splice(index,1)
+      }
+    },
+    send(){
+      if(!this.checkAll && this.checkes.length == 0){
+        return  this.$showMessage('请选择单位')
+      }
+      this.showSendModal = true
+    },
+    details(row){
+      this.$emit('showuser' ,row)
+    },
+    selfSearch (args) {
+      if (this.rowdata.id) {
+        this.checkAll=false
+        this.checkes=[]
+        args.condition += `and f_check_book_id =${this.rowdata.id}`
+        this.model.search(args.condition)
+        this.addcondata = args.model.f_residential_area ? ` and area.f_residential_area like '%${args.model.f_residential_area}%'`: ''
+      } else {
+        this.$showMessage('请选择片区')
+      }
+    }
+  }
+}
+</script>