admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-30 13:57:28 +08:00
parent 424b7f9ef7
commit a82cb72bde
23 changed files with 253 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/doc/h5Entry/index.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>人员录入</title><link href=/doc/h5Entry/static/css/app.53e39f85ed3ad24a05f3fb9833820ad1.css rel=stylesheet></head><body><div id=app></div><script>var host = window.location.origin;
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>人员录入</title><link href=/doc/h5Entry/static/css/app.2d1aaa4a3a6d5051bbfd80b203f3980a.css rel=stylesheet></head><body><div id=app></div><script>var host = window.location.origin;
var rootURL = host + "/";
// var rootURL = "http://192.168.34.221:28888/";
// var rootURL = "http://192.168.34.221:9111/"; //本地
@ -13,7 +13,8 @@
// rootURL = "http://183.95.84.34:8081/"; //恩施
// rootURL = "http://192.168.34.125:6023/" //本地
rootURL = "http://192.168.34.221:9111/" //本地
// rootURL = "http://42.180.188.17:9809" // 正式
// rootURL = "http://192.168.34.155:19111/" //本地
// locationURL=rootURL+'doc/h5Entry/index.html?userId=4&projectSn=a2ef0238b59146aa814b93f47710dbf2#/'
locationURL=rootURL+'doc/h5Entry/index.html?userId=1779721457571291137&projectSn=BD3137498CB84BF0969979E0342CDBCA&educationId=1666278624304615426#/'
}</script><script type=text/javascript src=/doc/h5Entry/static/js/manifest.5b02f1a95ccf10320e1c.js></script><script type=text/javascript src=/doc/h5Entry/static/js/vendor.08fb8d13d88c906352f9.js></script><script type=text/javascript src=/doc/h5Entry/static/js/app.b254623430b00511f0d5.js></script></body></html>
}</script><script type=text/javascript src=/doc/h5Entry/static/js/manifest.123956a86b7951cf4ba0.js></script><script type=text/javascript src=/doc/h5Entry/static/js/vendor.08fb8d13d88c906352f9.js></script><script type=text/javascript src=/doc/h5Entry/static/js/app.b254623430b00511f0d5.js></script></body></html>

2
public/doc/h5Entry/static/css/app.2d1aaa4a3a6d5051bbfd80b203f3980a.css Normal file
View File

File diff suppressed because one or more lines are too long

1
public/doc/h5Entry/static/css/app.2d1aaa4a3a6d5051bbfd80b203f3980a.css.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/css/app.3521b4af79ffd69eae4e3d131be9fb17.css Normal file
View File

File diff suppressed because one or more lines are too long

1
public/doc/h5Entry/static/css/app.3521b4af79ffd69eae4e3d131be9fb17.css.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/css/app.6e5d4d4dab65aebba84375a6b47b2e5b.css Normal file
View File

File diff suppressed because one or more lines are too long

1
public/doc/h5Entry/static/css/app.6e5d4d4dab65aebba84375a6b47b2e5b.css.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/js/3.113a4e1ea2c45e038999.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/doc/h5Entry/static/js/3.113a4e1ea2c45e038999.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/js/3.57446ff5738e0520a987.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/doc/h5Entry/static/js/3.57446ff5738e0520a987.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/js/3.a707ad46b51e79db8932.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/doc/h5Entry/static/js/3.a707ad46b51e79db8932.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/js/manifest.123956a86b7951cf4ba0.js Normal file
View File

