safecheck-client 3.0.33-13 → 3.0.33-132

package/src/components/android/SafecheckOrderV.vue

@@ -269,7 +269,7 @@
               "气量异常差值":{"index":10,"type":"number","readonly": true},
               "金额异常差值":{"index":10,"type":"number","readonly": true},
               "系统余额":{"index":10,"type":"number","readonly": true},
-              "表箱号":{"index":11,"type":"string","readonly": true},
+              "表封号":{"index":11,"type":"string","readonly": true},
               "燃气表照片":{"index":12,"type":"picture","checkmust": false}
             }
             // 注意，配置项的index必须与上面的固定配置保持'顺序'
@@ -2072,7 +2072,7 @@
                         f_defect_level: null,
                         f_device_id: "",
                         f_is_defect: "",
-                        f_item_name: "表箱号",
+                        f_item_name: "表封号",
                         f_item_value: this.item.f_plan_meters[i].f_metertitles,
                         f_path: "",
                         type: "string"
@@ -2134,7 +2134,7 @@
                         f_defect_level: null,
                         f_device_id: "",
                         f_is_defect: "",
-                        f_item_name: "表箱号",
+                        f_item_name: "表封号",
                         f_item_value: this.item.f_plan_meters[i].f_metertitles,
                         f_path: "",
                         type: "string"
@@ -2435,13 +2435,17 @@
           //tag
           if (this.role == 'inspect') {
             //tag
-            if (this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检') {
-              value = this.$androidUtil.path({
-                alias: 'getUserinfomation',
-                data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan in ('无计划安检','复检')"}
-              })
-            } else {
-              value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
+            if(this.item.f_no_checkplan != '无计划安检' ){
+              if (this.item.f_no_checkplan == '复检') {
+                value = this.$androidUtil.path({
+                  alias: 'getUserinfomation',
+                  data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan in ('无计划安检','复检')"}
+                })
+              } else {
+                value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
+              }
+            }else {
+              value.data =[]
             }
           } else {
             value = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data: {condition: `id = '${this.item.f_paper_id}'`}})
