safecheck-client 3.0.34-45 → 3.0.34-47

package/src/filiale/weinan/pc/checkUserList.vue

@@ -120,51 +120,6 @@
                     <input type="text" class="input_search" v-model="model.f_unit"
                            style="width: 60%" placeholder="请选择" condition="ua.f_unit='{}'">
                   </div>
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">开户起始:</label>-->
-<!--                    <datepicker-->
-<!--                      placeholder='请选择'-->
-<!--                      style="width:60%"-->
-<!--                      :disabled-days-of-week="[]"-->
-<!--                      :format="'yyyy-MM-dd'"-->
-<!--                      :show-rest-button="reset"-->
-<!--                      :value.sync="model.f_startfile_time"-->
-<!--                      v-model="model.f_startfile_time"-->
-<!--                      condition="ui.f_createfile_date >= '{} 00:00:00'">-->
-<!--                    </datepicker>-->
-<!--                  </div>-->
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">开户截止:</label>-->
-<!--                    <datepicker-->
-<!--                      placeholder='请选择'-->
-<!--                      :disabled-days-of-week="[]"-->
-<!--                      style="width:60%"-->
-<!--                      :format="'yyyy-MM-dd'"-->
-<!--                      :show-rest-button="reset"-->
-<!--                      :value.sync="model.f_endfile_time"-->
-<!--                      v-model="model.f_endfile_time"-->
-<!--                      condition="ui.f_createfile_date <= '{} 00:00:00'">-->
-<!--                    </datepicker>-->
-<!--                  </div>-->
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">表&ensp;箱&ensp;号:</label>-->
-<!--                    <input type="text" class="input_search" v-model="model.f_metertitles"-->
-<!--                           style="width: 60%" placeholder="请选择" condition="uf.f_metertitles='{}'">-->
-<!--                  </div>-->
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">抄&ensp;表&ensp;册:</label>-->
-<!--                    <v-select-->
-<!--                      class="select select_list"-->
-<!--                      :value.sync="model.f_meter_book_num"-->
-<!--                      v-model="model.f_meter_book_num"-->
-<!--                      :options='$parent.$parent.cbc'-->
-<!--                      placeholder='请选择'-->
-<!--                      condition="uf.f_meter_book_num='{}'"-->
-<!--                      close-on-select-->
-<!--                      value-single-->
-<!--                    >-->
-<!--                    </v-select>-->
-<!--                  </div>-->
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">派发情况:</label>
                     <v-select
@@ -194,21 +149,6 @@
                     >
                     </v-select>
                   </div>
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">安检情况:</label>-->
-<!--                    <v-select-->
-<!--                      class="select select_list"-->
-<!--                      :value.sync="model.checkState"-->
-<!--                      v-model="model.checkState"-->
-<!--                      :options='$parent.$parent.checkStateList'-->
-<!--                      placeholder='请选择'-->
-<!--                      condition="{}"-->
-<!--                      :search="false"-->
-<!--                      close-on-select-->
-<!--                      value-single-->
-<!--                    >-->
-<!--                    </v-select>-->
-<!--                  </div>-->
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">安检片区:</label>
                     <v-select
@@ -223,31 +163,16 @@
                     >
                     </v-select>
                   </div>
-                  <!--<div class="form-group col-sm-4" >
-                    <label class="font_normal_body">入户情况:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.f_hasHousehold"
-                      v-model="model.f_hasHousehold"
-                      :options='$parent.$parent.hasHousehold'
-                      placeholder='请选择'
-                      close-on-select
-                      :search="false"
-                      value-single
-                    >
-                    </v-select>
-                  </div>-->
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">安检起始:</label>
                     <datepicker
                       placeholder='请选择'
                       style="width:60%;text-align: center"
                       :disabled-days-of-week="[]"
-                      :format="'yyyy-MM-dd'"
+                      :format="'yyyy-MM-dd 00:00:00'"
                       :show-rest-button="reset"
                       :value.sync="model.f_check_start"
-                      v-model="model.f_check_start"
-                      condition="ui.f_last_check_date >='{} 00:00:00'">
+                      v-model="model.f_check_start">
                     </datepicker>
                   </div>
                   <div class="form-group col-sm-4" >
@@ -256,11 +181,10 @@
                       placeholder='请选择'
                       :disabled-days-of-week="[]"
                       style="width:60%;text-align: center"
-                      :format="'yyyy-MM-dd'"
+                      :format="'yyyy-MM-dd 23:59:59'"
                       :show-rest-button="reset"
                       :value.sync="model.f_check_end"
-                      v-model="model.f_check_end"
-                      condition="ui.f_last_check_date  <='{} 00:00:00'">
+                      v-model="model.f_check_end">
                     </datepicker>
                   </div>
 