@ -0,0 +1,2 @@
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,s=0,l=[];s<r.length;s++)i=r[s],t[i]&&l.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)u=o(o.s=a[s]);return u};var r={},t={8:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"fbf64467c6abbbc1eb98",1:"75a3aa4283927f4b1b27",2:"b40a0ecff2f58dd786e6",3:"57446ff5738e0520a987",4:"c52430ef4f6e74b5b49a",5:"ef7329314c5270b36976"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/doc/h5Entry/",o.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.123956a86b7951cf4ba0.js.map

1
public/doc/h5Entry/static/js/manifest.123956a86b7951cf4ba0.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/js/manifest.29eec5e44310cecd3b5c.js Normal file
View File

@ -0,0 +1,2 @@
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={8:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"fbf64467c6abbbc1eb98",1:"75a3aa4283927f4b1b27",2:"b40a0ecff2f58dd786e6",3:"113a4e1ea2c45e038999",4:"c52430ef4f6e74b5b49a",5:"ef7329314c5270b36976"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/doc/h5Entry/",o.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.29eec5e44310cecd3b5c.js.map

1
public/doc/h5Entry/static/js/manifest.29eec5e44310cecd3b5c.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/js/manifest.89684d187a4527f879dc.js Normal file
View File

@ -0,0 +1,2 @@
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(n&&n(r,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=o(o.s=c[s]);return f};var r={},t={8:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"fbf64467c6abbbc1eb98",1:"75a3aa4283927f4b1b27",2:"b40a0ecff2f58dd786e6",3:"a707ad46b51e79db8932",4:"c52430ef4f6e74b5b49a",5:"ef7329314c5270b36976"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/doc/h5Entry/",o.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.89684d187a4527f879dc.js.map

1
public/doc/h5Entry/static/js/manifest.89684d187a4527f879dc.js.map Normal file
View File

File diff suppressed because one or more lines are too long

24
src/views/projectFront/carManage/carManage.vue
View File

@ -112,11 +112,7 @@
align="center"
></el-table-column> -->
<!-- width="100" -->
<el-table-column
prop="carTypeName"
label="车种类型"
align="center"
>
<el-table-column prop="carTypeName" label="车种类型" align="center">
</el-table-column>
<!-- width="80" -->
<el-table-column
@ -493,10 +489,7 @@
</el-select>
</el-form-item>
<!-- 固定/长期车辆 -->
<el-form-item
label="车辆类型"
prop="carModuleType"
>
<el-form-item label="车辆类型" prop="carModuleType">
<!-- <el-radio-group v-model="addEditForm.carModuleType" @change="changeForm()"> -->
<el-radio-group v-model="addEditForm.carModuleType">
<el-radio :label="1">固定车辆</el-radio>
@ -863,7 +856,7 @@
></el-table-column>
<el-table-column prop="isSuccess" label="执行结果" align="center">
<template v-slot="{ row }">{{
row.isSuccess === 1 ? "成功" : row.isSuccess === 0?"失败":""
row.isSuccess === 1 ? "成功" : row.isSuccess === 0 ? "失败" : ""
}}</template>
</el-table-column>
@ -1464,7 +1457,7 @@ export default {
],
addEditForm: {
// uDevId: [],
isBlack: 0
isBlack: 0,
},
pagInfo: {
pageNo: 1, //页数
@ -1571,6 +1564,11 @@ export default {
this.issuePointList = res.result;
},
async retryEvent(id) {
this.$notify({
title: "正在重试...",
type: "success",
duration: 1500,
});
const res = await xmglXzHikvisionSyncRetryAPI({
id: id,
});
@ -1918,7 +1916,7 @@ export default {
carNumber: this.carNumber,
isBlack: this.isBlack,
sendSuccessStatus: this.tableParameter.sendSuccessStatus,
carModuleType: this.tableParameter.carModuleType
carModuleType: this.tableParameter.carModuleType,
}).then((result) => {
if (result.success) {
this.List = result.result.records;
@ -1932,7 +1930,7 @@ export default {
},
close() {
this.addEditForm = {
isBlack: 0
isBlack: 0,
};
this.fileList = [];
this.fileList2 = [];

183
src/views/projectFront/laborManage/personModule/administration.vue
View File

@ -80,7 +80,7 @@
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ data.enterpriseName }}</span>
<!-- <div class="flex2" v-if="checkedId == data.id">
<!-- <div class="flex2" v-if="checkedId == data.id">
<img
v-permission="{key: 'rygl_editCompany', menuPath: '/project/labor/personManage'}"
src="@/assets/images/icon-edit.png"
@ -145,7 +145,10 @@
<div class="team_list whiteBlock flex2">
<!-- 新增部门 -->
<el-button
v-permission="{key: 'rygl_addDepartment', menuPath: '/project/labor/personManage'}"
v-permission="{
key: 'rygl_addDepartment',
menuPath: '/project/labor/personManage',
}"
type="primary"
plain
icon="el-icon-plus"
@ -193,7 +196,10 @@
<div style="margin: 0; text-align: center">
<!-- 编辑部门 -->
<div
v-permission="{key: 'rygl_editDepartment', menuPath: '/project/labor/personManage'}"
v-permission="{
key: 'rygl_editDepartment',
menuPath: '/project/labor/personManage',
}"
style="cursor: pointer; margin-bottom: 5px"
@click="editTeamInfo(item)"
>
@ -204,7 +210,14 @@
<span>{{ $t("message.laborMange.edit") }}</span>
</div>
<!-- 删除部门 -->
<div v-permission="{key: 'rygl_deleteDepartment', menuPath: '/project/labor/personManage'}" style="cursor: pointer" @click="deleteTeamInfo(item)">
<div
v-permission="{
key: 'rygl_deleteDepartment',
menuPath: '/project/labor/personManage',
}"
style="cursor: pointer"
@click="deleteTeamInfo(item)"
>
<img
src="@/assets/images/icon-delete.png"
style="margin-right: 5px"
@ -221,7 +234,14 @@
class="el-icon-arrow-up"
@click="showTeamList = true"
v-if="showTeamList && teamListData.totalTeamNum > 0"
style="position: absolute;right: 10px;top: 35%;font-size: 26px; cursor: pointer; color: #999"
style="
position: absolute;
right: 10px;
top: 35%;
font-size: 26px;
cursor: pointer;
color: #999;
"
></i>
</div>
<i
@ -235,7 +255,10 @@
<div class="search_wrap" :class="{ flex: COMPANY != 'nanchang' }">
<!-- 人员导入 -->
<el-button
v-permission="{key: 'rygl_inputPerson', menuPath: '/project/labor/personManage'}"
v-permission="{
key: 'rygl_inputPerson',
menuPath: '/project/labor/personManage',
}"
type="primary"
size="medium"
@click="personnelEntry"
@ -243,9 +266,19 @@
>{{ $t("message.laborMange.personnelEntry") }}</el-button
>
<!-- 导出模板 -->
<el-button v-permission="{key: 'rygl_exportTemplate', menuPath: '/project/labor/personManage'}" type="primary" size="medium" @click="exportM">{{
$t("message.laborMange.export") + $t("message.laborMange.template")
}}</el-button>
<el-button
v-permission="{
key: 'rygl_exportTemplate',
menuPath: '/project/labor/personManage',
}"
type="primary"
size="medium"
@click="exportM"
>{{
$t("message.laborMange.export") +
$t("message.laborMange.template")
}}</el-button
>
<el-upload
style="display: inline-block; margin-left: 5px"
class="upload-demo"
@ -264,13 +297,22 @@
:auto-upload="true"
>
<!-- 批量导入 -->
<el-button v-permission="{key: 'rygl_input_pl', menuPath: '/project/labor/personManage'}" size="medium" type="primary">{{
$t("message.laborMange.bulkImport")
}}</el-button>
<el-button
v-permission="{
key: 'rygl_input_pl',
menuPath: '/project/labor/personManage',
}"
size="medium"
type="primary"
>{{ $t("message.laborMange.bulkImport") }}</el-button
>
</el-upload>
<!-- 导入图片 -->
<el-button
v-permission="{key: 'rygl_ImportPhotos', menuPath: '/project/labor/personManage'}"
v-permission="{
key: 'rygl_ImportPhotos',
menuPath: '/project/labor/personManage',
}"
size="medium"
@click="importImgOpen()"
type="primary"
@ -278,11 +320,14 @@
>导入照片</el-button
>
<el-button
v-permission="{key: 'rygl_distributeAccessEquipment', menuPath: '/project/labor/personManage'}"
v-permission="{
key: 'rygl_distributeAccessEquipment',
menuPath: '/project/labor/personManage',
}"
size="medium"
@click="passEquipment()"
type="primary"
style="margin-left: 5px;margin-right:10px"
style="margin-left: 5px; margin-right: 10px"
>下发通行设备</el-button
>
<!-- <br /> -->
@ -364,16 +409,37 @@
</el-form-item>
<el-form-item>
<!-- 查询 -->
<el-button v-permission="{key: 'rygl_query', menuPath: '/project/labor/personManage'}" type="primary" @click="inquireBtn" plain>{{
$t("message.laborMange.inquire")
}}</el-button>
<el-button
v-permission="{
key: 'rygl_query',
menuPath: '/project/labor/personManage',
}"
type="primary"
@click="inquireBtn"
plain
>{{ $t("message.laborMange.inquire") }}</el-button
>
<!-- 刷新 -->
<el-button v-permission="{key: 'rygl_refresh', menuPath: '/project/labor/personManage'}" type="warning" @click="refreshBtn" plain>{{
$t("message.laborMange.refresh")
}}</el-button>
<el-button title="按班组导出" v-permission="{key: 'rygl_drive', menuPath: '/project/labor/personManage'}" type="primary" @click="exportFn">{{
$t("message.laborMange.export")
}}</el-button>
<el-button
v-permission="{
key: 'rygl_refresh',
menuPath: '/project/labor/personManage',
}"
type="warning"
@click="refreshBtn"
plain
>{{ $t("message.laborMange.refresh") }}</el-button
>
<el-button
title="按班组导出"
v-permission="{
key: 'rygl_drive',
menuPath: '/project/labor/personManage',
}"
type="primary"
@click="exportFn"
>{{ $t("message.laborMange.export") }}</el-button
>
<el-button
type="primary"
:disabled="checkedWorker.length == 0"
@ -507,7 +573,10 @@
<template slot-scope="scope">
<div class="tableBtns">
<el-button
v-permission="{key: 'rygl_Check_Distribution', menuPath: '/project/labor/personManage'}"
v-permission="{
key: 'rygl_Check_Distribution',
menuPath: '/project/labor/personManage',
}"
size="medium"
type="text"
class="operationText"
@ -516,7 +585,10 @@
>
<!-- 人员退场 -->
<el-button
v-permission="{key: 'rygl_exit', menuPath: '/project/labor/personManage'}"
v-permission="{
key: 'rygl_exit',
menuPath: '/project/labor/personManage',
}"
class="operationText"
type="text"
size="medium"
@ -544,7 +616,10 @@
<!-- 人员删除 -->
<div
v-permission="{key: 'rygl_delete', menuPath: '/project/labor/personManage'}"
v-permission="{
key: 'rygl_delete',
menuPath: '/project/labor/personManage',
}"
class="operationText"
@click="removeWorkerInfo(scope.row)"
>
@ -601,7 +676,10 @@
<div class="flex table_wrap_bottom">
<div>
<el-checkbox
v-permission="{key: 'rygl_lot_move_exit', menuPath: '/project/labor/personManage'}"
v-permission="{
key: 'rygl_lot_move_exit',
menuPath: '/project/labor/personManage',
}"
:indeterminate="isIndeterminate"
v-model="checkAll"
@change="handleCheckAllChange"
@ -626,7 +704,7 @@
<div>
<el-pagination
class="pagerBox"
style="margin-top: 0;margin-right: 600px;"
style="margin-top: 0; margin-right: 600px"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="page"
@ -687,9 +765,7 @@
照片命名规则为姓名_证件号码jpg，需露出眉毛和眼睛；单张照片文件大小10
KB~200 KB。
</div>
<div class="upload-tip-sub">
选择文件后将自动上传并进行数据校验
</div>
<div class="upload-tip-sub">选择文件后将自动上传并进行数据校验</div>
<div class="dialog-footer">
<el-button
class="cancleBtn"
@ -781,7 +857,7 @@
<img
v-if="
personForm.idCardUpPhotoUrl &&
titleType != 'detail'
titleType != 'detail'
"
src="@/assets/images/shut_icon.png"
width="15px"
@ -833,7 +909,7 @@
<img
v-if="
personForm.idCardDownPhotoUrl &&
titleType != 'detail'
titleType != 'detail'
"
src="@/assets/images/shut_icon.png"
width="15px"
@ -921,7 +997,7 @@
v-model="personForm.personMail"
:placeholder="
titleType != 'detail' &&
$t('message.laborMange.placeholder2')
$t('message.laborMange.placeholder2')
"
:disabled="titleType == 'detail'"
></el-input>
@ -958,7 +1034,7 @@
style="width: 100%"
v-if="
titleType != 'detail' ||
(personForm.politicsStatus && titleType == 'detail')
(personForm.politicsStatus && titleType == 'detail')
"
:disabled="titleType == 'detail'"
>
@ -996,7 +1072,7 @@
:disabled="titleType == 'detail'"
v-if="
titleType != 'detail' ||
(personForm.marry && titleType == 'detail')
(personForm.marry && titleType == 'detail')
"
>
<el-option
@ -1032,7 +1108,7 @@
:disabled="titleType == 'detail'"
v-if="
titleType != 'detail' ||
(personForm.birthday && titleType == 'detail')
(personForm.birthday && titleType == 'detail')
"
></el-date-picker>
<el-input v-else :disabled="true"></el-input>
@ -1072,7 +1148,7 @@
:disabled="titleType == 'detail'"
v-if="
titleType != 'detail' ||
(personForm.educational && titleType == 'detail')
(personForm.educational && titleType == 'detail')
"
>
<el-option
@ -1126,7 +1202,7 @@
v-model="personForm.nativePlace"
:placeholder="
titleType != 'detail' &&
$t('message.laborMange.placeholder2')
$t('message.laborMange.placeholder2')
"
:disabled="titleType == 'detail'"
></el-input>
@ -1142,7 +1218,7 @@
:disabled="titleType == 'detail'"
:placeholder="
titleType != 'detail' &&
$t('message.laborMange.pleaseAuthority')
$t('message.laborMange.pleaseAuthority')
"
></el-input>
</el-form-item>
@ -1380,7 +1456,7 @@
<img
v-if="
personForm.idCardBigPhotoUrl &&
titleType != 'detail'
titleType != 'detail'
"
src="@/assets/images/shut_icon.png"
width="15px"
@ -1391,7 +1467,7 @@
</div>
<div style="margin: 4px 0">
<!-- <span style="color: #f76c6c">*</span> -->
<div style="width: 100px;text-align: center;">
<div style="width: 100px; text-align: center">
{{ $t("message.laborMange.IdCardHead") }}
</div>
</div>
@ -1443,7 +1519,7 @@
<img
v-if="
personForm.fieldAcquisitionUrl &&
titleType != 'detail'
titleType != 'detail'
"
src="@/assets/images/shut_icon.png"
width="15px"
@ -1602,7 +1678,7 @@
<el-row
:gutter="24"
v-if="typeRadio == 1"
style="padding: 0px 12px;"
style="padding: 0px 12px"
>
<el-form-item
:label="$t('message.laborMange.faceDevice')"
@ -1633,7 +1709,7 @@
<el-row
:gutter="24"
v-if="typeRadio == 2"
style="padding: 0px 12px;"
style="padding: 0px 12px"
>
<el-form-item label="人脸分组" prop="ufaceDevList">
<el-checkbox
@ -1902,7 +1978,7 @@
<span>*</span
>{{
$t("message.personnelPosition.pleaseChoose") +
$t("message.laborMange.picture")
$t("message.laborMange.picture")
}}:
</div>
<el-radio-group class="radio-box" v-model="radio">
@ -1960,7 +2036,7 @@
></el-table-column>
<el-table-column prop="isSuccess" label="执行结果" align="center">
<template v-slot="{ row }">{{
row.isSuccess === 1 ? "成功" : row.isSuccess === 0?"失败":""
row.isSuccess === 1 ? "成功" : row.isSuccess === 0 ? "失败" : ""
}}</template>
</el-table-column>
@ -2172,7 +2248,7 @@ export default {
payRollBankName: "",
payRollBankNumber: "",
locationCardno: "",
personMail: ""
personMail: "",
},
//人员录入校验
personFormRules: this.$t("message.laborMange.personFormRules"),
@ -3914,6 +3990,11 @@ export default {
this.issuePointList = res.result;
},
async retryEvent(id) {
this.$notify({
title: "正在重试...",
type: "success",
duration: 1500,
});
const res = await xmglXzHikvisionSyncRetryAPI({
id: id,
});
@ -4210,8 +4291,8 @@ export default {
line-height: 16px;
}
}
.tableBtns .operationText{
margin-right: 0px !important;
.tableBtns .operationText {
margin-right: 0px !important;
}
.tablesBtns {
.el-button + .el-button {

16
src/views/projectFront/laborManage/personModule/laborComponent.vue
View File

@ -195,7 +195,14 @@
class="el-icon-arrow-up"
@click="showTeamList = true"
v-if="showTeamList && teamListData.totalTeamNum > 0"
style="position: absolute;right: 10px;top: 35%;font-size: 26px; cursor: pointer; color: #999"
style="
position: absolute;
right: 10px;
top: 35%;
font-size: 26px;
cursor: pointer;
color: #999;
"
></i>
</div>
<i
@ -2281,7 +2288,7 @@
></el-table-column>
<el-table-column prop="isSuccess" label="执行结果" align="center">
<template v-slot="{ row }">{{
row.isSuccess === 1 ? "成功" : row.isSuccess === 0?"失败":""
row.isSuccess === 1 ? "成功" : row.isSuccess === 0 ? "失败" : ""
}}</template>
</el-table-column>
@ -4696,6 +4703,11 @@ export default {
this.issuePointList = res.result;
},
async retryEvent(id) {
this.$notify({
title: "正在重试...",
type: "success",
duration: 1500,
});
const res = await xmglXzHikvisionSyncRetryAPI({
id: id,
});

99
src/views/projectFront/laborManage/rosterNew.vue
View File

@ -9,7 +9,7 @@
v-model="tableParameter.personType"
:placeholder="
$t('message.laborMange.pleaseChoose') +
$t('message.laborMange.personnelType')
$t('message.laborMange.personnelType')
"
>
<el-option
@ -62,7 +62,7 @@
v-model="tableParameter.enterpriseId"
:placeholder="
$t('message.laborMange.pleaseChoose') +
$t('message.laborMange.companies')
$t('message.laborMange.companies')
"
filterable
>
@ -84,7 +84,7 @@
v-model="tableParameter.inserviceType"
:placeholder="
$t('message.laborMange.pleaseChoose') +
$t('message.laborMange.workingState')
$t('message.laborMange.workingState')
"
>
<el-option
@ -116,7 +116,7 @@
placeholder="请选择"
>
<el-option
v-for="(item,index) in sendStatusArr"
v-for="(item, index) in sendStatusArr"
:key="index"
:label="item.name"
:value="item.value"
@ -125,7 +125,10 @@
</el-form-item>
<el-form-item>
<el-button
v-permission="{key: 'hmc_query', menuPath: '/project/labor/roster'}"
v-permission="{
key: 'hmc_query',
menuPath: '/project/labor/roster',
}"
type="primary"
@click="
page = 1;
@ -135,7 +138,10 @@
>{{ $t("message.laborMange.inquire") }}</el-button
>
<el-button
v-permission="{key: 'hmc_refresh', menuPath: '/project/labor/roster'}"
v-permission="{
key: 'hmc_refresh',
menuPath: '/project/labor/roster',
}"
type="warning"
@click="
page = 1;
@ -144,7 +150,7 @@
tableParameter.inserviceType = '';
tableParameter.personType = '';
tableParameter.idCard = '';
tableParameter.sendSuccessStatus = null
tableParameter.sendSuccessStatus = null;
getInfoList();
"
plain
@ -153,10 +159,25 @@
<!-- <el-button type="primary" @click="handleExport" plain
>{{$t('message.laborMange.haiqing') + $t('message.laborMange.export')}}</el-button
> -->
<el-button v-permission="{key: 'hmc_exportPerson', menuPath: '/project/labor/roster'}" type="primary" @click="crewExport" plain>{{
$t("message.laborMange.crew") + $t("message.laborMange.export")
}}</el-button>
<el-button v-permission="{key: 'hmc_inputPerson', menuPath: '/project/labor/roster'}" type="primary" @click="memberRegister"
<el-button
v-permission="{
key: 'hmc_exportPerson',
menuPath: '/project/labor/roster',
}"
type="primary"
@click="crewExport"
plain
>{{
$t("message.laborMange.crew") + $t("message.laborMange.export")
}}</el-button
>
<el-button
v-permission="{
key: 'hmc_inputPerson',
menuPath: '/project/labor/roster',
}"
type="primary"
@click="memberRegister"
>人员录入</el-button
>
</el-form-item>
@ -168,7 +189,7 @@
style="width: 100%"
:header-cell-style="{ background: '#E2EBFF' }"
:show-header="false"
:row-class-name="tableRowClassName"
:row-class-name="tableRowClassName"
>
<el-table-column prop="attendanceNumber">
<template slot-scope="scope">
@ -376,19 +397,22 @@
</template>
</el-table-column>
<el-table-column prop="address" width="200px">
<template slot-scope="scope">
<div class="tableBtns">
<el-button
v-permission="{key: 'hmc_ckxfxq', menuPath: '/project/labor/roster'}"
size="medium"
type="text"
class="operationText"
@click="issueTeamEvent(scope.row.id)"
>查看下发详情</el-button
>
</div>
</template>
</el-table-column>
<template slot-scope="scope">
<div class="tableBtns">
<el-button
v-permission="{
key: 'hmc_ckxfxq',
menuPath: '/project/labor/roster',
}"
size="medium"
type="text"
class="operationText"
@click="issueTeamEvent(scope.row.id)"
>查看下发详情</el-button
>
</div>
</template>
</el-table-column>
<!-- <el-table-column prop="sex" label="操作" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <div class="flex" style="width:40%; margin: auto;">-->
@ -647,7 +671,10 @@
>{{ $t("message.laborMange.highBeatDownload") }}</el-button
>
</div>
<div class="flex5 uploadImage_wrap" style="justify-content: space-around;">
<div
class="flex5 uploadImage_wrap"
style="justify-content: space-around"
>
<div class="position">
<img
:src="$store.state.FILEURL + addForm.idCardBigPhotoUrl"
@ -666,7 +693,7 @@
class="shut_icon"
v-if="
addForm.idCardBigPhotoUrl != '' &&
operationType != 'detail'
operationType != 'detail'
"
@click.stop="addForm.idCardBigPhotoUrl = ''"
/>
@ -692,7 +719,7 @@
/> -->
</div>
</div>
<div class="flex5" style="justify-content: space-around;">
<div class="flex5" style="justify-content: space-around">
<span>
<span class="required">*</span
>{{ $t("message.laborMange.IdCardHead") }}
@ -881,7 +908,7 @@
></el-table-column>
<el-table-column prop="isSuccess" label="执行结果" align="center">
<template v-slot="{ row }">{{
row.isSuccess === 1 ? "成功" : row.isSuccess === 0?"失败":""
row.isSuccess === 1 ? "成功" : row.isSuccess === 0 ? "失败" : ""
}}</template>
</el-table-column>
@ -961,10 +988,11 @@ export default {
},
data() {
return {
loading: false,
sendStatusArr: [
{name: "成功",value: 1},
{name: "失败",value: 2},
{name: "部分成功",value: 3}
{ name: "成功", value: 1 },
{ name: "失败", value: 2 },
{ name: "部分成功", value: 3 },
],
issuePointList: [],
comboFormVisible: false,
@ -1060,7 +1088,7 @@ export default {
},
computed: {
computedAge() {
return function(userCard) {
return function (userCard) {
//获取年龄
var yearBirth = userCard.substring(6, 10);
@ -1529,6 +1557,11 @@ export default {
this.issuePointList = res.result;
},
async retryEvent(id) {
this.$notify({
title: "正在重试...",
type: "success",
duration: 1500,
});
const res = await xmglXzHikvisionSyncRetryAPI({
id: id,
});