safecheck-client 4.0.2-52 → 4.0.2-54

package/src/filiale/meihekou/pc/CheckDetail.vue

@@ -1,217 +1,217 @@
-<template>
-  <div>
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
-        <div partial>
-          <ul class="nav nav-tabs">
-            <li role="presentation" class="active"><a style="	color: #5ac0d9 !important;">安检计划项明细</a></li>
-          </ul>
-          <div class="row">
-            <div class="form-group col-sm-4" >
-              <label class="font_normal_body">安检状态</label>
-              <v-select style="width:60% "
-                        class="select select_list"
-                        :value.sync="$parent.$parent.f_state"
-                        v-model="$parent.$parent.f_state"
-                        :options='$parent.$parent.checkState'
-                        placeholder='安检状态'
-                        close-on-select
-                        value-single
-              >
-              </v-select>
-            </div>
-            <div class="form-group col-sm-4" >
-              <label class="font_normal_body">有无计划</label>
-              <v-select style="width:60% "
-                        class="select select_list"
-                        :value.sync="$parent.$parent.f_no_checkplan"
-                        v-model="$parent.$parent.f_no_checkplan"
-                        :options='$parent.$parent.no_checkplans'
-                        placeholder='有无计划'
-                        close-on-select
-                        value-single
-              >
-              </v-select>
-            </div>
-            <div class="form-group col-sm-4" >
-              <label class="font_normal_body">入户状态</label>
-              <v-select style="width:60% "
-                        class="select select_list"
-                        :value.sync="$parent.$parent.f_last_check_state"
-                        v-model="$parent.$parent.f_last_check_state"
-                        :options='$parent.$parent.entry_status'
-                        placeholder='入户状态'
-                        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="$parent.$parent.f_residential_area"
-                     style="width: 60%" placeholder="小区"
-                     condition="f_residential_area like '%{}%'">
-            </div>
-            <div class="form-group col-sm-4" >
-              <label class="font_normal_body">楼号</label>
-              <input type="text" class="input_search"
-                     v-model="$parent.$parent.f_building"
-                     style="width: 60%" placeholder="楼号"
-                     condition="f_building like '%{}%'">
-            </div>
-            <div class="form-group col-sm-4 button-range" >
-              <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
-              <export-excel   :data="$parent.$parent.exportParameter"
-                                   :field="$parent.$parent.excelHeaders"
-                                   sqlurl="api/af-safecheck/logic/exportfile" sql-name="planItemNew"
-                                   template-name='安检计划明细' :choose-col="true">
-              </export-excel>
-              <!--<export-excel-->
-              <!--:data="{condition: $parent.$parent.condition}"-->
-              <!--:field="$parent.$parent.getfield"-->
-              <!--sqlurl="api/af-safecheck/logic/saleExport" sql-name="getGasUser" :template-name="$parent.$parent.pricename+'气价使用人'"-->
-              <!--:choose-col="true"></export-excel>-->
-
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' class="table_sy">
-
-        <template partial='head'>
-          <tr>
-            <th><nobr>计划名称</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'>
-          <td style="text-align: center"><nobr>{{row.f_plan_name}}</nobr></td>
-          <td style="text-align: center"><nobr>{{row.f_userinfo_code}}</nobr></td>
-          <td style="text-align: center"><nobr>{{row.f_user_name}}</nobr></td>
-          <td style="text-align: center"><nobr>{{row.f_residential_area}}</nobr></td>
-          <td style="text-align: center"><nobr>{{row.f_address}}</nobr></td>
-          <td style="text-align: center"><nobr>{{row.f_last_check_state}}</nobr></td>
-          <td style="text-align: center"><nobr>{{row.f_state}}</nobr></td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-
-export default {
-  title: '安检计划项列表',
-  data () {
-    return {
-      model: new PagedList('api/af-safecheck/sql/planItemNew', 20),
-      checkState:[{label:'全部',value:''},{label:'已检',value:'已检'},{label:'未检',value:'未检'}],
-      entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
-      no_checkplans: this.$appdata.getParam('有无计划')?[{label: '全部', value: ''}, ...this.$appdata.getParam('有无计划')]:[{label: '全部', value: ''}],
-      noChecks:[{label:'未检',value:'未检'},{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'}],
-      excelHeaders: {
-        //用户编号	用户名称	用户电话	安检次数	用户类型	小区名称	地址	安检日期	安检状态	安检结果
-
-        'f_userinfo_code': '用户编号',
-        'f_user_name': '用户名称',
-        'f_user_phone': '用户电话',
-        //'count_item':'安检次数',
-        'f_user_type': '用户类型',
-        'f_residential_area': '小区名称',
-        'f_address':'地址',
-        'f_last_check_date':'安检日期',
-        'f_last_check_state': '安检状态',
-        'f_state':'是否已检',
-        'f_last_check_result':'安检结果'
-      },
-      area:[{label:'全部',value:''}],
-      f_state:'',
-      f_no_checkplan:'',
-      f_last_check_state:'',
-      f_noruhu:'',
-      f_residential_area:'',
-      f_building:'',
-    }
-  },
-  props: [ 'check','checkstatus','checkstart','checkend' ],
-  watch: {
-    'check' (val) {
-      debugger
-      let condition
-      condition = `f_checker='${this.check.f_checker}'`
-      if(this.checkstart){
-        condition+= `and  f_last_check_date>='${this.checkstart}'`
-      }
-      if (this.checkend){
-        condition += `and f_last_check_date<='${this.f_endcheckend_time}'`
-      }
-      this.f_noruhu=[]
-      this.f_state=''
-      this.model.search(condition, {})
-
-    }
-  },
-
-  ready () {
-    if (this.check) {
-      let condition
-      condition = `f_checker='${this.check.f_checker}'`
-      if(this.checkstart){
-        condition += `and f_last_check_date>='${this.checkstart}'`
-      }
-      if (this.checkend){
-        condition += ` and f_last_check_date<='${this.f_end_tcheckendime}'`
-      }
-      this.model.search(condition, {})
-    }
-  },
-  methods:{
-    selfSearch(args){
-      if (this.check) {
-         args.condition = `f_checker='${this.check.f_checker}'`
-        if(this.checkstart){
-          args.condition+= `and  f_last_check_date>='${this.checkstart}'`
-        }
-        if (this.checkend){
-          args.condition += `and f_last_check_date<='${this.checkend}'`
-        }
-        if (this.f_residential_area){
-          args.condition += ` and i.f_residential_area like'%${this.f_residential_area}%'`
-        }
-        if (this.f_building){
-          args.condition += ` and i.f_building='${this.f_building}'`
-        }
-        if (this.f_state){
-          args.condition += ` and i.f_state='${this.f_state}'`
-        }
-        if (this.f_last_check_state){
-          args.condition += ` and i.f_last_check_state='${this.f_last_check_state}'`
-        }
-        if (this.f_no_checkplan){
-          if (this.f_no_checkplan == '有计划安检'){
-            args.condition += ` and i.f_plan_name != '无计划' `
-          }else {
-            args.condition += ` and i.f_plan_name = '无计划' `
-          }
-        }
-        this.model.search(args.condition, args.model)
-      }
-    }
-  },
-  computed: {
-    // 导出到Excel的条件构造
-    exportParameter() {
-      return {
-        condition: this.$refs.paged.model.condition
-      }
-    }
-  },
-}
-</script>
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div partial>
+          <ul class="nav nav-tabs">
+            <li role="presentation" class="active"><a style="	color: #5ac0d9 !important;">安检计划项明细</a></li>
+          </ul>
+          <div class="row">
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">安检状态</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :value.sync="$parent.$parent.f_state"
+                        v-model="$parent.$parent.f_state"
+                        :options='$parent.$parent.checkState'
+                        placeholder='安检状态'
+                        close-on-select
+                        value-single
+              >
+              </v-select>
+            </div>
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">有无计划</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :value.sync="$parent.$parent.f_no_checkplan"
+                        v-model="$parent.$parent.f_no_checkplan"
+                        :options='$parent.$parent.no_checkplans'
+                        placeholder='有无计划'
+                        close-on-select
+                        value-single
+              >
+              </v-select>
+            </div>
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">入户状态</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :value.sync="$parent.$parent.f_last_check_state"
+                        v-model="$parent.$parent.f_last_check_state"
+                        :options='$parent.$parent.entry_status'
+                        placeholder='入户状态'
+                        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="$parent.$parent.f_residential_area"
+                     style="width: 60%" placeholder="小区"
+                     condition="f_residential_area like '%{}%'">
+            </div>
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">楼号</label>
+              <input type="text" class="input_search"
+                     v-model="$parent.$parent.f_building"
+                     style="width: 60%" placeholder="楼号"
+                     condition="f_building like '%{}%'">
+            </div>
+            <div class="form-group col-sm-4 button-range" >
+              <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
+              <export-excel   :data="$parent.$parent.exportParameter"
+                                   :field="$parent.$parent.excelHeaders"
+                                   sqlurl="api/af-safecheck/logic/exportfile" sql-name="planItemNew"
+                                   template-name='安检计划明细' :choose-col="true">
+              </export-excel>
+              <!--<export-excel-->
+              <!--:data="{condition: $parent.$parent.condition}"-->
+              <!--:field="$parent.$parent.getfield"-->
+              <!--sqlurl="api/af-safecheck/logic/saleExport" sql-name="getGasUser" :template-name="$parent.$parent.pricename+'气价使用人'"-->
+              <!--:choose-col="true"></export-excel>-->
+
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' class="table_sy">
+
+        <template partial='head'>
+          <tr>
+            <th><nobr>计划名称</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'>
+          <td style="text-align: center"><nobr>{{row.f_plan_name}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_userinfo_code}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_user_name}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_residential_area}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_address}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_last_check_state}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_state}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+
+export default {
+  title: '安检计划项列表',
+  data () {
+    return {
+      model: new PagedList('api/af-safecheck/sql/planItemNew', 20),
+      checkState:[{label:'全部',value:''},{label:'已检',value:'已检'},{label:'未检',value:'未检'}],
+      entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
+      no_checkplans: this.$appdata.getParam('有无计划')?[{label: '全部', value: ''}, ...this.$appdata.getParam('有无计划')]:[{label: '全部', value: ''}],
+      noChecks:[{label:'未检',value:'未检'},{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'}],
+      excelHeaders: {
+        //用户编号	用户名称	用户电话	安检次数	用户类型	小区名称	地址	安检日期	安检状态	安检结果
+
+        'f_userinfo_code': '用户编号',
+        'f_user_name': '用户名称',
+        'f_user_phone': '用户电话',
+        //'count_item':'安检次数',
+        'f_user_type': '用户类型',
+        'f_residential_area': '小区名称',
+        'f_address':'地址',
+        'f_last_check_date':'安检日期',
+        'f_last_check_state': '安检状态',
+        'f_state':'是否已检',
+        'f_last_check_result':'安检结果'
+      },
+      area:[{label:'全部',value:''}],
+      f_state:'',
+      f_no_checkplan:'',
+      f_last_check_state:'',
+      f_noruhu:'',
+      f_residential_area:'',
+      f_building:'',
+    }
+  },
+  props: [ 'check','checkstatus','checkstart','checkend' ],
+  watch: {
+    'check' (val) {
+      debugger
+      let condition
+      condition = `f_checker='${this.check.f_checker}'`
+      if(this.checkstart){
+        condition+= `and  f_last_check_date>='${this.checkstart}'`
+      }
+      if (this.checkend){
+        condition += `and f_last_check_date<='${this.f_endcheckend_time}'`
+      }
+      this.f_noruhu=[]
+      this.f_state=''
+      this.model.search(condition, {})
+
+    }
+  },
+
+  ready () {
+    if (this.check) {
+      let condition
+      condition = `f_checker='${this.check.f_checker}'`
+      if(this.checkstart){
+        condition += `and f_last_check_date>='${this.checkstart}'`
+      }
+      if (this.checkend){
+        condition += ` and f_last_check_date<='${this.f_end_tcheckendime}'`
+      }
+      this.model.search(condition, {})
+    }
+  },
+  methods:{
+    selfSearch(args){
+      if (this.check) {
+         args.condition = `f_checker='${this.check.f_checker}'`
+        if(this.checkstart){
+          args.condition+= `and  f_last_check_date>='${this.checkstart}'`
+        }
+        if (this.checkend){
+          args.condition += `and f_last_check_date<='${this.checkend}'`
+        }
+        if (this.f_residential_area){
+          args.condition += ` and i.f_residential_area like'%${this.f_residential_area}%'`
+        }
+        if (this.f_building){
+          args.condition += ` and i.f_building='${this.f_building}'`
+        }
+        if (this.f_state){
+          args.condition += ` and i.f_state='${this.f_state}'`
+        }
+        if (this.f_last_check_state){
+          args.condition += ` and i.f_last_check_state='${this.f_last_check_state}'`
+        }
+        if (this.f_no_checkplan){
+          if (this.f_no_checkplan == '有计划安检'){
+            args.condition += ` and i.f_plan_name != '无计划' `
+          }else {
+            args.condition += ` and i.f_plan_name = '无计划' `
+          }
+        }
+        this.model.search(args.condition, args.model)
+      }
+    }
+  },
+  computed: {
+    // 导出到Excel的条件构造
+    exportParameter() {
+      return {
+        condition: this.$refs.paged.model.condition
+      }
+    }
+  },
+}
+</script>

package/src/plugins/LoadData.js

@@ -1,10 +1,10 @@
-import Vue from 'vue'
-// import AppData from '../stores/AppData'
-
-let getSafeCheckParams = {
-  install (Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.getSafeCheckParams = Vue.prototype.$getSafeCheckParams = getSafeCheckParams
-  }
-}
-export default getSafeCheckParams
+import Vue from 'vue'
+// import AppData from '../stores/AppData'
+
+let getSafeCheckParams = {
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.getSafeCheckParams = Vue.prototype.$getSafeCheckParams = getSafeCheckParams
+  }
+}
+export default getSafeCheckParams

package/src/plugins/LoadParams.js

@@ -1,24 +1,24 @@
-import Vue from 'vue'
-// import AppData from '../stores/AppData'
-
-let LoadParams = {
-    // 开启卡监听
-  load () {
-    return Vue.resetpost('rs/path/getParams', {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-      res.data.forEach((item) => {
-        let value = []
-        item.f_paramvalues.forEach((item, index) => {
-          value[index] = {}
-          value[index].label = item.name
-          value[index].value = item.name
-        })
-        AppData.params[item.name] = value
-      })
-    }).catch((res) => {
-      this.msg = res.data
-      this.show = true
-    })
-  }
-}
-
-export default LoadParams
+import Vue from 'vue'
+// import AppData from '../stores/AppData'
+
+let LoadParams = {
+    // 开启卡监听
+  load () {
+    return Vue.resetpost('rs/path/getParams', {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      res.data.forEach((item) => {
+        let value = []
+        item.f_paramvalues.forEach((item, index) => {
+          value[index] = {}
+          value[index].label = item.name
+          value[index].value = item.name
+        })
+        AppData.params[item.name] = value
+      })
+    }).catch((res) => {
+      this.msg = res.data
+      this.show = true
+    })
+  }
+}
+
+export default LoadParams

package/src/stores/wxconfig.js

@@ -1,10 +1,10 @@
-export default {
-  // 一下为长安呼叫使用云电话地址
-  // tcUrl: 'http://192.169.1.2:9876/Dual'
- /* voiceUrl: 'http://127.0.0.1:9876/Dual',
-  texttUrl: 'http://192.168.2.77:9876/Dual'*/
-  // 一下为咸阳呼叫使用地址
-  // tcUrl: 'http://192.168.2.77:9876/Dual'
-  // tcUrl: 'http://127.0.0.1:9876/Dual'
-  // tcUrl: 'http://192.168.30.28:9876/Dual'
-}
+export default {
+  // 一下为长安呼叫使用云电话地址
+  // tcUrl: 'http://192.169.1.2:9876/Dual'
+ /* voiceUrl: 'http://127.0.0.1:9876/Dual',
+  texttUrl: 'http://192.168.2.77:9876/Dual'*/
+  // 一下为咸阳呼叫使用地址
+  // tcUrl: 'http://192.168.2.77:9876/Dual'
+  // tcUrl: 'http://127.0.0.1:9876/Dual'
+  // tcUrl: 'http://192.168.30.28:9876/Dual'
+}

package/src/utils/getNowDate.js

@@ -1,33 +1,33 @@
-export default () => {
-  // 求取当前时间的工具
-  let myweekday = ''
-  let year = ''
-  let mydate = new Date()
-  myweekday = mydate.getDay()
-  let mymonth = mydate.getMonth() + 1
-  let myday = mydate.getDate()
-  let myyear = mydate.getYear()
-  year = (myyear > 200) ? myyear : 1900 + myyear
-  let weekday = ''
-  if (myweekday === 0) {
-    weekday = '星期日'
-  } else if (myweekday === 1) {
-    weekday = '星期一'
-  } else if (myweekday === 2) {
-    weekday = '星期二'
-  } else if (myweekday === 3) {
-    weekday = '星期三'
-  } else if (myweekday === 4) {
-    weekday = '星期四'
-  } else if (myweekday === 5) {
-    weekday = '星期五'
-  } else if (myweekday === 6) {
-    weekday = '星期日'
-  } else if (myweekday === 7) {
-    weekday = '星期六'
-  }
-
-
-  // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
-  return  year + '年' + mymonth + '月' + myday + '日 ' + weekday
-}
+export default () => {
+  // 求取当前时间的工具
+  let myweekday = ''
+  let year = ''
+  let mydate = new Date()
+  myweekday = mydate.getDay()
+  let mymonth = mydate.getMonth() + 1
+  let myday = mydate.getDate()
+  let myyear = mydate.getYear()
+  year = (myyear > 200) ? myyear : 1900 + myyear
+  let weekday = ''
+  if (myweekday === 0) {
+    weekday = '星期日'
+  } else if (myweekday === 1) {
+    weekday = '星期一'
+  } else if (myweekday === 2) {
+    weekday = '星期二'
+  } else if (myweekday === 3) {
+    weekday = '星期三'
+  } else if (myweekday === 4) {
+    weekday = '星期四'
+  } else if (myweekday === 5) {
+    weekday = '星期五'
+  } else if (myweekday === 6) {
+    weekday = '星期日'
+  } else if (myweekday === 7) {
+    weekday = '星期六'
+  }
+
+
+  // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
+  return  year + '年' + mymonth + '月' + myday + '日 ' + weekday
+}

package/test/e2e/custom-assertions/elementCount.js

@@ -1,26 +1,26 @@
-// A custom Nightwatch assertion.
-// the name of the method is the filename.
-// can be used in tests like this:
-//
-//   browser.assert.elementCount(selector, count)
-//
-// for how to write custom assertions see
-// http://nightwatchjs.org/guide#writing-custom-assertions
-exports.assertion = function (selector, count) {
-  this.message = 'Testing if element <' + selector + '> has count: ' + count
-  this.expected = count
-  this.pass = function (val) {
-    return val === this.expected
-  }
-  this.value = function (res) {
-    return res.value
-  }
-  this.command = function (cb) {
-    var self = this
-    return this.api.execute(function (selector) {
-      return document.querySelectorAll(selector).length
-    }, [selector], function (res) {
-      cb.call(self, res)
-    })
-  }
-}
+// A custom Nightwatch assertion.
+// the name of the method is the filename.
+// can be used in tests like this:
+//
+//   browser.assert.elementCount(selector, count)
+//
+// for how to write custom assertions see
+// http://nightwatchjs.org/guide#writing-custom-assertions
+exports.assertion = function (selector, count) {
+  this.message = 'Testing if element <' + selector + '> has count: ' + count
+  this.expected = count
+  this.pass = function (val) {
+    return val === this.expected
+  }
+  this.value = function (res) {
+    return res.value
+  }
+  this.command = function (cb) {
+    var self = this
+    return this.api.execute(function (selector) {
+      return document.querySelectorAll(selector).length
+    }, [selector], function (res) {
+      cb.call(self, res)
+    })
+  }
+}