safecheck-client 4.0.1-50 → 4.0.1-53

package/src/components/userfileaudit/MeterAuditFile.vue

@@ -1,129 +1,129 @@
-<template>
-<div style="overflow-x: hidden;">
-  <validator name='v'>
-    <form novalidate class="form-horizontal">
-      <div class="form-group">
-        <label for="f_card_id" class="col-sm-offset-1 col-sm-1 control-label">卡号:</label>
-        <div class="col-sm-2">
-            <input class="form-control" type="text" v-model="model.f_card_id"  v-validate:f_card_id='{ required: true }'>
-        </div>
-
-        <label for="f_meter_no" class="col-sm-1 control-label">表号:</label>
-        <div class="col-sm-2">
-           <input class="form-control" type="text" v-model="model.f_meter_no" v-validate:f_meter_no='{ required: true }'>
-        </div>
-         <label for="f_meter_brand" class="col-sm-1 control-label">表牌:</label>
-         <div class="col-sm-2">
-            <!-- <input class="form-control" type="text" v-model="model.f_meter_brand" > -->
-            <v-select id="f_meter_brand"
-            placeholder='请选择'
-            :value.sync="f_meter_brand"
-            :options='f_meterbrand'
-            close-on-select clear-button></v-select>
-          </div>
-        </div>
-
-        <div class="form-group">
-          <label for="f_meter_measurement" class="col-sm-offset-1 col-sm-1 control-label">计量类型:</label>
-          <div class="col-sm-2">
-              <v-select id="f_meter_measurement"
-              placeholder='请选择'
-              :value.sync="f_meter_measurement"
-              :options='f_metermeasurement'
-              close-on-select clear-button></v-select>
-          </div>
-          <label for="f_meter_diameter" class="col-sm-1 control-label">表径:</label>
-          <div class="col-sm-2">
-             <input class="form-control" type="text" v-model="model.f_meter_diameter" v-validate:f_meter_diameter='{ required: true }'>
-          </div>
-           <label for="f_meter_reading" class="col-sm-1 control-label">机表读数:</label>
-           <div class="col-sm-2">
-             <input class="form-control" type="text" v-model="model.f_meter_reading"  number v-validate:f_meter_reading='{ required: true }'>
-            </div>
-          </div>
-
-        <div class="form-group">
-           <label for="f_meter_remain" class="col-sm-offset-1 col-sm-1 control-label">剩余气量:</label>
-           <div class="col-sm-2">
-              <input class="form-control" type="text" v-model="model.f_meter_remain" number v-validate:f_meter_remain='{ required: true }'>
-           </div>
-           <label for="f_meter_total" class="col-sm-1 control-label">购气总量:</label>
-            <div class="col-sm-2">
-               <input class="form-control" type="text" v-model="model.f_meter_total" v-validate:f_meter_total='{ required: true }'>
-            </div>
-
-            <label for="f_meter_accumulation" class="col-sm-1 control-label">累计用气量:</label>
-            <div class="col-sm-2">
-              <input class="form-control" type="text" v-model="model.f_meter_accumulation" v-validate:f_meter_accumulation='{ required: true }'>
-            </div>
-          </div>
-
-          <div class="form-group">
-             <label for="f_remark" class="col-sm-offset-1 col-sm-1 control-label">备注:</label>
-             <div class="col-sm-2">
-                <input class="form-control" type="text" v-model="model.f_remark">
-             </div>
-            </div>
-        </form>
-        <div style="text-align:center;height:auto;">
-          <button class="btn btn-primary" :disabled='!($v.valid)' @click="confirm()" style="width:100px;margin-left:20px;">
-            <span class="glyphicon glyphicon-floppy-disk"></span>保存
-          </button>
-          <button class="btn btn-default"  @click='cancel()' style="width:100px;margin-left:20px;">
-            <span class="glyphicon glyphicon-log-out"></span>取消
-          </button>
-        </div>
-  </validator>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-import Vue from 'vue'
-import * as Util from '../Util'
-import AppData from '../../stores/AppData'
-
-export default {
-  title: '表档案修改',
-  props: ['model'],
-  data () {
-    return {
-      f_meter_brand: [''],
-      f_meterbrand: this.$appdata.getParam('燃气表品牌'),
-      f_meter_measurement: [''],
-      f_metermeasurement: this.$appdata.getParam('计量类型'),
-      rowCopy: {}
-    }
-  },
-  ready () {
-    if(this.model.f_meter_brand)
-      this.f_meter_brand = [this.model.f_meter_brand]
-    if(this.model.f_meter_measurement)
-      this.f_meter_measurement = [this.model.f_meter_measurement]
-    this.rowCopy = JSON.stringify(this.model)
-  },
-  methods: {
-    cancel () {
-      let tmp = JSON.parse(this.rowCopy)
-      for(let prop in this.model)
-        if(tmp.hasOwnProperty(prop)) {
-          this.model[prop] = tmp[prop]
-        }
-      this.$back()
-    },
-    confirm () {
-      if (!this.f_meter_brand[0]) {
-        window.alert('请选择燃气表品牌！')
-        return
-      }
-      if (!this.f_meter_measurement[0]) {
-        window.alert('请选择计量类型！')
-        return
-      }
-      this.model.f_meter_brand = this.f_meter_brand[0]
-      this.model.f_meter_measurement = this.f_meter_measurement[0]
-      this.$back()
-    }
-  }
-}
-</script>
+<template>
+<div style="overflow-x: hidden;">
+  <validator name='v'>
+    <form novalidate class="form-horizontal">
+      <div class="form-group">
+        <label for="f_card_id" class="col-sm-offset-1 col-sm-1 control-label">卡号:</label>
+        <div class="col-sm-2">
+            <input class="form-control" type="text" v-model="model.f_card_id"  v-validate:f_card_id='{ required: true }'>
+        </div>
+
+        <label for="f_meter_no" class="col-sm-1 control-label">表号:</label>
+        <div class="col-sm-2">
+           <input class="form-control" type="text" v-model="model.f_meter_no" v-validate:f_meter_no='{ required: true }'>
+        </div>
+         <label for="f_meter_brand" class="col-sm-1 control-label">表牌:</label>
+         <div class="col-sm-2">
+            <!-- <input class="form-control" type="text" v-model="model.f_meter_brand" > -->
+            <v-select id="f_meter_brand"
+            placeholder='请选择'
+            :value.sync="f_meter_brand"
+            :options='f_meterbrand'
+            close-on-select clear-button></v-select>
+          </div>
+        </div>
+
+        <div class="form-group">
+          <label for="f_meter_measurement" class="col-sm-offset-1 col-sm-1 control-label">计量类型:</label>
+          <div class="col-sm-2">
+              <v-select id="f_meter_measurement"
+              placeholder='请选择'
+              :value.sync="f_meter_measurement"
+              :options='f_metermeasurement'
+              close-on-select clear-button></v-select>
+          </div>
+          <label for="f_meter_diameter" class="col-sm-1 control-label">表径:</label>
+          <div class="col-sm-2">
+             <input class="form-control" type="text" v-model="model.f_meter_diameter" v-validate:f_meter_diameter='{ required: true }'>
+          </div>
+           <label for="f_meter_reading" class="col-sm-1 control-label">机表读数:</label>
+           <div class="col-sm-2">
+             <input class="form-control" type="text" v-model="model.f_meter_reading"  number v-validate:f_meter_reading='{ required: true }'>
+            </div>
+          </div>
+
+        <div class="form-group">
+           <label for="f_meter_remain" class="col-sm-offset-1 col-sm-1 control-label">剩余气量:</label>
+           <div class="col-sm-2">
+              <input class="form-control" type="text" v-model="model.f_meter_remain" number v-validate:f_meter_remain='{ required: true }'>
+           </div>
+           <label for="f_meter_total" class="col-sm-1 control-label">购气总量:</label>
+            <div class="col-sm-2">
+               <input class="form-control" type="text" v-model="model.f_meter_total" v-validate:f_meter_total='{ required: true }'>
+            </div>
+
+            <label for="f_meter_accumulation" class="col-sm-1 control-label">累计用气量:</label>
+            <div class="col-sm-2">
+              <input class="form-control" type="text" v-model="model.f_meter_accumulation" v-validate:f_meter_accumulation='{ required: true }'>
+            </div>
+          </div>
+
+          <div class="form-group">
+             <label for="f_remark" class="col-sm-offset-1 col-sm-1 control-label">备注:</label>
+             <div class="col-sm-2">
+                <input class="form-control" type="text" v-model="model.f_remark">
+             </div>
+            </div>
+        </form>
+        <div style="text-align:center;height:auto;">
+          <button class="btn btn-primary" :disabled='!($v.valid)' @click="confirm()" style="width:100px;margin-left:20px;">
+            <span class="glyphicon glyphicon-floppy-disk"></span>保存
+          </button>
+          <button class="btn btn-default"  @click='cancel()' style="width:100px;margin-left:20px;">
+            <span class="glyphicon glyphicon-log-out"></span>取消
+          </button>
+        </div>
+  </validator>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+import Vue from 'vue'
+import * as Util from '../Util'
+import AppData from '../../stores/AppData'
+
+export default {
+  title: '表档案修改',
+  props: ['model'],
+  data () {
+    return {
+      f_meter_brand: [''],
+      f_meterbrand: this.$appdata.getParam('燃气表品牌'),
+      f_meter_measurement: [''],
+      f_metermeasurement: this.$appdata.getParam('计量类型'),
+      rowCopy: {}
+    }
+  },
+  ready () {
+    if(this.model.f_meter_brand)
+      this.f_meter_brand = [this.model.f_meter_brand]
+    if(this.model.f_meter_measurement)
+      this.f_meter_measurement = [this.model.f_meter_measurement]
+    this.rowCopy = JSON.stringify(this.model)
+  },
+  methods: {
+    cancel () {
+      let tmp = JSON.parse(this.rowCopy)
+      for(let prop in this.model)
+        if(tmp.hasOwnProperty(prop)) {
+          this.model[prop] = tmp[prop]
+        }
+      this.$back()
+    },
+    confirm () {
+      if (!this.f_meter_brand[0]) {
+        window.alert('请选择燃气表品牌！')
+        return
+      }
+      if (!this.f_meter_measurement[0]) {
+        window.alert('请选择计量类型！')
+        return
+      }
+      this.model.f_meter_brand = this.f_meter_brand[0]
+      this.model.f_meter_measurement = this.f_meter_measurement[0]
+      this.$back()
+    }
+  }
+}
+</script>

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

