safecheck-client 3.0.39-3 → 3.0.39-31

package/src/filiale/wuan/android/SafecheckOrderV.vue

@@ -1530,6 +1530,7 @@ export default {
       //tag
       // this.data.f_noplan_item_id =  this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()
       this.data.ename = Vue.user.ename
+      // this.data.f_noanswers_path = []
       this.data.f_outlets = Vue.user.f_parentname
       this.data.f_meetunit = Vue.user.orgpathnames
       this.data.orgpathstr = Vue.user.orgpathstr

package/src/filiale/wuan/android/SafecheckUserInfo.vue

@@ -105,15 +105,23 @@
             <label class="text-left font">到访不遇照片：</label>
             <div class="auto">
               <div class="panel" style="padding: 10px 10px 5px 10px;">
-                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                <div class="panel-body panel-self"
+                     style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
                   <div class="row" style="height: 240px;overflow: scroll;top: 1px">
-                    <div class="col-sm-4">
-                      <img-self :src="f_noanswer_path" alt="到访不遇照片" width="150" height="200"></img-self>
+                    <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px"
+                         v-for="(index,img) in f_noanswers_path">
+                      <img-self :src="img.f_noanswer_path" alt="到访不遇照片" :width="130" :height="160"></img-self>
+                      <img src="../../../assets/删除.png" @click="delfile('f_noanswers_path', img.f_noanswer_path,index)"
+                           style="width: 15px;margin-top: -80px" alt="">
                     </div>
                   </div>
                   <div class="row text-right div-photo" :class="style__">
-                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_noanswer_path', '到访不遇照片')">拍照</button>
-                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../../assets/remove.png" :class="style__" @click="delfile('f_noanswer_path', this.f_noanswer_path)" style="width: 25%;"></img>
+                    <button type="button" name="button" class="btn btn-primary btn-photo"
+                            @click="takePic('f_noanswers_path', '到访不遇照片')">拍照
+                    </button>
+                    <!--                    <button type="button" name="button" class="btn btn-primary btn-photo"-->
+                    <!--                            @click="takePic('相册','f_noanswers_path', '到访不遇照片')">相册-->
+                    <!--                    </button>-->
                   </div>
                 </div>
               </div>
@@ -356,8 +364,13 @@ export default {
       this.$parent.$parent.$goto('phone-sell-info', {f_userinfo_id: f_userinfo_id})
     },
     cameraCallBack(prop, fileName) {
-      HostApp.__this__.$set(prop, fileName + '?' + Math.random())
-      //tag
+      if (prop == 'f_noanswers_path') {
+        HostApp.__this__.f_noanswers_path.push({
+          f_noanswer_path: fileName
+        })
+      } else {
+        HostApp.__this__.$set(prop, fileName + '?' + Math.random())
+      }
       HostApp.__callback__ = null
       HostApp.__this__ = null
     },
@@ -366,10 +379,18 @@ export default {
       HostApp.__this__ = this
       //tag
       let fileName
-      if (!this[prop] || this[prop].includes("nopic.png")) {
+      if (prop == 'f_noanswers_path') {
+        //tag
+        if (this.f_noanswers_path.length == 2) {
+          return
+        }
         fileName = Util.guid() + '-' + prop + '.jpg'
       } else {
-        fileName = Util.getFileName(this[prop])
+        if (!this[prop] || this[prop].includes('nopic.png')) {
+          fileName = Util.guid() + '-' + prop + '.jpg'
+        } else {
+          fileName = Util.getFileName(this[prop])
+        }
       }
       HostApp._open_a_page({
         type: 'boomerang',
@@ -382,12 +403,17 @@ export default {
         }
       })
     },
-    delfile(prop, fileName) {
-      if (fileName == Vue.nopic)
+    delfile (prop, fileName, index) {
+      if (fileName == Vue.nopic) {
         return
-      else {
-        HostApp.delfile(fileName)
-        this[prop] = Vue.nopic
+      } else {
+        if (prop == 'f_noanswers_path') {
+          this.f_noanswers_path.splice(index, 1)
+          HostApp.delfile(fileName)
+        } else {
+          HostApp.delfile(fileName)
+          this[prop] = Vue.nopic
+        }
       }
     },
     setEntryClass(val) {
@@ -459,13 +485,47 @@ export default {
         this.$set('style__', '')
         this.$set('style_view_', '')
       }
-      if (!this.f_nongasuser_path)
-        this.$set('f_nongasuser_path', '')
+      this.$set('f_noanswers_path', [])
+      if (this.f_noanswer_path) {
+        this.f_noanswers_path.push({f_noanswer_path: this.f_noanswer_path})
+      } else {
+        this.$set('f_noanswer_path', '')
+      }
+      if (this.f_noanswer1_path) {
+        this.f_noanswers_path.push({f_noanswer_path: this.f_noanswer1_path})
+      } else {
+        this.$set('f_noanswer1_path', '')
+      }
+      if (this.f_noanswer2_path) {
+        this.f_noanswers_path.push({f_noanswer_path: this.f_noanswer2_path})
+      } else {
+        this.$set('f_noanswer2_path', '')
+      }
       if (!this.f_noanswer_path)
         this.$set('f_noanswer_path', '')
       if (!this.f_rejectcheck_path)
         this.$set('f_rejectcheck_path', '')
 
+      this.$watch('f_noanswers_path.length', () => {
+        for (let i = 0; i < 2; i++) {
+          if (this.f_noanswers_path[i] && this.f_noanswers_path[i].f_noanswer_path) {
+            //tag)
+            if (i == 0) {
+              this.f_noanswer_path = this.f_noanswers_path[i].f_noanswer_path
+            } else {
+              this['f_noanswer' + i + '_path'] = this.f_noanswers_path[i].f_noanswer_path
+            }
+          } else {
+            //tag)
+            if (i == 0) {
+              this.f_noanswer_path = null
+            } else {
+              this['f_noanswer' + i + '_path'] = null
+            }
+          }
+        }
+        //tag
+      })
 
       this.$watch('f_usegas', (val) => {
         this.setUsegas(val)
@@ -480,6 +540,9 @@ export default {
         }
         if (val == '拒检') {
           this.f_noanswer_path = Vue.nopic
+          this.f_noanswer1_path = Vue.nopic
+          this.f_noanswer2_path = Vue.nopic
+          this.f_noanswers_path = []
         }
 
         if (val != '入户') {

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

@@ -287,7 +287,18 @@ overflow: -moz-scrollbars-none;
         <div class="row">
           <div class="col-md-6">
             <img-self-safe v-if="this.paperdata.f_entry_status=='到访不遇'" :src="showimg3"   width="300" height="400"></img-self-safe>
-          </div><div class="col-md-6">
+          </div>
+          <div class="col-md-6">
+            <img-self-plus v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer1_path"
+                           :src="showimg5" width="282"
+                           height="400"></img-self-plus>
+          </div>
+          <div class="col-md-6">
+            <img-self-plus v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer2_path"
+                           :src="showimg6" width="282"
+                           height="400"></img-self-plus>
+          </div>
+          <div class="col-md-6">
           <img-self-safe v-if="this.paperdata.f_entry_status=='拒检'" :src="showimg4"   width="300" height="400"></img-self-safe>
         </div>
         </div>
@@ -376,6 +387,8 @@ export default {
       showimg2:'',
       showimg3:'',
       showimg4:'',
+      showimg5: '',
+      showimg6: '',
       startClick:false, //开始安检按钮是否可点击
       isStrat: false, //是否开始安检
       checkResult:{},//查询结果
@@ -571,6 +584,8 @@ export default {
       }
       this.ajresult=JSON.parse(this.data.f_defect_content).result
       this.showimg3=this.data.f_noanswer_path
+      this.showimg5 = this.data.f_noanswer1_path
+      this.showimg6 = this.data.f_noanswer2_path
       this.showimg4=this.data.f_rejectcheck_path
       this.paperdata=this.data
       this.loading=false

package/src/filiale/yangchunboneng/pc/CheckPlanAreaList.vue

@@ -518,13 +518,13 @@
           }
         }
         if(this.f_safe_start && this.f_safe_end){
-          args.condition += `and ch.f_offsite_time >= '${this.f_safe_start}' and ch.f_offsite_time <= '${this.f_safe_end}' `
+          args.condition += `and f_offsite_time >= '${this.f_safe_start}' and f_offsite_time <= '${this.f_safe_end}' `
         } else {
           if(this.f_safe_start){
-            args.condition += ` and ch.f_offsite_time >='${this.f_safe_start}'`
+            args.condition += ` and f_offsite_time >='${this.f_safe_start}'`
           }
           if(this.f_safe_end){
-            args.condition += ` and ch.f_offsite_time <='${this.f_safe_end}'`
+            args.condition += ` and f_offsite_time <='${this.f_safe_end}'`
           }
         }
         this.$refs.paged.$refs.grid.$el.scrollTop = 0

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('dexin')
-// 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('siyang')
+// 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/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
+})