@@ -2618,7 +2622,7 @@
             })
         }
       }else{
-        if(this.parentPage && this.parentPage=='CurrentCreate'){
+        if(this.parentPage && this.parentPage=='AddPlanItem'){
           //tag
           let isRecodr = this.$appdata.getSingleValue('无限制录音'); //单值参数，为true则是开启全程录音
           if (isRecodr) {

package/src/components/android/StationMaster.vue

@@ -1,12 +1,12 @@
-<template>
-  <div>
-    <route :comp="{name: 'master-main'}"></route>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '所长界面',
-  props: ['orgs']
-}
-</script>
+<template>
+  <div>
+    <route :comp="{name: 'master-main'}"></route>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '所长界面',
+  props: ['orgs']
+}
+</script>

package/src/components/android/SwitchValve.vue

@@ -259,7 +259,7 @@ export default {
       // let condition =  ` uf.f_filialeid = '${this.filialeid}'`
       let condition =  ` 1=1 `
       condition += this.condition
-      condition += this.f_meternumber ? ` and f_meternumber = '${this.f_meternumber}'` : ""
+      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)

package/src/components/checkerphonestate/Checker.vue

@@ -1,32 +1,32 @@
-<template>
-  <div>
-    正在查询，请稍后！！！
-  </div>
-</template>
-
-<script>
-import co from 'co'
-let search = function * (self) {
-  let state = yield self.$post('rs/sql/phone', {data: {f_period: '最新'}})
-  self.$goto('checker-state', {state: state.date})
-}
-export default {
-  title: '安检员状态',
-  data () {
-    return {
-      model: {
-      }
-    }
-  },
-  methods: {
-    getstate () {
-      let gen = search(this)
-      return co(gen)
-    }
-  },
-  ready () {
-    this.getstate()
-  },
-  components: {}
-}
-</script>
+<template>
+  <div>
+    正在查询，请稍后！！！
+  </div>
+</template>
+
+<script>
+import co from 'co'
+let search = function * (self) {
+  let state = yield self.$post('rs/sql/phone', {data: {f_period: '最新'}})
+  self.$goto('checker-state', {state: state.date})
+}
+export default {
+  title: '安检员状态',
+  data () {
+    return {
+      model: {
+      }
+    }
+  },
+  methods: {
+    getstate () {
+      let gen = search(this)
+      return co(gen)
+    }
+  },
+  ready () {
+    this.getstate()
+  },
+  components: {}
+}
+</script>

package/src/components/checkerphonestate/CheckerState.vue

@@ -1,97 +1,97 @@
-<template>
-  <div>
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search'>
-        <div novalidate class="form-inline auto" partial>
-          <div class="form-group">
-            <label for="f_state">状态：</label>
-            <v-select id="f_state" :value.sync="$parent.$parent.f_period"
-            :options='$parent.$parent.check_states'
-            close-on-select clear-button></v-select>
-          </div>
-          <div class="form-group">
-            时间:
-            <datepicker id="startdate"
-              :value.sync="$parent.$parent.f_realtime"
-              :disabled-days-of-Week="[]"
-              :format="'yyyy-MM-dd'"
-              :show-reset-button="reset">
-            </datepicker>
-          </div>
-
-          <button class="btn btn-default" @click="search()">查询</button>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th>时间</th>
-            <th>手机使用者</th>
-            <th>手机串码</th>
-            <th>经度</th>
-            <th>纬度</th>
-            <th>海拔(米)</th>
-            <th>电量%</th>
-            <th>信号强度</th>
-            <th>剩余空间M</th>
-            <th>流量Kb</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td>{{row.f_datetime}}</td>
-          <td>{{row.f_user_name }}</td>
-          <td>{{row.f_sn}}</td>
-          <td>{{row.f_longitude}}</td>
-          <td>{{row.f_latitude}}</td>
-          <td>{{row.f_altitude}}</td>
-          <td>{{row.f_battery_level}}</td>
-          <td>{{row.f_signal_strength}}</td>
-          <td>{{row.f_internal_quote}}</td>
-          <td>{{row.f_traffic/1000}}</td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-export default {
-  title: '安检员状态',
-  data () {
-    return {
-      model: new PagedList('rs/sql/checkerphonestate', 20, {f_period: 'this.f_period', f_realtime: 'this.f_realtime'}),
-      check_states: [
-        {label: '最后在线', value: '最新'},
-        {label: '分钟状态', value: '分'},
-        {label: '天状态', value: '天'},
-        {label: '月状态', value: '月'}
-      ],
-      f_period: ['最新'],
-      f_realtime: this.toStandardDateString()
-    }
-  },
-  methods: {
-    getstate () {
-      this.model.search()
-    },
-    toStandardDateString () {
-      let dt = new Date()
-      let month = dt.getMonth() + 1
-      let date = dt.getDate()
-      return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
-    }
-  },
-  ready () {
-    this.model.f_period = this.f_period[0]
-    this.model.f_realtime = this.f_realtime
-    this.$watch('f_period', function (val) {
-      this.model.f_period = val[0]
-    })
-    this.$watch('f_realtime', function (val) {
-      this.model.f_realtime = val
-    })
-    this.getstate()
-  }
-}
-</script>
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search'>
+        <div novalidate class="form-inline auto" partial>
+          <div class="form-group">
+            <label for="f_state">状态：</label>
+            <v-select id="f_state" :value.sync="$parent.$parent.f_period"
+            :options='$parent.$parent.check_states'
+            close-on-select clear-button></v-select>
+          </div>
+          <div class="form-group">
+            时间:
+            <datepicker id="startdate"
+              :value.sync="$parent.$parent.f_realtime"
+              :disabled-days-of-Week="[]"
+              :format="'yyyy-MM-dd'"
+              :show-reset-button="reset">
+            </datepicker>
+          </div>
+
+          <button class="btn btn-default" @click="search()">查询</button>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>时间</th>
+            <th>手机使用者</th>
+            <th>手机串码</th>
+            <th>经度</th>
+            <th>纬度</th>
+            <th>海拔(米)</th>
+            <th>电量%</th>
+            <th>信号强度</th>
+            <th>剩余空间M</th>
+            <th>流量Kb</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td>{{row.f_datetime}}</td>
+          <td>{{row.f_user_name }}</td>
+          <td>{{row.f_sn}}</td>
+          <td>{{row.f_longitude}}</td>
+          <td>{{row.f_latitude}}</td>
+          <td>{{row.f_altitude}}</td>
+          <td>{{row.f_battery_level}}</td>
+          <td>{{row.f_signal_strength}}</td>
+          <td>{{row.f_internal_quote}}</td>
+          <td>{{row.f_traffic/1000}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+export default {
+  title: '安检员状态',
+  data () {
+    return {
+      model: new PagedList('rs/sql/checkerphonestate', 20, {f_period: 'this.f_period', f_realtime: 'this.f_realtime'}),
+      check_states: [
+        {label: '最后在线', value: '最新'},
+        {label: '分钟状态', value: '分'},
+        {label: '天状态', value: '天'},
+        {label: '月状态', value: '月'}
+      ],
+      f_period: ['最新'],
+      f_realtime: this.toStandardDateString()
+    }
+  },
+  methods: {
+    getstate () {
+      this.model.search()
+    },
+    toStandardDateString () {
+      let dt = new Date()
+      let month = dt.getMonth() + 1
+      let date = dt.getDate()
+      return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
+    }
+  },
+  ready () {
+    this.model.f_period = this.f_period[0]
+    this.model.f_realtime = this.f_realtime
+    this.$watch('f_period', function (val) {
+      this.model.f_period = val[0]
+    })
+    this.$watch('f_realtime', function (val) {
+      this.model.f_realtime = val
+    })
+    this.getstate()
+  }
+}
+</script>

package/src/components/defects/AddDefectModal.vue

@@ -1,120 +1,120 @@
-<template>
-  <modal :show.sync="$parent.showModal" v-ref:modal>
-    <div slot="modal-header" class="modal-header">
-      <h4 class="modal-title">
-        添加隐患
-      </h4>
-    </div>
-
-    <div slot="modal-body" class="modal-body">
-      <div class="row auto">
-        <validator name='v'>
-
-      <div class="form-group">
-      <label for="f_defect" class=" col-sm-3 control-label">隐患:</label>
-      <div class="col-sm-3">
-        <input class="form-control" type="text" v-model="model.f_defect" placeholder='隐患' v-validate:f_defect='{ required: true }'>
-      </div>
-
-      <label for="f_defect_level"  class="col-sm-3 control-label">隐患级别:</label>
-      <div class="col-sm-3">
-        <input class="form-control" type="text" v-model="model.f_defect_level" placeholder='例如：A1' v-validate:f_defect_level='{ required: true }'>
-      </div>
-
-    <div class="form-group">
-      <label for="f_defect_field"  class=" col-sm-3 control-label">隐患字段:</label>
-      <div class="col-sm-3">
-        <input class="form-control" type="text" v-model="model.f_defect_field" placeholder='例如：f_defect_field' v-validate:f_defect_field='{ required: true }'>
-      </div>
-
-      <label for="f_defect_path" class="col-sm-3 control-label">隐患照片路径字段:</label>
-      <div class="col-sm-3">
-        <input class="form-control" type="text" v-model="model.f_defect_path" placeholder='例如：f_defect_path' v-validate:f_defect_path='{ required: true }'>
-      </div>
-
-    </div>
-    <div class="form-group">
-      <label  class=" col-sm-3 control-label">设备类别:</label>
-      <div class="col-sm-3">
-        <v-select id="f_state" :value.sync="model.f_device_type"
-                  :options='devices'
-                  close-on-select clear-button></v-select>
-      </div>
-
-      <label  class="col-sm-3 control-label">设备:</label>
-      <div class="col-sm-3">
-        <input class="form-control" type="text" v-model="model.f_device_id" placeholder='设备' >
-      </div>
-
-    </div>
-    <div class="form-group">
-      <label  for="f_remark" class=" col-sm-3 control-label">备注:</label>
-      <div class="col-sm-3">
-        <input class="form-control" type="text" v-model="model.f_remark" placeholder='备注'>
-      </div>
-    </div>
-        </validator>
-      </div>
-    </div>
-    <div slot="modal-footer" class="modal-footer">
-      <button type="button" class="btn btn-primary" @click="addDefect" >保存</button>
-      <button type="button" class="btn btn-default" @click="$parent.undo()">取消</button>
-    </div>
-  </modal>
-</template>
-
-<script>
-  import Vue from 'vue'
-
-
-  export default {
-    title: '添加隐患信息',
-    props:['showModal'],
-    data() {
-      return {
-        model:{},
-        devices:[]
-      }
-    },
-    methods: {
-      addDefect() {
-        let errorring = true
-        if(this.model.f_defect_field)
-          if(this.model.f_defect_field.endsWith("_path")){
-            errorring = false
-            alert("隐患字段不能以 _path结尾")
-          }
-          if(errorring) {
-            if (this.model.f_defect_path) {
-              if (!this.model.f_defect_path.endsWith("_path")) {
-                errorring = false
-                alert("图片路径字段必须以 _path结尾")
-              }
-            }
-          }
-          if(errorring) {
-            this.$resetpost(`rs/logic/添加总隐患信息`,
-              {data: this.model},
-              {resolveMsg: null, rejectMsg: null}).then(
-              (response) => {
-                window.alert('添加隐患信息成功')
-              }
-            ).catch(
-              (response) => {
-                window.alert('添加隐患信息失败')
-              }
-            )
-          }
-        this.$parent.undo()
-      },
-    },
-    ready(){
-      let that = this
-      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
-        respanse.data.data.forEach((item)=>{
-          that.devices.push({label:item.f_device_name,value:item.f_device_name})
-        })
-    })
-  }
-  }
-</script>
+<template>
+  <modal :show.sync="$parent.showModal" v-ref:modal>
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        添加隐患
+      </h4>
+    </div>
+
+    <div slot="modal-body" class="modal-body">
+      <div class="row auto">
+        <validator name='v'>
+
+      <div class="form-group">
+      <label for="f_defect" class=" col-sm-3 control-label">隐患:</label>
+      <div class="col-sm-3">
+        <input class="form-control" type="text" v-model="model.f_defect" placeholder='隐患' v-validate:f_defect='{ required: true }'>
+      </div>
+
+      <label for="f_defect_level"  class="col-sm-3 control-label">隐患级别:</label>
+      <div class="col-sm-3">
+        <input class="form-control" type="text" v-model="model.f_defect_level" placeholder='例如：A1' v-validate:f_defect_level='{ required: true }'>
+      </div>
+
+    <div class="form-group">
+      <label for="f_defect_field"  class=" col-sm-3 control-label">隐患字段:</label>
+      <div class="col-sm-3">
+        <input class="form-control" type="text" v-model="model.f_defect_field" placeholder='例如：f_defect_field' v-validate:f_defect_field='{ required: true }'>
+      </div>
+
+      <label for="f_defect_path" class="col-sm-3 control-label">隐患照片路径字段:</label>
+      <div class="col-sm-3">
+        <input class="form-control" type="text" v-model="model.f_defect_path" placeholder='例如：f_defect_path' v-validate:f_defect_path='{ required: true }'>
+      </div>
+
+    </div>
+    <div class="form-group">
+      <label  class=" col-sm-3 control-label">设备类别:</label>
+      <div class="col-sm-3">
+        <v-select id="f_state" :value.sync="model.f_device_type"
+                  :options='devices'
+                  close-on-select clear-button></v-select>
+      </div>
+
+      <label  class="col-sm-3 control-label">设备:</label>
+      <div class="col-sm-3">
+        <input class="form-control" type="text" v-model="model.f_device_id" placeholder='设备' >
+      </div>
+
+    </div>
+    <div class="form-group">
+      <label  for="f_remark" class=" col-sm-3 control-label">备注:</label>
+      <div class="col-sm-3">
+        <input class="form-control" type="text" v-model="model.f_remark" placeholder='备注'>
+      </div>
+    </div>
+        </validator>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-primary" @click="addDefect" >保存</button>
+      <button type="button" class="btn btn-default" @click="$parent.undo()">取消</button>
+    </div>
+  </modal>
+</template>
+
+<script>
+  import Vue from 'vue'
+
+
+  export default {
+    title: '添加隐患信息',
+    props:['showModal'],
+    data() {
+      return {
+        model:{},
+        devices:[]
+      }
+    },
+    methods: {
+      addDefect() {
+        let errorring = true
+        if(this.model.f_defect_field)
+          if(this.model.f_defect_field.endsWith("_path")){
+            errorring = false
+            alert("隐患字段不能以 _path结尾")
+          }
+          if(errorring) {
+            if (this.model.f_defect_path) {
+              if (!this.model.f_defect_path.endsWith("_path")) {
+                errorring = false
+                alert("图片路径字段必须以 _path结尾")
+              }
+            }
+          }
+          if(errorring) {
+            this.$resetpost(`rs/logic/添加总隐患信息`,
+              {data: this.model},
+              {resolveMsg: null, rejectMsg: null}).then(
+              (response) => {
+                window.alert('添加隐患信息成功')
+              }
+            ).catch(
+              (response) => {
+                window.alert('添加隐患信息失败')
+              }
+            )
+          }
+        this.$parent.undo()
+      },
+    },
+    ready(){
+      let that = this
+      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
+        respanse.data.data.forEach((item)=>{
+          that.devices.push({label:item.f_device_name,value:item.f_device_name})
+        })
+    })
+  }
+  }
+</script>