diff --git a/src/assets/i18n/langs/cn/laborManage/personManage.js b/src/assets/i18n/langs/cn/laborManage/personManage.js index 3a4dc722..55eed75f 100644 --- a/src/assets/i18n/langs/cn/laborManage/personManage.js +++ b/src/assets/i18n/langs/cn/laborManage/personManage.js @@ -72,7 +72,7 @@ export default { IdCardHead: '身份证头像', spotFaceCollection: '现场采集人脸', // '现场采集人脸要求:人脸正面免冠照,jpeg或jpg格式,图片像素需为640x480像素或以上,图片大小需不超过500KB,人脸眼间距需大于60像素点' - imgHint: '现场采集人脸要求:人脸正面免冠照,jpg格式,图片像素需为640x480像素或以上,图片大小需为10-200KB,人脸大小占整张图片1/3以上', + imgHint: '现场采集人脸要求:人脸正面免冠照,图片格式为jpg格式、大小为10~200KB,人脸大小占整张图片1/3以上', cancel: '取消', confirm: '确定', noData: '暂无数据', diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 5baadfa2..b952b489 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -172,7 +172,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工) // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 + axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 @@ -185,8 +185,8 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) - axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 - // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 + // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 + // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; } else if (process.env.NODE_ENV == "production") { diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index 83c0dd37..f9664de7 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -4,37 +4,18 @@
- - + + - - + +
@@ -69,15 +50,8 @@ />
--> - + {{ data.enterpriseName }}
- {{ $t("message.laborMange.newDepartment") }} -
-
+ {{ $t("message.laborMange.newDepartment") }} +
+
{{ $t("message.laborMange.allDepartments") }}
-
- ({{ teamListData.totalWorkerNum }}) -
+
({{ teamListData.totalWorkerNum }})
-
- +
+ {{ item.departmentName }}
{{ item.departmentName }}
@@ -195,33 +140,19 @@
-
- +
+ {{ $t("message.laborMange.edit") }}
-
- +
+ {{ $t("message.laborMange.delete") }}
@@ -230,196 +161,94 @@
- + position: absolute; + right: 10px; + top: 35%; + font-size: 26px; + cursor: pointer; + color: #999; + ">
- + style="font-size: 26px; cursor: pointer; color: #999">
- {{ $t("message.laborMange.personnelEntry") }} + {{ + $t("message.laborMange.personnelEntry") }} - {{ - $t("message.laborMange.export") + - $t("message.laborMange.template") - }} - {{ + $t("message.laborMange.export") + $t("message.laborMange.template") +}} + + :auto-upload="true"> - {{ $t("message.laborMange.bulkImport") }} + {{ $t("message.laborMange.bulkImport") }} - 导入照片 - 下发通行设备 + 导入照片 + 下发通行设备 - + - - - - + + + + - + - - - - - + + + + + - + - + - + - {{ $t("message.laborMange.inquire") }} + {{ $t("message.laborMange.inquire") }} - {{ scope.row.workerName }} - {{ parseCode(scope.row.codeState)[1] }} + {{ scope.row.workerName + }} + {{ parseCode(scope.row.codeState)[1] }}
{{ scope.row.sex == 1 - ? $t("message.laborMange.man") - : $t("message.laborMange.female") + ? $t("message.laborMange.man") + : $t("message.laborMange.female") }} - {{ scope.row.age - }}{{ $t("message.laborMange.age") }} + {{ scope.row.age }}{{ $t("message.laborMange.age") }} {{ scope.row.nation }}
@@ -528,8 +318,8 @@ {{ $t("message.laborMange.workingState") }}: {{ scope.row.inserviceType == 1 - ? $t("message.laborMange.onJob") - : $t("message.laborMange.dimission") + ? $t("message.laborMange.onJob") + : $t("message.laborMange.dimission") }}
@@ -539,28 +329,25 @@