+ ![]()
+
+
+ ![]()
+
+
+ ![]()
+
+
+ ![]()
+
+
@@ -165,15 +357,22 @@
{{$t('message.alarmValueSet.bjz')}}
+
+ 
{{ $t("message.deviceManage.edit") }}
+
-
+
固定车辆
临时车辆
+ 外来车辆
@@ -257,9 +461,9 @@
:label="$t('message.carManage.reserveStartTime')"
prop="reserveStartTime"
:rules="
- this.addEditForm.carModuleType === 2 ? reserveStartTimeRule : []
+ [2,3].includes(addEditForm.carModuleType) ? reserveStartTimeRule : []
"
- v-if="this.addEditForm.carModuleType === 2"
+ v-if="[2,3].includes(addEditForm.carModuleType)"
>
单次
@@ -335,7 +539,86 @@
>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -586,10 +869,13 @@ import {
getCarCameraListApi,
} from "../../../assets/js/api/carManage";
import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage";
-import { getWorkerInfoList, getEnterpriseInfoList,
+import {
+ getWorkerInfoList,
+ getEnterpriseInfoList,
xmglXzHikvisionSyncGetNewestList,
- xmglXzHikvisionSyncRetryAPI, } from "@/assets/js/api/laborPerson";
-import store from '@/store'
+ xmglXzHikvisionSyncRetryAPI,
+} from "@/assets/js/api/laborPerson";
+import store from "@/store";
export default {
data() {
var validReserveStartTime = (rule, value, callback) => {
@@ -625,6 +911,14 @@ export default {
}
};
return {
+ sendStatusArr: [
+ { name: "成功", value: 1 },
+ { name: "失败", value: 2 },
+ { name: "部分成功", value: 3 },
+ ],
+ tableParameter: {
+ sendSuccessStatus: null,
+ },
enterpriseListData: [],
uDevAllList: [],
isIndeterminate2: false,
@@ -652,8 +946,12 @@ export default {
startEndTimeArr: [],
COMPANY: COMPANY,
fileList: [],
+ fileList2: [],
+ fileList3: [],
+ fileList4: [],
+ fileList5: [],
showImgUrl: "",
- editPermission:false,
+ editPermission: false,
props: {
multiple: true,
},
@@ -758,7 +1056,7 @@ export default {
trigger: "change",
},
],
- driverName: [
+ driverWorkerName: [
{
required: true,
message: this.$t("message.carManage.required"),
@@ -816,7 +1114,7 @@ export default {
this.getAppWorkerList();
this.getUDevList();
this.getEnterpriseListFn();
- this.getBlackWhiteBoole()
+ this.getBlackWhiteBoole();
},
methods: {
// 展示下发详情
@@ -840,10 +1138,13 @@ export default {
});
console.log(res);
},
- getBlackWhiteBoole(){
- let clgl = {key: 'clgl_blackWhiteList', menuPath: '/project/carManage/carManage'}
- console.log('1111111111111111111111111',this.checkPermission(clgl) );
- this.editPermission = this.checkPermission(clgl);
+ getBlackWhiteBoole() {
+ let clgl = {
+ key: "clgl_blackWhiteList",
+ menuPath: "/project/carManage/carManage",
+ };
+ console.log("1111111111111111111111111", this.checkPermission(clgl));
+ this.editPermission = this.checkPermission(clgl);
},
// 获取企业分级列表
getEnterpriseListFn() {
@@ -899,7 +1200,7 @@ export default {
this.addEditForm.entryAndExitPermit = null;
this.getStratEndTime();
}
- if (this.addEditForm.carModuleType === 2) {
+ if ([2,3].includes(this.addEditForm.carModuleType)) {
this.addEditForm.reserveStartTime = "";
this.addEditForm.reserveEndTime = "";
this.addEditForm.entryAndExitPermit = "";
@@ -942,6 +1243,42 @@ export default {
file.url = this.$store.state.FILEURL + file.url;
});
}
+ if (typeof obj.jsz === "string") {
+ this.addEditForm.jsz =
+ obj.jsz != "" ? JSON.parse(obj.jsz) : [];
+ this.fileList2 = this.addEditForm.jsz;
+ this.fileList2.map((file) => {
+ console.log("url", file.url);
+ file.url = this.$store.state.FILEURL + file.url;
+ });
+ }
+ if (typeof obj.xsz === "string") {
+ this.addEditForm.xsz =
+ obj.xsz != "" ? JSON.parse(obj.xsz) : [];
+ this.fileList3 = this.addEditForm.xsz;
+ this.fileList3.map((file) => {
+ console.log("url", file.url);
+ file.url = this.$store.state.FILEURL + file.url;
+ });
+ }
+ if (typeof obj.jqx === "string") {
+ this.addEditForm.jqx =
+ obj.jqx != "" ? JSON.parse(obj.jqx) : [];
+ this.fileList4 = this.addEditForm.jqx;
+ this.fileList4.map((file) => {
+ console.log("url", file.url);
+ file.url = this.$store.state.FILEURL + file.url;
+ });
+ }
+ if (typeof obj.otherProve === "string") {
+ this.addEditForm.otherProve =
+ obj.otherProve != "" ? JSON.parse(obj.otherProve) : [];
+ this.fileList5 = this.addEditForm.otherProve;
+ this.fileList5.map((file) => {
+ console.log("url", file.url);
+ file.url = this.$store.state.FILEURL + file.url;
+ });
+ }
if (
typeof obj.alarmPushWorkerId === "string" &&
obj.alarmPushWorkerId != ""
@@ -992,9 +1329,14 @@ export default {
},
submit() {
this.processTheFile();
+ this.processTheFile2();
+ this.processTheFile3();
+ this.processTheFile4();
+ this.processTheFile5();
let params = JSON.parse(JSON.stringify(this.addEditForm));
// params.startEndTimeArr = []
// params.startEndTimeArr.push(params.reserveStartTime,params.reserveEndTime)
+ // 车辆图片
var arr = [],
arr2 = JSON.parse(params.carPhotosUrl);
if (arr2.length > 0) {
@@ -1007,6 +1349,58 @@ export default {
});
}
params.carPhotosUrl = JSON.stringify(arr);
+ // 驾驶证
+ var arrJsz = [],
+ arrJsz2 = JSON.parse(params.jsz);
+ if (arrJsz2.length > 0) {
+ arrJsz2.forEach((element) => {
+ var item = element;
+ if (element.url.indexOf("http://") != -1) {
+ item.url = element.url.split("/image/")[1];
+ }
+ arrJsz.push(item);
+ });
+ }
+ params.jsz = JSON.stringify(arrJsz);
+ // 行驶证
+ var arrXsz = [],
+ arrXsz2 = JSON.parse(params.xsz);
+ if (arrXsz2.length > 0) {
+ arrXsz2.forEach((element) => {
+ var item = element;
+ if (element.url.indexOf("http://") != -1) {
+ item.url = element.url.split("/image/")[1];
+ }
+ arrXsz.push(item);
+ });
+ }
+ params.xsz = JSON.stringify(arrXsz);
+ // 交强险
+ var arrJqx = [],
+ arrJqx2 = JSON.parse(params.jqx);
+ if (arrJqx2.length > 0) {
+ arrJqx2.forEach((element) => {
+ var item = element;
+ if (element.url.indexOf("http://") != -1) {
+ item.url = element.url.split("/image/")[1];
+ }
+ arrJqx.push(item);
+ });
+ }
+ params.jqx = JSON.stringify(arrJqx);
+ // 其他证明
+ var arrOther = [],
+ arrOther2 = JSON.parse(params.otherProve);
+ if (arrOther2.length > 0) {
+ arrOther2.forEach((element) => {
+ var item = element;
+ if (element.url.indexOf("http://") != -1) {
+ item.url = element.url.split("/image/")[1];
+ }
+ arrOther.push(item);
+ });
+ }
+ params.otherProve = JSON.stringify(arrOther);
params.projectSn = this.$store.state.projectSn;
if (this.addEditForm.alarmPushWorkerId) {
params.alarmPushWorkerId = this.addEditForm.alarmPushWorkerId.join(",");
@@ -1053,14 +1447,14 @@ export default {
}
});
},
- blackSwich(e,rowObj) {
- console.log(e,rowObj)
+ blackSwich(e, rowObj) {
+ console.log(e, rowObj);
// let params = JSON.parse(JSON.stringify(this.addEditForm));
// params.projectSn = this.$store.state.projectSn;
let requestData = {
...rowObj,
- isBlack: e
- }
+ isBlack: e,
+ };
// if (isBlack === 1) params.isBlack = 0;
// if (isBlack === 0) params.isBlack = 1;
editCarInfoApi(requestData).then((result) => {
@@ -1073,6 +1467,7 @@ export default {
refresh() {
this.carNumber = "";
this.isBlack = "";
+ this.tableParameter.sendSuccessStatus = null;
this.pagInfo.pageNo = 1; //页数
this.pagInfo.pageSize = 10; //条数
this.getList();
@@ -1084,6 +1479,7 @@ export default {
projectSn: this.$store.state.projectSn,
carNumber: this.carNumber,
isBlack: this.isBlack,
+ sendSuccessStatus: this.tableParameter.sendSuccessStatus
}).then((result) => {
if (result.success) {
this.List = result.result.records;
@@ -1125,6 +1521,98 @@ export default {
// console.log('处理el上传的结构后转字符串', JSON.stringify(this.registerInfo.licenseFile));
// console.log('最终要上传的图片', this.registerInfo.licenseFile)
},
+ processTheFile2() {
+ //处理el上传的文件格式(结构)
+ this.addEditForm.jsz = [];
+ this.fileList2.map((item) => {
+ if (!item.response) {
+ this.addEditForm.jsz.push(item);
+ // console.log('符合的结构', item)
+ } else if (item.response) {
+ // console.log('不符合的结构', item)
+ this.addEditForm.jsz.push({
+ name: item.response.data[0].filename,
+ url: item.response.data[0].imageUrl,
+ });
+ }
+ });
+ console.log("处理el上传的结构后", this.addEditForm.jsz);
+ this.addEditForm.jsz = JSON.stringify(
+ this.addEditForm.jsz
+ );
+ console.log("转字符串后", this.addEditForm.jsz);
+ // console.log('处理el上传的结构后转字符串', JSON.stringify(this.registerInfo.licenseFile));
+ // console.log('最终要上传的图片', this.registerInfo.licenseFile)
+ },
+ processTheFile3() {
+ //处理el上传的文件格式(结构)
+ this.addEditForm.xsz = [];
+ this.fileList3.map((item) => {
+ if (!item.response) {
+ this.addEditForm.xsz.push(item);
+ // console.log('符合的结构', item)
+ } else if (item.response) {
+ // console.log('不符合的结构', item)
+ this.addEditForm.xsz.push({
+ name: item.response.data[0].filename,
+ url: item.response.data[0].imageUrl,
+ });
+ }
+ });
+ console.log("处理el上传的结构后", this.addEditForm.xsz);
+ this.addEditForm.xsz = JSON.stringify(
+ this.addEditForm.xsz
+ );
+ console.log("转字符串后", this.addEditForm.xsz);
+ // console.log('处理el上传的结构后转字符串', JSON.stringify(this.registerInfo.licenseFile));
+ // console.log('最终要上传的图片', this.registerInfo.licenseFile)
+ },
+ processTheFile4() {
+ //处理el上传的文件格式(结构)
+ this.addEditForm.jqx = [];
+ this.fileList4.map((item) => {
+ if (!item.response) {
+ this.addEditForm.jqx.push(item);
+ // console.log('符合的结构', item)
+ } else if (item.response) {
+ // console.log('不符合的结构', item)
+ this.addEditForm.jqx.push({
+ name: item.response.data[0].filename,
+ url: item.response.data[0].imageUrl,
+ });
+ }
+ });
+ console.log("处理el上传的结构后", this.addEditForm.jqx);
+ this.addEditForm.jqx = JSON.stringify(
+ this.addEditForm.jqx
+ );
+ console.log("转字符串后", this.addEditForm.jqx);
+ // console.log('处理el上传的结构后转字符串', JSON.stringify(this.registerInfo.licenseFile));
+ // console.log('最终要上传的图片', this.registerInfo.licenseFile)
+ },
+ processTheFile5() {
+ //处理el上传的文件格式(结构)
+ this.addEditForm.otherProve = [];
+ this.fileList5.map((item) => {
+ if (!item.response) {
+ this.addEditForm.otherProve.push(item);
+ // console.log('符合的结构', item)
+ } else if (item.response) {
+ // console.log('不符合的结构', item)
+ this.addEditForm.otherProve.push({
+ name: item.response.data[0].filename,
+ url: item.response.data[0].imageUrl,
+ });
+ }
+ });
+ console.log("处理el上传的结构后", this.addEditForm.otherProve);
+ this.addEditForm.otherProve = JSON.stringify(
+ this.addEditForm.otherProve
+ );
+ console.log("转字符串后", this.addEditForm.otherProve);
+ // console.log('处理el上传的结构后转字符串', JSON.stringify(this.registerInfo.licenseFile));
+ // console.log('最终要上传的图片', this.registerInfo.licenseFile)
+ },
handlePictureCardPreview() {
this.showImgUrl = this.addEditForm.carPhotosUrl[0].url;
// this.showImgUrl = this.$store.state.FILEURL + this.addEditForm.carPhotosUrl[0].url;
@@ -1134,9 +1622,37 @@ export default {
console.log("图片上传成功", fileList);
this.fileList = fileList;
},
+ handleSuccess2(response, file, fileList){
+ console.log("图片上传成功", fileList);
+ this.fileList2 = fileList;
+ },
+ handleSuccess3(response, file, fileList){
+ console.log("图片上传成功", fileList);
+ this.fileList3 = fileList;
+ },
+ handleSuccess4(response, file, fileList){
+ console.log("图片上传成功", fileList);
+ this.fileList4 = fileList;
+ },
+ handleSuccess5(response, file, fileList){
+ console.log("图片上传成功", fileList);
+ this.fileList5 = fileList;
+ },
handleRemove(response, fileList) {
this.fileList = fileList;
},
+ handleRemove2(response, fileList){
+ this.fileList2 = fileList;
+ },
+ handleRemove3(response, fileList){
+ this.fileList3 = fileList;
+ },
+ handleRemove4(response, fileList){
+ this.fileList4 = fileList;
+ },
+ handleRemove5(response, fileList){
+ this.fileList5 = fileList;
+ },
SizeChange(val) {
this.pagInfo.pageSize = val;
this.getList();
@@ -1202,4 +1718,19 @@ export default {
margin-right: 15px;
}
}
+
+.valuesColor {
+ color: #fff;
+ padding: 3px;
+}
+
+.yellow {
+ background-color: #fbe000;
+}
+.green {
+ background-color: #72cb40;
+}
+.red {
+ background-color: #ec373e;
+}
diff --git a/src/views/projectFront/laborManage/rosterNew.vue b/src/views/projectFront/laborManage/rosterNew.vue
index 9817ae67..21feaa7f 100644
--- a/src/views/projectFront/laborManage/rosterNew.vue
+++ b/src/views/projectFront/laborManage/rosterNew.vue
@@ -109,6 +109,20 @@
v-model="tableParameter.idCard"
>
+
+
+
+
-