diff --git a/config/dev.env.js b/config/dev.env.js index 568bd50..28507b9 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并,最终结果是 NODE_ENV:‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://111.198.10.15:11802"' - // BASE_API: '"http://192.168.0.18:8095"' + // BASE_API: '"http://111.198.10.15:11802"' + BASE_API: '"http://192.168.0.18:8095"' // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/config/dev.env.js b/config/dev.env.js index 568bd50..28507b9 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并,最终结果是 NODE_ENV:‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://111.198.10.15:11802"' - // BASE_API: '"http://192.168.0.18:8095"' + // BASE_API: '"http://111.198.10.15:11802"' + BASE_API: '"http://192.168.0.18:8095"' // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue index fd95101..8e3bd3f 100644 --- a/src/views/dashboard/components/mapPicture.vue +++ b/src/views/dashboard/components/mapPicture.vue @@ -6,7 +6,7 @@
- 当日通行人数:{{ tab1.left.count }} + 当日进入人次:{{ tab1.left.count }} 体温正常人数:{{ tab1.left.normal }} 体温异常人数:{{ tab1.left.abnormal }}
@@ -178,7 +178,7 @@ this.tab1.right.temp = data[0].temp this.tab1.right.normal = data[0].normal this.tab1.right.abnormal = data[0].abnormal - this.tab1.left.count = data[1].count + this.tab1.left.count = parseInt(data[1].normal) + parseInt(data[1].abnormal) this.tab1.left.normal = data[1].normal this.tab1.left.abnormal = data[1].abnormal // 一层 diff --git a/config/dev.env.js b/config/dev.env.js index 568bd50..28507b9 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并,最终结果是 NODE_ENV:‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://111.198.10.15:11802"' - // BASE_API: '"http://192.168.0.18:8095"' + // BASE_API: '"http://111.198.10.15:11802"' + BASE_API: '"http://192.168.0.18:8095"' // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue index fd95101..8e3bd3f 100644 --- a/src/views/dashboard/components/mapPicture.vue +++ b/src/views/dashboard/components/mapPicture.vue @@ -6,7 +6,7 @@
- 当日通行人数:{{ tab1.left.count }} + 当日进入人次:{{ tab1.left.count }} 体温正常人数:{{ tab1.left.normal }} 体温异常人数:{{ tab1.left.abnormal }}
@@ -178,7 +178,7 @@ this.tab1.right.temp = data[0].temp this.tab1.right.normal = data[0].normal this.tab1.right.abnormal = data[0].abnormal - this.tab1.left.count = data[1].count + this.tab1.left.count = parseInt(data[1].normal) + parseInt(data[1].abnormal) this.tab1.left.normal = data[1].normal this.tab1.left.abnormal = data[1].abnormal // 一层 diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue index dd7ab9b..199ea5d 100644 --- a/src/views/memberManage/addPerson.vue +++ b/src/views/memberManage/addPerson.vue @@ -160,7 +160,7 @@ - 读取身份证 + 读取身份证 @@ -272,6 +272,7 @@ } } return { + readIDCardDisabled: false, formSize: 'large', // 如果启动了考勤功能,条目太多,size设置为small,否则为large attendanceEnable: attendanceEnable, dialogFormVisible: false, // 对话框是否显示 @@ -437,6 +438,7 @@ }) }, readIDCard() { + this.readIDCardDisabled = true var _this = this this.ws = _this.$root.ws if (this.ws === null) { @@ -448,9 +450,11 @@ this.ws.onclose = function() { _this.$message.info('与ICS连接断开') _this.$root.ws = null + _this.readIDCardDisabled = false } this.ws.onerror = function() { _this.$message.error('与ICS通信发生错误') + _this.readIDCardDisabled = false } _this.$root.ws = this.ws } else { @@ -479,6 +483,7 @@ } else { _this.$message.warning('读卡失败') } + _this.readIDCardDisabled = false } }, // readIDCard() { diff --git a/config/dev.env.js b/config/dev.env.js index 568bd50..28507b9 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,7 @@ // 将两个配置对象合并,最终结果是 NODE_ENV:‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://111.198.10.15:11802"' - // BASE_API: '"http://192.168.0.18:8095"' + // BASE_API: '"http://111.198.10.15:11802"' + BASE_API: '"http://192.168.0.18:8095"' // BASE_API: '"http://192.168.0.166:20005"' }) diff --git a/src/views/dashboard/components/mapPicture.vue b/src/views/dashboard/components/mapPicture.vue index fd95101..8e3bd3f 100644 --- a/src/views/dashboard/components/mapPicture.vue +++ b/src/views/dashboard/components/mapPicture.vue @@ -6,7 +6,7 @@
- 当日通行人数:{{ tab1.left.count }} + 当日进入人次:{{ tab1.left.count }} 体温正常人数:{{ tab1.left.normal }} 体温异常人数:{{ tab1.left.abnormal }}
@@ -178,7 +178,7 @@ this.tab1.right.temp = data[0].temp this.tab1.right.normal = data[0].normal this.tab1.right.abnormal = data[0].abnormal - this.tab1.left.count = data[1].count + this.tab1.left.count = parseInt(data[1].normal) + parseInt(data[1].abnormal) this.tab1.left.normal = data[1].normal this.tab1.left.abnormal = data[1].abnormal // 一层 diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue index dd7ab9b..199ea5d 100644 --- a/src/views/memberManage/addPerson.vue +++ b/src/views/memberManage/addPerson.vue @@ -160,7 +160,7 @@ - 读取身份证 + 读取身份证 @@ -272,6 +272,7 @@ } } return { + readIDCardDisabled: false, formSize: 'large', // 如果启动了考勤功能,条目太多,size设置为small,否则为large attendanceEnable: attendanceEnable, dialogFormVisible: false, // 对话框是否显示 @@ -437,6 +438,7 @@ }) }, readIDCard() { + this.readIDCardDisabled = true var _this = this this.ws = _this.$root.ws if (this.ws === null) { @@ -448,9 +450,11 @@ this.ws.onclose = function() { _this.$message.info('与ICS连接断开') _this.$root.ws = null + _this.readIDCardDisabled = false } this.ws.onerror = function() { _this.$message.error('与ICS通信发生错误') + _this.readIDCardDisabled = false } _this.$root.ws = this.ws } else { @@ -479,6 +483,7 @@ } else { _this.$message.warning('读卡失败') } + _this.readIDCardDisabled = false } }, // readIDCard() { diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue index 3c1c0a7..ee4bf9e 100644 --- a/src/views/memberManage/addPersonIris.vue +++ b/src/views/memberManage/addPersonIris.vue @@ -161,7 +161,7 @@ - 读取身份证 + 读取身份证 @@ -291,6 +291,7 @@ } } return { + readIDCardDisabled: false, formSize: 'large', // 如果启动了考勤功能,条目太多,size设置为small,否则为large attendanceEnable: attendanceEnable, // 读取全局变量,是否启用考勤功能配置 dialogFormVisible: false, // 对话框是否显示 @@ -477,6 +478,7 @@ }) }, readIDCard() { + this.readIDCardDisabled = true var _this = this this.ws = _this.$root.ws if (this.ws === null) { @@ -488,9 +490,11 @@ this.ws.onclose = function() { _this.$message.info('与ICS连接断开') _this.$root.ws = null + _this.readIDCardDisabled = false } this.ws.onerror = function() { _this.$message.error('与ICS通信发生错误') + _this.readIDCardDisabled = false } _this.$root.ws = this.ws } else { @@ -502,7 +506,6 @@ _this.personForm.idCardNo = data.IdCardNo _this.personForm.name = data.Name // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' } - debugger _this.personForm.sex = data.Sex var birth = data.Birthday _this.personForm.birthday = birth.substring(0, 4) + '-' + birth.substring(4, 6) + '-' + birth.substring(6, 8) @@ -521,6 +524,7 @@ } else { _this.$message.warning('读卡失败') } + _this.readIDCardDisabled = false } }, // readIDCard() {