safecheck-client 3.0.33-91 → 3.0.33-92

package/src/filiale/yongzhou/pc/communityTypeDetailG.vue

@@ -1,138 +1,138 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <criteria-paged :model="model" v-ref:paged>
-        <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
-          <div partial>
-            <div class="row">
-              <div class="col-sm-4 form-group">
-                <label class="font_normal_body">用户名称：</label>
-                <input style="width: 60%" class="input_search" v-model="model.f_user_name"
-                       placeholder="请输入用户名称（可模糊查询）" condition="f_user_name like '%{}%'">
-              </div>
-              <div class="col-sm-4 form-group">
-                <label class="font_normal_body">安检年份：</label>
-                <input style="width: 60%" class="input_search" v-model="model.year">
-              </div>
-              <div style="float: right">
-                <export-excel-safe :data="$parent.$parent.searchData"
-                                   :field="$parent.$parent.excelHeaders"
-                                   progress="safeGetExportProgress"
-                                   sqlurl="rs/logic/SafeExportExcel" sql-name="communityTypeDetailG"
-                                   template-name='工商情况明细表' :choose-col="true"></export-excel-safe>
-              </div>
-<!--              <print-data-safe :sum-field="$parent.$parent.excelHeaders" :model="$parent.$parent.print_model" :field="$parent.$parent.excelHeaders"-->
-<!--                          :defaultfield="$parent.$parent.defaultPrint" :chooserow="true"-->
-<!--                          :titletable="'工商情况明细表'" :starthead="$parent.$parent.getstart"-->
-<!--              ></print-data-safe>-->
-              <button class="button_spacing button_search" @click="search()">查询</button>
-            </div>
-          </div>
-        </criteria>
-        <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
-          <template partial='head'>
-            <tr>
-              <th rowspan="2">序号</th>
-              <th rowspan="2">用户名称</th>
-              <th colspan="2">1季度完成情况</th>
-              <th colspan="2">2季度完成情况</th>
-              <th colspan="2">3季度完成情况</th>
-              <th colspan="2">4季度完成情况</th>
-            </tr>
-            <tr>
-              <th>已安检</th>
-              <th>未安检原因</th>
-              <th>已安检</th>
-              <th>未安检原因</th>
-              <th>已安检</th>
-              <th>未安检原因</th>
-              <th>已安检</th>
-              <th>未安检原因</th>
-            </tr>
-          </template>
-          <template partial='body'>
-            <td style="text-align: center">{{ $index + 1 }}</td>
-            <td style="text-align: center">{{ row.f_user_name }}</td>
-            <td style="text-align: center">{{ row.m1_safe }}</td>
-            <td style="text-align: center">{{ row.m1_remarks }}</td>
-            <td style="text-align: center">{{ row.m2_safe }}</td>
-            <td style="text-align: center">{{ row.m2_remarks }}</td>
-            <td style="text-align: center">{{ row.m3_safe }}</td>
-            <td style="text-align: center">{{ row.m3_remarks }}</td>
-            <td style="text-align: center">{{ row.m4_safe }}</td>
-            <td style="text-align: center">{{ row.m4_remarks }}</td>
-          </template>
-        </data-grid>
-      </criteria-paged>
-    </div>
-  </div>
-</template>
-
-<script>
-import {PagedList} from "vue-client";
-
-export default {
-  name: "communityTypeDetailG",
-  title: "工商情况明细表",
-  data() {
-    let model = new PagedList("/rs/sql/communityTypeDetailG", 20, {year: 'this.year'})
-    model.year = ''
-    return {
-      model: model,
-      resids: {},
-      print_model:{},
-      searchData: {
-        condition: "1=1",
-        year: null
-      },
-      excelHeaders: {
-        'f_user_name': '用户名称',
-        'm1_safe': '1季度完成安检',
-        'm1_remarks': '1季度未安检原因',
-        'm2_safe': '2季度完成安检',
-        'm2_remarks': '2季度未安检原因',
-        'm3_safe': '3季度完成安检',
-        'm3_remarks': '3季度未安检原因',
-        'm4_safe' : '4季度完成安检',
-        'm4_remarks' : '4季度未安检原因'
-      },
-      printshow: false,
-    }
-  },
-  ready() {
-    this.$refs.paged.$refs.criteria.model.year = new Date().getFullYear()
-    // this.model.search('1=1')
-  },
-  methods: {
-    selfSearch(args) {
-      this.model.year = args.model.year
-      args.condition += ` and uf.f_user_type = '非民用' `
-      this.searchData.condition = args.condition
-      this.searchData.year = args.model.year
-      this.model.search(args.condition, args.model, args.condValue)
-      this.print_model.totalPage = 0
-    },
-    getRes(obj) {
-      //tag
-      this.resids = {res: obj.res[0], resids: obj.resids[0]}
-      this.model.f_filialeids = this.$login.convertToIn(obj.resids);
-    },
-    // 打印
-    stamp() {
-      this.printshow = true
-    },
-    close() {
-      this.printshow = false
-    }
-  },
-  computed: {
-    getstart() {
-      return `开始时间：${this.$refs.paged.$refs.criteria.model.start_time} 结束时间：${this.$refs.paged.$refs.criteria.model.end_time}`
-    },
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
+          <div partial>
+            <div class="row">
+              <div class="col-sm-4 form-group">
+                <label class="font_normal_body">用户名称：</label>
+                <input style="width: 60%" class="input_search" v-model="model.f_user_name"
+                       placeholder="请输入用户名称（可模糊查询）" condition="f_user_name like '%{}%'">
+              </div>
+              <div class="col-sm-4 form-group">
+                <label class="font_normal_body">安检年份：</label>
+                <input style="width: 60%" class="input_search" v-model="model.year">
+              </div>
+              <div style="float: right">
+                <export-excel-safe :data="$parent.$parent.searchData"
+                                   :field="$parent.$parent.excelHeaders"
+                                   progress="safeGetExportProgress"
+                                   sqlurl="rs/logic/SafeExportExcel" sql-name="communityTypeDetailG"
+                                   template-name='工商情况明细表' :choose-col="true"></export-excel-safe>
+              </div>
+<!--              <print-data-safe :sum-field="$parent.$parent.excelHeaders" :model="$parent.$parent.print_model" :field="$parent.$parent.excelHeaders"-->
+<!--                          :defaultfield="$parent.$parent.defaultPrint" :chooserow="true"-->
+<!--                          :titletable="'工商情况明细表'" :starthead="$parent.$parent.getstart"-->
+<!--              ></print-data-safe>-->
+              <button class="button_spacing button_search" @click="search()">查询</button>
+            </div>
+          </div>
+        </criteria>
+        <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th rowspan="2">序号</th>
+              <th rowspan="2">用户名称</th>
+              <th colspan="2">1季度完成情况</th>
+              <th colspan="2">2季度完成情况</th>
+              <th colspan="2">3季度完成情况</th>
+              <th colspan="2">4季度完成情况</th>
+            </tr>
+            <tr>
+              <th>已安检</th>
+              <th>未安检原因</th>
+              <th>已安检</th>
+              <th>未安检原因</th>
+              <th>已安检</th>
+              <th>未安检原因</th>
+              <th>已安检</th>
+              <th>未安检原因</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td style="text-align: center">{{ $index + 1 }}</td>
+            <td style="text-align: center">{{ row.f_user_name }}</td>
+            <td style="text-align: center">{{ row.m1_safe }}</td>
+            <td style="text-align: center">{{ row.m1_remarks }}</td>
+            <td style="text-align: center">{{ row.m2_safe }}</td>
+            <td style="text-align: center">{{ row.m2_remarks }}</td>
+            <td style="text-align: center">{{ row.m3_safe }}</td>
+            <td style="text-align: center">{{ row.m3_remarks }}</td>
+            <td style="text-align: center">{{ row.m4_safe }}</td>
+            <td style="text-align: center">{{ row.m4_remarks }}</td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+import {PagedList} from "vue-client";
+
+export default {
+  name: "communityTypeDetailG",
+  title: "工商情况明细表",
+  data() {
+    let model = new PagedList("/rs/sql/communityTypeDetailG", 20, {year: 'this.year'})
+    model.year = ''
+    return {
+      model: model,
+      resids: {},
+      print_model:{},
+      searchData: {
+        condition: "1=1",
+        year: null
+      },
+      excelHeaders: {
+        'f_user_name': '用户名称',
+        'm1_safe': '1季度完成安检',
+        'm1_remarks': '1季度未安检原因',
+        'm2_safe': '2季度完成安检',
+        'm2_remarks': '2季度未安检原因',
+        'm3_safe': '3季度完成安检',
+        'm3_remarks': '3季度未安检原因',
+        'm4_safe' : '4季度完成安检',
+        'm4_remarks' : '4季度未安检原因'
+      },
+      printshow: false,
+    }
+  },
+  ready() {
+    this.$refs.paged.$refs.criteria.model.year = new Date().getFullYear()
+    // this.model.search('1=1')
+  },
+  methods: {
+    selfSearch(args) {
+      this.model.year = args.model.year
+      args.condition += ` and uf.f_user_type = '非民用' `
+      this.searchData.condition = args.condition
+      this.searchData.year = args.model.year
+      this.model.search(args.condition, args.model, args.condValue)
+      this.print_model.totalPage = 0
+    },
+    getRes(obj) {
+      //tag
+      this.resids = {res: obj.res[0], resids: obj.resids[0]}
+      this.model.f_filialeids = this.$login.convertToIn(obj.resids);
+    },
+    // 打印
+    stamp() {
+      this.printshow = true
+    },
+    close() {
+      this.printshow = false
+    }
+  },
+  computed: {
+    getstart() {
+      return `开始时间：${this.$refs.paged.$refs.criteria.model.start_time} 结束时间：${this.$refs.paged.$refs.criteria.model.end_time}`
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/main.js

@@ -1,33 +1,33 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import safecheck from './safecheck'
-import echarts from 'echarts'
-// import safecheck from './rongcheng'
-
-all()
-// 验证码开关赋值
-var Verificationfalg = false
-system(Verificationfalg)
-// system()
-safecheck('fugou')
-// safecheck('rizhao')
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-
-Vue.prototype.$echarts = echarts
-Vue.android = false
-
-Vue.url = '/SafeCheck/rs/'
-if(Vue.android)
-  Vue.url = Vue.staticUrl
-Vue.interval = 1*60*1000
-Vue.nopic = 'file:///android_asset/nopic.png'
-Vue.mapSetup = false
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import safecheck from './safecheck'
+import echarts from 'echarts'
+// import safecheck from './rongcheng'
+
+all()
+// 验证码开关赋值
+var Verificationfalg = false
+system(Verificationfalg)
+// system()
+safecheck('tianke')
+// safecheck('rizhao')
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+
+Vue.prototype.$echarts = echarts
+Vue.android = false
+
+Vue.url = '/SafeCheck/rs/'
+if(Vue.android)
+  Vue.url = Vue.staticUrl
+Vue.interval = 1*60*1000
+Vue.nopic = 'file:///android_asset/nopic.png'
+Vue.mapSetup = false
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})

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/AppData.js

@@ -1,46 +1,46 @@
-let DataStore = {
-  params: {},
-  singleValues: {},
-  gasstyles: {},
-  gasbrands: [],
-  price: [],
-
-  getParam (key) {
-    return this.params[key]
-  },
-  getSingleValue (key) {
-    return this.singleValues[key]
-  },
-  getGasstyle (key) {
-    return this.gasbrands.key
-  },
-  getGasbrand () {
-    return this.gasbrands
-  },
-  getPrice (object) {
-    // 目前支持三个字段并都有值 f_user_type,f_gasproperties,f_price_type
-    if (!object.f_user_type || !object.f_gasproperties || !object.f_price_type) {
-      return
-    }
-    let result = []
-    // 做筛选
-    this.price.forEach((item) => {
-      if (item.f_state === '有效' && object.f_user_type === item.f_user_type && object.f_gasproperties === item.f_gasproperties && object.f_price_type === item.f_price_type) {
-        let value = {
-          label: item.f_price_name,
-          value: item
-        }
-        result.push(value)
-      }
-    })
-    // 数组去重
-    let hash = {}
-    result = result.reduce((item, next) => {
-      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
-      return item
-    }, [])
-    return Array.from(new Set(result))
-  }
-}
-
-export default DataStore
+let DataStore = {
+  params: {},
+  singleValues: {},
+  gasstyles: {},
+  gasbrands: [],
+  price: [],
+
+  getParam (key) {
+    return this.params[key]
+  },
+  getSingleValue (key) {
+    return this.singleValues[key]
+  },
+  getGasstyle (key) {
+    return this.gasbrands.key
+  },
+  getGasbrand () {
+    return this.gasbrands
+  },
+  getPrice (object) {
+    // 目前支持三个字段并都有值 f_user_type,f_gasproperties,f_price_type
+    if (!object.f_user_type || !object.f_gasproperties || !object.f_price_type) {
+      return
+    }
+    let result = []
+    // 做筛选
+    this.price.forEach((item) => {
+      if (item.f_state === '有效' && object.f_user_type === item.f_user_type && object.f_gasproperties === item.f_gasproperties && object.f_price_type === item.f_price_type) {
+        let value = {
+          label: item.f_price_name,
+          value: item
+        }
+        result.push(value)
+      }
+    })
+    // 数组去重
+    let hash = {}
+    result = result.reduce((item, next) => {
+      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
+      return item
+    }, [])
+    return Array.from(new Set(result))
+  }
+}
+
+export default DataStore

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)
+    })
+  }
+}