safecheck-client 3.0.35-5 → 3.0.35-50

package/src/filiale/xilan/pc.js

@@ -4,6 +4,7 @@ import Vue from "vue";
 //手机特殊目录注册到该文件中
 let specialComp = {
   'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) }
 }
 exports.specialComp = specialComp
 

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

@@ -275,7 +275,7 @@
           <td style="text-align: center">{{model.sums.f_chaichu}}</td>
           <td style="text-align: center">{{model.sums.f_tingyong}}</td>
           <td style="text-align: center">{{model.sums.f_weitongqi}}</td>
-          <td style="text-align: center">{{model.sums.f_tingyong}}</td>
+          <td style="text-align: center">{{model.sums.f_jujian}}</td>
           <td style="text-align: center">{{model.sums.f_buyu}}</td>
           <td style="text-align: center">{{model.sums.f_buyu2}}</td>
           <td style="text-align: center">{{model.sums.f_buyu3}}</td>

package/src/filiale/zhongsheng/android/SafecheckDevices.vue

@@ -755,11 +755,11 @@ export default {
       if (Number(this.gasDeviation) < 0) {
         console.log("ww"+JSON.stringify(this.f_items[this.f_gas_aberrant_number.index].f_item_value))
         if (this.f_items[this.f_gas_aberrant_number.index].f_item_value < Number(this.gasDeviation)) {
-          this.f_items[this.f_gas_aberrant_number.index].f_is_defect = true
+          // this.f_items[this.f_gas_aberrant_number.index].f_is_defect = true
         }
       } else {
         if (Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value) > Number(this.gasDeviation)) {
-          this.f_items[this.f_gas_aberrant_number.index].f_is_defect = false
+          // this.f_items[this.f_gas_aberrant_number.index].f_is_defect = false
         }
       }
 