@@ -1172,7 +1172,7 @@ export default {
     },
     showAudit() {
       var audit = this.$login.f.rolestr.includes('安检审核')
-      if (audit == '是' && (this.item.f_approved == '未审核' || !this.item.f_approved)) {
+      if (audit && (this.item.f_approved == '未审核' || !this.item.f_approved)) {
         this.showButton = true
       }
     },

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

package/test/e2e/nightwatch.conf.js

@@ -1,40 +1,40 @@
-// http://nightwatchjs.org/guide#settings-file
-module.exports = {
-  'src_folders': ['test/e2e/specs'],
-  'output_folder': 'test/e2e/reports',
-  'custom_assertions_path': ['test/e2e/custom-assertions'],
-
-  'selenium': {
-    'start_process': true,
-    'server_path': 'node_modules/selenium-server/lib/runner/selenium-server-standalone-2.52.0.jar',
-    'host': '127.0.0.1',
-    'port': 4444,
-    'cli_args': {
-      'webdriver.chrome.driver': require('chromedriver').path
-    }
-  },
-
-  'test_settings': {
-    'default': {
-      'selenium_port': 4444,
-      'selenium_host': 'localhost',
-      'silent': true
-    },
-
-    'chrome': {
-      'desiredCapabilities': {
-        'browserName': 'chrome',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true
-      }
-    },
-
-    'firefox': {
-      'desiredCapabilities': {
-        'browserName': 'firefox',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true
-      }
-    }
-  }
-}
+// http://nightwatchjs.org/guide#settings-file
+module.exports = {
+  'src_folders': ['test/e2e/specs'],
+  'output_folder': 'test/e2e/reports',
+  'custom_assertions_path': ['test/e2e/custom-assertions'],
+
+  'selenium': {
+    'start_process': true,
+    'server_path': 'node_modules/selenium-server/lib/runner/selenium-server-standalone-2.52.0.jar',
+    'host': '127.0.0.1',
+    'port': 4444,
+    'cli_args': {
+      'webdriver.chrome.driver': require('chromedriver').path
+    }
+  },
+
+  'test_settings': {
+    'default': {
+      'selenium_port': 4444,
+      'selenium_host': 'localhost',
+      'silent': true
+    },
+
+    'chrome': {
+      'desiredCapabilities': {
+        'browserName': 'chrome',
+        'javascriptEnabled': true,
+        'acceptSslCerts': true
+      }
+    },
+
+    'firefox': {
+      'desiredCapabilities': {
+        'browserName': 'firefox',
+        'javascriptEnabled': true,
+        'acceptSslCerts': true
+      }
+    }
+  }
+}

package/test/e2e/runner.js

@@ -1,30 +1,30 @@
-// 1. start the dev server
-var server = require('../../build/dev-server.js')
-
-// 2. run the nightwatch test suite against it
-// to run in additional browsers:
-//    1. add an entry in test/e2e/nightwatch.conf.json under "test_settings"
-//    2. add it to the --env flag below
-// For more information on Nightwatch's config file, see
-// http://nightwatchjs.org/guide#settings-file
-var spawn = require('cross-spawn')
-var runner = spawn(
-  './node_modules/.bin/nightwatch',
-  [
-    '--config', 'test/e2e/nightwatch.conf.js',
-    '--env', 'chrome'
-  ],
-  {
-    stdio: 'inherit'
-  }
-)
-
-runner.on('exit', function (code) {
-  server.close()
-  process.exit(code)
-})
-
-runner.on('error', function (err) {
-  server.close()
-  throw err
-})
+// 1. start the dev server
+var server = require('../../build/dev-server.js')
+
+// 2. run the nightwatch test suite against it
+// to run in additional browsers:
+//    1. add an entry in test/e2e/nightwatch.conf.json under "test_settings"
+//    2. add it to the --env flag below
+// For more information on Nightwatch's config file, see
+// http://nightwatchjs.org/guide#settings-file
+var spawn = require('cross-spawn')
+var runner = spawn(
+  './node_modules/.bin/nightwatch',
+  [
+    '--config', 'test/e2e/nightwatch.conf.js',
+    '--env', 'chrome'
+  ],
+  {
+    stdio: 'inherit'
+  }
+)
+
+runner.on('exit', function (code) {
+  server.close()
+  process.exit(code)
+})
+
+runner.on('error', function (err) {
+  server.close()
+  throw err
+})

package/test/e2e/specs/test.js

@@ -1,13 +1,13 @@
-// For authoring Nightwatch tests, see
-// http://nightwatchjs.org/guide#usage
-
-module.exports = {
-  'default e2e tests': function (browser) {
-    browser
-    .url('http://localhost:8080')
-      .waitForElementVisible('#app', 5000)
-      .assert.elementPresent('.logo')
-      .assert.containsText('h1', 'Hello World!')
-      .end()
-  }
-}
+// For authoring Nightwatch tests, see
+// http://nightwatchjs.org/guide#usage
+
+module.exports = {
+  'default e2e tests': function (browser) {
+    browser
+    .url('http://localhost:8080')
+      .waitForElementVisible('#app', 5000)
+      .assert.elementPresent('.logo')
+      .assert.containsText('h1', 'Hello World!')
+      .end()
+  }
+}