safecheck-client 4.0.1-7 → 4.0.1-71

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

@@ -269,7 +269,7 @@
           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.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/iot_saveInstruct`, {data: data}).then((row) => {
            this.$showMessage(`${msg}指令发送成功，请等候2分钟进行查询`)
           //tag
           this.thisOneData = '';

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

@@ -1,209 +1,209 @@
-<template>
-  <div class="auto select-overspread">
-    <validator name='v'>
-      <form class="form-horizontal" novalidate>
-        <ul class="nav nav-tabs" style="margin-bottom: 10px">
-          <li class="active"><a href="#">片区信息</a></li>
-        </ul>
-        <div class="row" style="margin-top: 10px">
-          <div class="col-sm-12 form-group"  style="margin: 0">
-            <label class="font_normal_body">网格员</label>
-            <v-select :value.sync="checkBook.f_checker_name"
-                      style="width: 60%"
-                      class="select_list select" :value-single="false"
-                      :multiple="true" :search="true"
-                      :options='checkerNames' placeholder=''
-                      close-on-select></v-select>
-          </div>
-<!--          <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_check_book_type.required ? 'has-error' : '']">-->
-<!--            <label class="font_normal_body">表册类型</label>-->
-<!--            <input type="text" v-show="false" v-model="checkBook.f_check_book_type"-->
-<!--                   :value.sync="checkBook.f_check_book_type"-->
-<!--                   v-validate:f_check_book_type='{required: true }'>-->
-<!--            <v-select :value.sync="checkBook.f_check_book_type" v-model='checkBook.f_check_book_type'-->
-<!--                      :value-single="true" style="width: 60%"-->
-<!--                      class="select_list select"-->
-<!--                      :options='bookTypes' placeholder=''-->
-<!--                      close-on-select></v-select>-->
-<!--          </div>-->
-          <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_user_type.required ? 'has-error' : '']">
-            <label class="font_normal_body">用户类型</label>
-            <input type="text" v-show="false" v-model="checkBook.f_user_type"
-                   v-validate:f_user_type='{required: true }'>
-            <v-select :value.sync="checkBook.f_user_type" v-model='checkBook.f_user_type'
-                      :value-single="true" style="width: 60%"
-                      class="select_list select"
-                      :options='userTypes' placeholder=''
-                      close-on-select></v-select>
-          </div>
-          <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_responsible_person.required ? 'has-error' : '']">
-            <label class="font_normal_body">负&nbsp;责&nbsp;人</label>
-            <input type="text" class="input_search" v-model="checkBook.f_responsible_person"
-                   style="width: 60%" v-validate:f_responsible_person='{ required: true }'>
-          </div>
-          <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_check_book_name.required ? 'has-error' : '']">
-            <label class="font_normal_body">片区名称</label>
-            <input type="text" class="input_search" v-model="checkBook.f_check_book_name"
-                   style="width: 60%" v-validate:f_check_book_name='{ required: true }'>
-          </div>
-          <div class="form-group col-sm-6"  style="margin-top: 20px">
-            <label class="font_normal_body">执行日期</label>
-            <datepicker
-              :value.sync="checkBook.f_run_date"
-              style="width: 60%"
-              :format="'yyyy-MM-dd'"
-              v-model="checkBook.f_run_date"
-            >
-            </datepicker>
-          </div>
-          <div class="form-group col-sm-6"  style="margin-top: 20px">
-            <label class="font_normal_body">执行周期</label>
-            <input type="number" class="input_search" v-model="checkBook.f_around_time"
-                   style="width: 60%"  >
-          </div>
-          <div class="form-group col-sm-6"  style="margin-top: 20px">
-            <label class="font_normal_body">周期单位</label>
-            <v-select :value.sync="checkBook.f_around_unit" v-model='checkBook.f_around_unit'
-                      :value-single="true" style="width: 60%"
-                      class="select_list select"
-                      :options='aroundUnit' placeholder=''
-                      close-on-select></v-select>
-          </div>
-
-
-<!--          <div class="form-group col-sm-6"  style="margin-top: 20px">-->
-<!--            <label class="font_normal_body">自动下发</label>-->
-<!--            <v-select :value.sync="checkBook.f_is_auto" v-model='checkBook.f_is_auto'-->
-<!--                      :value-single="true" style="width: 60%"-->
-<!--                      class="select_list select"-->
-<!--                      :options='autos' placeholder=''-->
-<!--                      close-on-select></v-select>-->
-<!--          </div>-->
-        </div>
-      </form>
-      <div style="text-align:right;height:auto;margin-top:6px;margin-right: 10%">
-        <button @click="confirm()" class="button_search">确认</button>
-<!--        <button @click="deleteBook()" class="button_delete">删除</button>-->
-        <button @click="close()" class="button_clear">取消</button>
-      </div>
-    </validator>
-  </div>
-</template>
-<script>
-import * as Util from "../../../components/Util";
-import bus from "../../../bus";
-import {HttpResetClass} from 'vue-client'
-
-export default {
-  data () {
-    return {
-      checkerNames:[],
-      aroundUnit: [{label: '年', value: '年'}, {label: '月', value: '月'}, {label: '日', value: '日'}],
-      bookTypes:[{label: '用户', value: '用户'}, {label: '小区', value: '小区'}],
-      userTypes:[{label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
-      autos:[{label: '是', value: '是'}, {label: '否', value: '否'}],
-      responsible_persons:[{label: '测试', value: '测试'}],
-      allUsers:[],
-      checkBook: {
-        f_check_book_name: '',
-        f_run_date: '',
-        f_around_time: '',
-        f_around_unit: '',
-        f_create_date: '',
-        f_create_person: '',
-        f_user_type:'',
-        f_orgid: '',
-        f_is_auto:'否',
-        f_check_book_type:"小区",
-        f_checker_name: [],
-        f_checker_id:'',
-      }
-    }
-  },
-  props: ['row','showtype'],
-  watch: {
-    // 'checkBook.f_checker_name' (val) {
-    //   const user = this.allUsers.filter(item=>item.name==val);
-    //   if(user.length>0){
-    //     this.checkBook.f_checker_id = user[0]["id"]
-    //   }
-    //   console.log("777",this.checkBook)
-    // },
-    row (row) {
-      this.changeCheckBook(row)
-    }
-  },
-  ready () {
-    // console.log(this.$login.f.orgid)
-    this.changeCheckBook(this.row)
-    this.checkBook.f_user_type = this.showtype
-      new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
-        items: '*',
-        tablename: 't_user',
-        condition: `state = '在职' and rolestr like '%网格员%'`,
-        orderitem: 'id'
-      }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-        res.data.forEach(user=>{
-          this.checkerNames.push({label: user.name, value: user.name})
-        })
-    })
-  },
-  methods: {
-    changeCheckBook (row) {
-      if (row && row.id) {
-        this.checkBook = JSON.parse(JSON.stringify(row))
-        this.checkBook.f_checker_name = this.checkBook.f_checker_name.split(',')
-      }
-    },
-    deleteBook () {
-      console.log('delete', this.row)
-    },
-    close () {
-      console.log('关闭')
-      this.$parent.showItem = false
-    },
-    confirm () {
-      if(!this.checkBook.f_check_book_name){
-        this.$showMessage('请填写片区名称')
-        return
-      }
-      // if(!this.checkBook.f_check_book_type){
-      //   this.$showMessage('请选择表册类型')
-      //   return
-      // }
-      if(!this.checkBook.f_user_type){
-        this.$showMessage('请选择用户类型')
-        return
-
-      }
-      this.checkBook.f_orgid = this.$login.f.orgid
-      this.checkBook.f_create_person = this.$login.f.name
-      this.checkBook.f_create_date = Util.toStandardDateString()
-      console.log('checkbook', this.checkBook)
-      this.checkBook.f_checker_name = this.checkBook.f_checker_name.toString()
-      let http = new HttpResetClass()
-      http.load('POST', 'api/af-safecheck/logic/safeEntity', {data: {tableName: 't_check_book', entityData: this.checkBook}},
-        {resolveMsg: '保存片区信息成功', rejectMsg: '保存片区信息失败'}).then(res => {
-        if (res.data.code === 200) {
-          this.$showMessage('保存片区信息成功',['confirm']).then(res=>{
-            if (res==='confirm'){
-              bus.$emit('fresh-main')
-            }
-          })
-        }else{
-          this.$showMessage('保存片区信息失败')
-        }
-      })
-    },
-    getRes (obj) {
-      if (obj.resids) {
-        this.checkBook.f_orgid = obj.resids[0]
-        console.log('id', this.checkBook.f_orgid)
-      }
-    },
-    getUsers(obj){
-      this.allUsers = obj
-    }
-  }
-}
-</script>
+<template>
+  <div class="auto select-overspread">
+    <validator name='v'>
+      <form class="form-horizontal" novalidate>
+        <ul class="nav nav-tabs" style="margin-bottom: 10px">
+          <li class="active"><a href="#">片区信息</a></li>
+        </ul>
+        <div class="row" style="margin-top: 10px">
+          <div class="col-sm-12 form-group"  style="margin: 0">
+            <label class="font_normal_body">网格员</label>
+            <v-select :value.sync="checkBook.f_checker_name"
+                      style="width: 60%"
+                      class="select_list select" :value-single="false"
+                      :multiple="true" :search="true"
+                      :options='checkerNames' placeholder=''
+                      close-on-select></v-select>
+          </div>
+<!--          <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_check_book_type.required ? 'has-error' : '']">-->
+<!--            <label class="font_normal_body">表册类型</label>-->
+<!--            <input type="text" v-show="false" v-model="checkBook.f_check_book_type"-->
+<!--                   :value.sync="checkBook.f_check_book_type"-->
+<!--                   v-validate:f_check_book_type='{required: true }'>-->
+<!--            <v-select :value.sync="checkBook.f_check_book_type" v-model='checkBook.f_check_book_type'-->
+<!--                      :value-single="true" style="width: 60%"-->
+<!--                      class="select_list select"-->
+<!--                      :options='bookTypes' placeholder=''-->
+<!--                      close-on-select></v-select>-->
+<!--          </div>-->
+          <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_user_type.required ? 'has-error' : '']">
+            <label class="font_normal_body">用户类型</label>
+            <input type="text" v-show="false" v-model="checkBook.f_user_type"
+                   v-validate:f_user_type='{required: true }'>
+            <v-select :value.sync="checkBook.f_user_type" v-model='checkBook.f_user_type'
+                      :value-single="true" style="width: 60%"
+                      class="select_list select"
+                      :options='userTypes' placeholder=''
+                      close-on-select></v-select>
+          </div>
+          <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_responsible_person.required ? 'has-error' : '']">
+            <label class="font_normal_body">负&nbsp;责&nbsp;人</label>
+            <input type="text" class="input_search" v-model="checkBook.f_responsible_person"
+                   style="width: 60%" v-validate:f_responsible_person='{ required: true }'>
+          </div>
+          <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_check_book_name.required ? 'has-error' : '']">
+            <label class="font_normal_body">片区名称</label>
+            <input type="text" class="input_search" v-model="checkBook.f_check_book_name"
+                   style="width: 60%" v-validate:f_check_book_name='{ required: true }'>
+          </div>
+          <div class="form-group col-sm-6"  style="margin-top: 20px">
+            <label class="font_normal_body">执行日期</label>
+            <datepicker
+              :value.sync="checkBook.f_run_date"
+              style="width: 60%"
+              :format="'yyyy-MM-dd'"
+              v-model="checkBook.f_run_date"
+            >
+            </datepicker>
+          </div>
+          <div class="form-group col-sm-6"  style="margin-top: 20px">
+            <label class="font_normal_body">执行周期</label>
+            <input type="number" class="input_search" v-model="checkBook.f_around_time"
+                   style="width: 60%"  >
+          </div>
+          <div class="form-group col-sm-6"  style="margin-top: 20px">
+            <label class="font_normal_body">周期单位</label>
+            <v-select :value.sync="checkBook.f_around_unit" v-model='checkBook.f_around_unit'
+                      :value-single="true" style="width: 60%"
+                      class="select_list select"
+                      :options='aroundUnit' placeholder=''
+                      close-on-select></v-select>
+          </div>
+
+
+<!--          <div class="form-group col-sm-6"  style="margin-top: 20px">-->
+<!--            <label class="font_normal_body">自动下发</label>-->
+<!--            <v-select :value.sync="checkBook.f_is_auto" v-model='checkBook.f_is_auto'-->
+<!--                      :value-single="true" style="width: 60%"-->
+<!--                      class="select_list select"-->
+<!--                      :options='autos' placeholder=''-->
+<!--                      close-on-select></v-select>-->
+<!--          </div>-->
+        </div>
+      </form>
+      <div style="text-align:right;height:auto;margin-top:6px;margin-right: 10%">
+        <button @click="confirm()" class="button_search">确认</button>
+<!--        <button @click="deleteBook()" class="button_delete">删除</button>-->
+        <button @click="close()" class="button_clear">取消</button>
+      </div>
+    </validator>
+  </div>
+</template>
+<script>
+import * as Util from "../../../components/Util";
+import bus from "../../../bus";
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  data () {
+    return {
+      checkerNames:[],
+      aroundUnit: [{label: '年', value: '年'}, {label: '月', value: '月'}, {label: '日', value: '日'}],
+      bookTypes:[{label: '用户', value: '用户'}, {label: '小区', value: '小区'}],
+      userTypes:[{label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
+      autos:[{label: '是', value: '是'}, {label: '否', value: '否'}],
+      responsible_persons:[{label: '测试', value: '测试'}],
+      allUsers:[],
+      checkBook: {
+        f_check_book_name: '',
+        f_run_date: '',
+        f_around_time: '',
+        f_around_unit: '',
+        f_create_date: '',
+        f_create_person: '',
+        f_user_type:'',
+        f_orgid: '',
+        f_is_auto:'否',
+        f_check_book_type:"小区",
+        f_checker_name: [],
+        f_checker_id:'',
+      }
+    }
+  },
+  props: ['row','showtype'],
+  watch: {
+    // 'checkBook.f_checker_name' (val) {
+    //   const user = this.allUsers.filter(item=>item.name==val);
+    //   if(user.length>0){
+    //     this.checkBook.f_checker_id = user[0]["id"]
+    //   }
+    //   console.log("777",this.checkBook)
+    // },
+    row (row) {
+      this.changeCheckBook(row)
+    }
+  },
+  ready () {
+    // console.log(this.$login.f.orgid)
+    this.changeCheckBook(this.row)
+    this.checkBook.f_user_type = this.showtype
+      new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
+        items: '*',
+        tablename: 't_user',
+        condition: `state = '在职' and rolestr like '%网格员%'`,
+        orderitem: 'id'
+      }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        res.data.forEach(user=>{
+          this.checkerNames.push({label: user.name, value: user.name})
+        })
+    })
+  },
+  methods: {
+    changeCheckBook (row) {
+      if (row && row.id) {
+        this.checkBook = JSON.parse(JSON.stringify(row))
+        this.checkBook.f_checker_name = this.checkBook.f_checker_name.split(',')
+      }
+    },
+    deleteBook () {
+      console.log('delete', this.row)
+    },
+    close () {
+      console.log('关闭')
+      this.$parent.showItem = false
+    },
+    confirm () {
+      if(!this.checkBook.f_check_book_name){
+        this.$showMessage('请填写片区名称')
+        return
+      }
+      // if(!this.checkBook.f_check_book_type){
+      //   this.$showMessage('请选择表册类型')
+      //   return
+      // }
+      if(!this.checkBook.f_user_type){
+        this.$showMessage('请选择用户类型')
+        return
+
+      }
+      this.checkBook.f_orgid = this.$login.f.orgid
+      this.checkBook.f_create_person = this.$login.f.name
+      this.checkBook.f_create_date = Util.toStandardDateString()
+      console.log('checkbook', this.checkBook)
+      this.checkBook.f_checker_name = this.checkBook.f_checker_name.toString()
+      let http = new HttpResetClass()
+      http.load('POST', 'api/af-safecheck/logic/safeEntity', {data: {tableName: 't_check_book', entityData: this.checkBook}},
+        {resolveMsg: '保存片区信息成功', rejectMsg: '保存片区信息失败'}).then(res => {
+        if (res.data.code === 200) {
+          this.$showMessage('保存片区信息成功',['confirm']).then(res=>{
+            if (res==='confirm'){
+              bus.$emit('fresh-main')
+            }
+          })
+        }else{
+          this.$showMessage('保存片区信息失败')
+        }
+      })
+    },
+    getRes (obj) {
+      if (obj.resids) {
+        this.checkBook.f_orgid = obj.resids[0]
+        console.log('id', this.checkBook.f_orgid)
+      }
+    },
+    getUsers(obj){
+      this.allUsers = obj
+    }
+  }
+}
+</script>