@@ -797,7 +797,7 @@ export default {
       //tag ===> ' + JSON.stringify(Number(this.feeDeviation)))
       // 计算差值是否在范围内
       if (Math.abs(this.f_items[this.f_fee_aberrant_number.index].f_item_value) > Number(this.feeDeviation)) {
-        this.f_items[this.f_fee_aberrant_number.index].f_is_defect = true
+        // this.f_items[this.f_fee_aberrant_number.index].f_is_defect = true
       }
 
       //tag)
@@ -825,7 +825,7 @@ export default {
       // 计算差值是否在范围内
       //tag)
       if (Math.abs(this.f_items[this.f_meter_aberrant_number1.index].f_item_value) > Number(this.meterbase)) {
-        this.f_items[this.f_meter_aberrant_number1.index].f_is_defect = true
+        // this.f_items[this.f_meter_aberrant_number1.index].f_is_defect = true
       }
 
       //tag)

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

@@ -108,6 +108,9 @@
               <label for="f_checker_name">安检员</label>
               <input type="checkbox" id="f_user_number" value="f_user_number" v-model="$parent.$parent.nameForSql"/>
               <label for="f_checker_name">档案数量</label>
+              <label style="float: right">计划用户数:{{$parent.$parent.plan_num}}</label>
+              <label style="float: right">已检数:{{$parent.$parent.yes_safe_num}}</label>
+              <label style="float: right">未检数:{{$parent.$parent.no_safe_num}}</label>
             </div>
           </div>
         </div>
@@ -198,6 +201,9 @@ export default {
       listflag:false,
       nameflag:false,
       criteriaShow: false,
+      plan_num:0,
+      yes_safe_num:0,
+      no_safe_num:0,
       f_check_start:'',
       f_check_end:'',
       planName:[{label: '全部', value: ''}],
@@ -307,13 +313,17 @@ export default {
       if (!this.f_orgid) {
         this.getorg([this.$login.f.orgid])
       }
+      let condition = '1=1'
       if (this.f_orgid) {
         args.condition = `f_filialeid  in ${this.f_orgid} and ${args.condition}`
+        condition += ` and tcpi.f_filialeid  in ${this.f_orgid}`
       }
       if(this.f_check_start){
+        condition += ` and f_plan_year>=${new Date(this.f_check_start).getFullYear()} and f_plan_month>=${new Date(this.f_check_start).getMonth()+1} `
         args.condition += ` and f_year>=${new Date(this.f_check_start).getFullYear()} and f_month>=${new Date(this.f_check_start).getMonth()+1} `
       }
       if(this.f_check_end){
+        condition += ` and f_plan_year<=${new Date(this.f_check_end).getFullYear()} and f_plan_month<=${new Date(this.f_check_end).getMonth()+1} `
         args.condition += ` and f_year<=${new Date(this.f_check_end).getFullYear()} and f_month<=${new Date(this.f_check_end).getMonth()+1} `
       }
       this.$refs.paged.$refs.grid.$el.scrollTop = 0
@@ -322,10 +332,32 @@ export default {
         this.$showMessage("请至少选择一项进行汇总")
         return
       }
+      if (args.model.f_residential_area){
+        condition += ` and tcpi.f_residential_area like '%${args.model.f_residential_area}%'`
+      }
+      if (args.model.f_plan_name){
+        condition += ` and tcp.id = '${args.model.f_plan_name}'`
+      }
       this.model.paramSource = {groupName: `'${this.groupNameForSql}'`}
       this.model.search(args.condition, args.model)
+      this.initNum(condition)
+    },
+    initNum(condition){
+      new HttpResetClass().load('POST', `rs/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: "count(0) as num,sum(case when f_state = '已检' then 1 else 0 end) as yj,sum(case when f_state = '未检' then 1 else 0 end) as wj",
+          tablename: "t_check_plan_item tcpi left join t_check_plan tcp on tcpi.f_plan_id = tcp.id",
+          condition: `${condition}`,
+          orderitem: "1"
+        }
+      }, {resolveMsg: null, rejectMsg: null}).then(response=>{
+        this.plan_num = response.data[0].num || 0
+        this.yes_safe_num = response.data[0].yj || 0
+        this.no_safe_num = response.data[0].wj || 0
+      }).catch(error=>{
+        debugger
+      })
     },
-
     // 拼接groupName1
     getGroupName1 () {
       var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']

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/safecheck-android.js

@@ -294,6 +294,7 @@ export default function (filiale) {
   Vue.component('safecheck-devices-temp', (resolve) => { require(['./components/android/SafecheckDevicesTemp'], resolve) })
   Vue.component('paper-feedback-temp', (resolve) => { require(['./components/android/PaperFeedbackTemp'], resolve) })
   Vue.component('online-repair-safe', (resolve) => {require(['./components/android/OnlineRepairSafe'], resolve)})
+  Vue.component('phone-other-info-v3', (resolve) => {require(['./components/android/PhoneotherInfov3'], resolve)})
   Vue.component('phone-other-info', (resolve) => {require(['./components/android/PhoneotherInfo'], resolve)})
   //特殊目录给这里加
   if (filiale) {

package/src/safecheck.js

@@ -294,6 +294,15 @@ export default function (filiale) {
   Vue.component('safecheck-file-upload', (resolve) => {
     require(['./components/Util/SafecheckUpload'], resolve)
   })
+  Vue.component('security-check-ledger', (resolve) => {
+    require(['./components/pc/SecurityCheckManage'], resolve)
+  })
+  Vue.component('security-check-ledger2', (resolve) => {
+    require(['./components/pc/SecurityCheckList'], resolve)
+  })
+  Vue.component('security-check-ledger1', (resolve) => {
+    require(['./components/pc/SecurityCheckLedger'], resolve)
+  })
   //附件上传2
   Vue.component('file-uploader', (resolve) => {
     require(['./components/FileUpload'], resolve)
@@ -887,6 +896,9 @@ export default function (filiale) {
   Vue.component('print-table-safe', (resolve) => {
     require(['./components/pc/PrintTable'], resolve)
   })
+  Vue.component('add-plan-item-yy-change', (resolve) => {
+    require(['./components/pc/AddPlanItemYyChange'], resolve)
+  })
 
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/pc`).specialComp

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