@@ -339,18 +263,20 @@
   import Vue from "vue";
 
     export default {
-        name: "PlanManage",
+        name: "checkUserList",
         title: '计划管理',
         data() {
+          let model = new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 20, {
+            "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
+            "f_usertype": "''",
+            "month": "''",
+            "SafeCheckSX": 'this.SafeCheckSX',
+            "SafeCheckCQ": "''",
+            "startday":"''",
+            "endday":"''"})
+          model.SafeCheckSX = '1 = 1'
           return {
-            model:new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
-              "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
-              "f_usertype": "''",
-              "month": "''",
-              "SafeCheckSX": {"f_check_start": '', "f_check_end": ''},
-              "SafeCheckCQ": "''",
-              "startday":"''",
-              "endday":"''"}),
+            model: model,
             a:'1',
             opt:[{label:"测试",value:"测试"}],
             showCondtion:false,
@@ -361,7 +287,6 @@
             meter_gasbrand:[],//气表品牌
             hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
             yearCheckList:[{label:"全部",value:""},{label:"已在计划中",value:"ua.f_plan_id is not null"},{label:"未在计划中",value:"ua.f_plan_id is null"}],
-            checkStateList:[{label:"全部",value:""},{label:"两年内已检",value:"DATEDIFF(day,isnull(ui.f_last_check_date,'2010-01-01'),GETDATE())<=730"},{label:"两年内未检",value:"DATEDIFF(day,isnull(ui.f_last_check_date,'2010-01-01'),GETDATE())>730"},{label:"从未安检",value:"从未安检"}],
             hasResidentialArea:[{label:"全部",value:""},{label:"有名称",value:"有名称"},{label:"无名称",value:"无名称"}],
             sliceArea:[],
             meterbooks:[],
@@ -462,38 +387,33 @@
             this.excelUserCondtion=true
           },
           selfSearch (args) {
-            //tag)
-           let condition1="(ui.f_last_check_date is null or ui.f_last_check_date ='')"
-           let arge = args.condition.replace('从未安检',condition1)
-            args.condition = arge
-            args.condition += ` and ui.f_filialeid='${this.userlogin.orgid}'`
-            if (!Util.isEmpty(args.model.f_last_check_state)){
-              if (args.model.f_last_check_state == '未检'){
-                args.condition +=" and (ui.f_last_check_state is null or ui.f_last_check_state ='')"
-              }else  {
-                args.condition += `and ui.f_last_check_state = '${args.model.f_last_check_state}'`
+            if(args.model.f_last_check_state) {
+              if (Util.isEmpty(args.model.f_check_start) || Util.isEmpty(args.model.f_check_end)) {
+                this.$showMessage("选择安检状态时，需要选择安检时间区间！")
+                return
+              }
+              this.model.SafeCheckSX = ` f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
+              if (args.model.f_last_check_state == '未检') {
+                args.condition += ' and  tcp.ruhu is null '
+              } else if (args.model.f_last_check_state == '入户') {
+                args.condition += ` and tcp.ruhu > 0`
+              } else if (args.model.f_last_check_state == '拒检') {
+                args.condition += ` and tcp.jujian > 0 and tcp.ruhu = 0 and tcp.daofang = 0 `
+              } else if (args.model.f_last_check_state == '到访不遇') {
+                args.condition += ` and tcp.daofang > 0 and tcp.ruhu = 0 and tcp.jujian = 0 `
               }
+            }else{
+              //无条件
+              this.model.SafeCheckSX = ` 1 != 1 `
             }
-            //(ua.f_residential_area is not null or ua.f_residential_area !='')
-            // (ua.f_residential_area is null or ua.f_residential_area ='')
+            args.condition += ` and ui.f_filialeid='${this.userlogin.orgid}'`
             if (args.model.f_residential_area == "无名称"){
               args.condition +=" and (ua.f_residential_area is null or ua.f_residential_area ='')"
             }else if (args.model.f_residential_area == "有名称"){
               args.condition +=" and (ua.f_residential_area is not null and ua.f_residential_area !='')"
             }
             console.log('查询条件',args)
-            /*if(args.model.f_hasHousehold=='已入户'){
-              args.condition +=` and Extract(year from TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'))=2021 and ua.F_LAST_CHECK_STATE='入户'`
-            }else if(args.model.f_hasHousehold=='未入户'){
-              args.condition +=` and (Extract(year from nvl(TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'),'1990-01-01 00:00:00'))!=2021 or nvl(ua.F_LAST_CHECK_STATE,'未入户')!='入户')`
-            }*/
             if(args.model.checkBook){
-             /* let arr=args.model.checkBook.split('-')
-              if(arr[1] == '用户'){
-                args.condition +=` and ua.f_check_book_id=${arr[0]}`
-              }else{
-                args.condition +=` and area.f_check_book_id=${arr[0]} and ua.f_check_book_id is null`
-              }*/
               let uas = []
               let areas = []
               for (let item of args.model.checkBook) {
@@ -680,6 +600,7 @@
                       f_filialeid:this.userlogin.orgid,
                       f_subscribe_date:'',
                       condition:this.model.condition,
+                      SafeCheckSX: this.model.SafeCheckSX,
                       switchCheckAll:true,
                       checkAll:this.checkAll,
                       param:this.checkes,

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

package/test/unit/.eslintrc

@@ -1,5 +1,5 @@
-{
-  "env": {
-    "jasmine": true
-  }
-}
+{
+  "env": {
+    "jasmine": true
+  }
+}