fix: BUG修改
This commit is contained in:
kun
parent
36ab5be6d7
commit
39a303008c
@ -18,6 +18,7 @@ var COMPANY = '' //通用
|
||||
// COMPANY = 'jlw'//金林湾
|
||||
// COMPANY = 'shzj'//上海张江
|
||||
// COMPANY = 'shjg'//上海优益（上海建工）
|
||||
COMPANY = 'agjt'//鞍钢集团
|
||||
|
||||
var PROJECT = {
|
||||
local_test: 'common', // 普通版
|
||||
|
||||
@ -84,7 +84,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://101.43.164.214:45020/' //沈阳和盈
|
||||
@ -93,7 +93,7 @@ if (process.env.NODE_ENV == 'development') {
|
||||
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
|
||||
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
|
||||
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
|
||||
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//测试地址
|
||||
axios.defaults.baseURL = 'http://47.93.215.234:9809/'//测试地址
|
||||
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
|
||||
|
||||
|
||||
|
||||
@ -84,31 +84,32 @@ export function IdentityCodeValid(code) {
|
||||
tip = "地址编码错误";
|
||||
pass = false;
|
||||
}
|
||||
else{
|
||||
//18位身份证需要验证最后一位校验位
|
||||
if(code.length == 18){
|
||||
code = code.split('');
|
||||
//∑(ai×Wi)(mod 11)
|
||||
//加权因子
|
||||
var factor = [ 7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2 ];
|
||||
//校验位
|
||||
var parity = [ 1, 0, 'X', 9, 8, 7, 6, 5, 4, 3, 2 ];
|
||||
var sum = 0;
|
||||
var ai = 0;
|
||||
var wi = 0;
|
||||
for (var i = 0; i < 17; i++)
|
||||
{
|
||||
ai = code[i];
|
||||
wi = factor[i];
|
||||
sum += ai * wi;
|
||||
}
|
||||
var last = parity[sum % 11];
|
||||
if(parity[sum % 11] != code[17]){
|
||||
tip = "校验位错误";
|
||||
pass =false;
|
||||
}
|
||||
}
|
||||
}
|
||||
// else{
|
||||
// //18位身份证需要验证最后一位校验位
|
||||
// if(code.length == 18){
|
||||
// code = code.split('');
|
||||
// //∑(ai×Wi)(mod 11)
|
||||
// //加权因子
|
||||
// var factor = [ 7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2 ];
|
||||
// //校验位
|
||||
// var parity = [ 1, 0, 'X', 9, 8, 7, 6, 5, 4, 3, 2 ];
|
||||
// var sum = 0;
|
||||
// var ai = 0;
|
||||
// var wi = 0;
|
||||
// for (var i = 0; i < 17; i++)
|
||||
// {
|
||||
// ai = code[i];
|
||||
// wi = factor[i];
|
||||
// sum += ai * wi;
|
||||
// }
|
||||
// var last = parity[sum % 11];
|
||||
// if(parity[sum % 11] != code[17]){
|
||||
// tip = "校验位错误";
|
||||
// pass =false;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
console.log(tip)
|
||||
return pass;
|
||||
}
|
||||
|
||||
|
||||
@ -48,23 +48,23 @@ export default new Vuex.Store({
|
||||
PAGESIZRS: [10, 20, 30, 50],
|
||||
// UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色
|
||||
// FILEURL:' http://101.43.164.214:11111/image/',// 百色
|
||||
UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
|
||||
FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
|
||||
WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
|
||||
// UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
|
||||
// FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
|
||||
// WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
|
||||
// UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
|
||||
// FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试
|
||||
|
||||
// BASEURL: baseUrl
|
||||
// ? baseUrl
|
||||
// : window.location.protocol + "//" + window.location.host + "/", //正式环境
|
||||
// UPLOADURL:
|
||||
// window.location.protocol +
|
||||
// "//" +
|
||||
// window.location.host +
|
||||
// "/upload/image", //正式环境
|
||||
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
|
||||
BASEURL: baseUrl
|
||||
? baseUrl
|
||||
: window.location.protocol + "//" + window.location.host + "/", //正式环境
|
||||
UPLOADURL:
|
||||
window.location.protocol +
|
||||
"//" +
|
||||
window.location.host +
|
||||
"/upload/image", //正式环境
|
||||
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
|
||||
// WORKFLOWURL: 'http://182.90.224.237:9811/#/workspace/forms',//测试平台工作流地址
|
||||
// WORKFLOWURL: 'http://182.90.224.237:9814/#/workspace/forms',//鞍钢平台工作流地址
|
||||
WORKFLOWURL: 'http://182.90.224.237:9814/#/workspace/forms',//鞍钢平台工作流地址
|
||||
//---------------------------------------------------------------------------------------------
|
||||
// BASEURL: baseUrl
|
||||
// ? baseUrl
|
||||
|
||||
@ -113,8 +113,8 @@
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="门禁点数" required>
|
||||
<el-select v-model="selectVal" multiple placeholder="请选择">
|
||||
<el-form-item label="门禁点数" prop="ufaceDevList">
|
||||
<el-select v-model="addEditForm.ufaceDevList" multiple placeholder="请选择" clearable>
|
||||
<el-option
|
||||
v-for="item in devList"
|
||||
:key="item.id"
|
||||
@ -175,7 +175,7 @@ export default {
|
||||
addEditDialogTitle: "",
|
||||
addEditForm: {
|
||||
name: "",
|
||||
ufaceDevList: true,
|
||||
ufaceDevList: [],
|
||||
},
|
||||
addEditFormRules: {
|
||||
name: [
|
||||
@ -185,6 +185,13 @@ export default {
|
||||
trigger: "blur",
|
||||
},
|
||||
],
|
||||
ufaceDevList: [
|
||||
{
|
||||
required: true,
|
||||
message: "请选择",
|
||||
trigger: "change",
|
||||
},
|
||||
]
|
||||
},
|
||||
isSelectCompany: false,
|
||||
selectCompanyName: "请选择",
|
||||
@ -254,9 +261,11 @@ export default {
|
||||
// if (devInfo.ufaceDevList.length > 0) {
|
||||
// this.selectCompanyName = "已选择";
|
||||
// }
|
||||
this.selectVal = devInfo.ufaceDevList.map((item) => {
|
||||
return item.id;
|
||||
});
|
||||
if(devInfo.ufaceDevList){
|
||||
this.addEditForm.ufaceDevList = devInfo.ufaceDevList.map((item) => {
|
||||
return item.id;
|
||||
});
|
||||
}
|
||||
// this.devList.map((item) => {
|
||||
// devInfo.ufaceDevList.map((item2) => {
|
||||
// if (item.id == item2.id) {
|
||||
@ -316,7 +325,7 @@ export default {
|
||||
// }
|
||||
// });
|
||||
this.devList.map((item) => {
|
||||
if (this.selectVal.includes(item.id)) {
|
||||
if (this.addEditForm.ufaceDevList.includes(item.id)) {
|
||||
console.log(item, 777888);
|
||||
arr.push({ id: item.id });
|
||||
}
|
||||
@ -349,9 +358,10 @@ export default {
|
||||
});
|
||||
},
|
||||
resetForm() {
|
||||
this.selectVal = [];
|
||||
this.selectCompanyName = "请选择";
|
||||
this.selectVal = [];
|
||||
this.addEditForm.name = "";
|
||||
this.addEditForm.ufaceDevList = [];
|
||||
this.devList.map((item) => {
|
||||
item.checked = false;
|
||||
});
|
||||
|
||||
@ -348,9 +348,9 @@ export default {
|
||||
},
|
||||
created(){
|
||||
this.company = COMPANY
|
||||
this.headquartersSn = JSON.parse(window.sessionStorage.getItem("vuex")).userInfo.headquartersSn
|
||||
this.projectSn = JSON.parse(window.sessionStorage.getItem("vuex")).userInfo.sn
|
||||
this.styleType = this.styleType = this.$store.state.userInfo.styleType;
|
||||
this.headquartersSn = this.$store.state.userInfo.headquartersSn
|
||||
this.projectSn = this.$store.state.projectSn
|
||||
this.styleType = this.$store.state.userInfo.styleType;
|
||||
this.fileUrl = this.$store.state.FILEURL;
|
||||
this.queryTypeList()
|
||||
this.getCooperatorList()
|
||||
@ -870,7 +870,7 @@ export default {
|
||||
}
|
||||
.button-box{
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
// padding-top: 8px;
|
||||
height: 60px;
|
||||
|
||||
@ -105,6 +105,21 @@
|
||||
</div>
|
||||
<el-button size="medium" class="print-btn" @click="dialogVisible = true">历史进度记录</el-button>
|
||||
</div>
|
||||
<div class="plan-detail flex">
|
||||
<div class="plan-content">
|
||||
<span>现场照片：</span>
|
||||
<div v-if="progressData.length>0 && progressData[0].imageUrl"
|
||||
style="margin-left: 48px;">
|
||||
<el-image
|
||||
v-for="(item,index) in progressData[0].imageUrl.split(',')"
|
||||
:key="index"
|
||||
style="width: 80px; height: 80px;margin-left: 20px;margin-top: 10px"
|
||||
:src="fileUrl + item"
|
||||
:preview-src-list="[fileUrl + item]">
|
||||
</el-image>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="line"></div>
|
||||
<div class="info-item">
|
||||
@ -224,7 +239,7 @@
|
||||
v-model="detailData.technicalDisclosureType"
|
||||
:active-value="2"
|
||||
active-color="#13ce66"
|
||||
inactive-color="#f9f9f9"
|
||||
inactive-color="#909399"
|
||||
disabled>
|
||||
</el-switch>
|
||||
<div>{{detailData.technicalDisclosureType == 2 ? '已完成':'未完成'}}</div>
|
||||
@ -271,7 +286,7 @@
|
||||
v-model="detailData.specialConstructionSchemeType"
|
||||
:active-value="2"
|
||||
active-color="#13ce66"
|
||||
inactive-color="#f9f9f9"
|
||||
inactive-color="#909399"
|
||||
disabled>
|
||||
</el-switch>
|
||||
<div>{{detailData.specialConstructionSchemeType == 2 ? '已完成':'未完成'}}</div>
|
||||
@ -874,8 +889,8 @@ export default {
|
||||
},
|
||||
created(){
|
||||
this.COMPANY = COMPANY
|
||||
this.headquartersSn = JSON.parse(window.sessionStorage.getItem("vuex")).userInfo.headquartersSn
|
||||
this.projectSn = JSON.parse(window.sessionStorage.getItem("vuex")).userInfo.sn
|
||||
this.headquartersSn = this.$store.state.userInfo.headquartersSn
|
||||
this.projectSn = this.$store.state.projectSn
|
||||
this.fileUrl = this.$store.state.FILEURL;
|
||||
this.queryDetail()
|
||||
this.selectClassControlContentList()
|
||||
@ -1012,7 +1027,8 @@ export default {
|
||||
recordType: type,
|
||||
projectSn: this.projectSn,
|
||||
pageNo: 1,
|
||||
pageSize: 1000
|
||||
pageSize: 1000,
|
||||
engineeringId: this.id
|
||||
}
|
||||
selectHiddenDangerInspectRecordApi(data).then(res=>{
|
||||
console.log(res, type)
|
||||
|
||||
@ -563,16 +563,16 @@
|
||||
{{$t('message.dangerousBigDictionary.cancel')}}
|
||||
</el-button
|
||||
>
|
||||
<el-button
|
||||
<!-- <el-button
|
||||
type="danger"
|
||||
@click="delBindFn()"
|
||||
size="medium"
|
||||
icon="el-icon-circle-check"
|
||||
>
|
||||
<!-- 删除绑定 -->
|
||||
删除绑定
|
||||
{{$t('message.dangerousBigDictionary.remove')+$t('message.dangerousBigDictionary.bind')}}
|
||||
</el-button
|
||||
>
|
||||
> -->
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="saveSelectedControl()"
|
||||
|
||||
@ -132,7 +132,7 @@
|
||||
{{ scope.row.progressrecord.progressDescribe }}
|
||||
</p>
|
||||
<!-- 记录于 -->
|
||||
<p v-if="scope.row.progressrecord">
|
||||
<p v-if="scope.row.progressrecord" style="text-align: left">
|
||||
{{ scope.row.progressrecord.createUserName
|
||||
}}{{ $t('message.dangerousBigProject.record')
|
||||
}}{{ scope.row.progressrecord.createTime }}
|
||||
@ -409,7 +409,7 @@
|
||||
@back="goBack"
|
||||
:content="dialogTitle"
|
||||
class="backText"
|
||||
:class="{ dark: styletype == 2 }"
|
||||
:class="{ dark: styleType == 2 }"
|
||||
></el-page-header>
|
||||
<addPlan @cancleSave="goBack" v-if="isAdd"></addPlan>
|
||||
<detail :id="detailId" @cancleSave="goBack" v-if="isEdit"></detail>
|
||||
@ -506,8 +506,8 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.projectSn = JSON.parse(window.sessionStorage.getItem("vuex")).userInfo.sn
|
||||
this.styleType = this.styleType = this.$store.state.userInfo.styleType;
|
||||
this.projectSn = this.$store.state.projectSn
|
||||
this.styleType = this.$store.state.userInfo.styleType;
|
||||
// this.getCooperatorList()
|
||||
// this.getType()
|
||||
this.initData();
|
||||
@ -524,7 +524,7 @@ export default {
|
||||
this.isEdit = false
|
||||
this.isAdd = true
|
||||
// "新增"
|
||||
this.dialogTitle = $t('message.dangerousBigProject.add')
|
||||
this.dialogTitle = this.$t('message.dangerousBigProject.add')
|
||||
// this.clearData()
|
||||
// if(this.isDisabled){
|
||||
// this.isDisabled = false
|
||||
@ -569,7 +569,7 @@ export default {
|
||||
editData(index, val) {
|
||||
this.viewData(index, val)
|
||||
// "编辑"
|
||||
this.dialogTitle = $t('message.dangerousBigProject.edit')
|
||||
this.dialogTitle = this.$t('message.dangerousBigProject.edit')
|
||||
this.editParms = val[index]
|
||||
if (this.file1) {
|
||||
let obj = {
|
||||
@ -600,7 +600,7 @@ export default {
|
||||
this.clearData()
|
||||
this.dialogFormVisible = true
|
||||
// "查看"
|
||||
this.dialogTitle = $t('message.dangerousBigProject.view')
|
||||
this.dialogTitle = this.$t('message.dangerousBigProject.view')
|
||||
this.isDisabled = true
|
||||
this.isEditDisabled = true
|
||||
this.addForm = {
|
||||
@ -701,15 +701,15 @@ export default {
|
||||
addData() {
|
||||
if (this.addForm.name == "") {
|
||||
// 请输入危大工程名称
|
||||
this.$message.error($t('message.dangerousBigProject.verifyMessage1'))
|
||||
this.$message.error(this.$t('message.dangerousBigProject.verifyMessage1'))
|
||||
return
|
||||
} else if (this.addForm.category == "") {
|
||||
// 请选择危大工程类别
|
||||
this.$message.error($t('message.dangerousBigProject.verifyMessage2'))
|
||||
this.$message.error(this.$t('message.dangerousBigProject.verifyMessage2'))
|
||||
return
|
||||
} else if (this.addForm.describe == "") {
|
||||
// 请选择类别描述
|
||||
this.$message.error($t('message.dangerousBigProject.verifyMessage3'))
|
||||
this.$message.error(this.$t('message.dangerousBigProject.verifyMessage3'))
|
||||
return
|
||||
}
|
||||
// console.log(this.addForm)
|
||||
@ -734,17 +734,17 @@ export default {
|
||||
addForm: this.addForm
|
||||
}
|
||||
// "新增"
|
||||
if (this.dialogTitle == $t('message.dangerousBigProject.add')) {
|
||||
if (this.dialogTitle == this.$t('message.dangerousBigProject.add')) {
|
||||
console.log(data)
|
||||
data.responsibilityCompany = this.addForm.unit ? this.addForm.unit.join(',') : ""
|
||||
addDangerousEngineeringRecordApi(data).then((res) => {
|
||||
if (res.code = 200) {
|
||||
this.$message.success($t('message.dangerousBigProject.add') + $t('message.dangerousBigProject.success') + "！")
|
||||
this.$message.success(this.$t('message.dangerousBigProject.add') + this.$t('message.dangerousBigProject.success') + "！")
|
||||
this.initData()
|
||||
}
|
||||
console.log(res)
|
||||
})
|
||||
} else if (this.dialogTitle == $t('message.dangerousBigProject.edit')) {
|
||||
} else if (this.dialogTitle == this.$t('message.dangerousBigProject.edit')) {
|
||||
// "编辑"
|
||||
data.id = this.editParms.id
|
||||
data.typeDescribeId = this.editParms.typeDescribeId
|
||||
@ -756,7 +756,7 @@ export default {
|
||||
editDangerousEngineeringRecordApi(data).then((res) => {
|
||||
if (res.code = 200) {
|
||||
// "修改成功！"
|
||||
this.$message.success($t('message.dangerousBigProject.editSuccess'))
|
||||
this.$message.success(this.$t('message.dangerousBigProject.editSuccess'))
|
||||
this.initData()
|
||||
}
|
||||
console.log(res)
|
||||
@ -797,7 +797,7 @@ export default {
|
||||
},
|
||||
beforeRemove(file, fileList) {
|
||||
// 确定移除
|
||||
return this.$confirm($t('message.dangerousBigProject.confirmRemove') + ` ${file.name}？`);
|
||||
return this.$confirm(this.$t('message.dangerousBigProject.confirmRemove') + ` ${file.name}？`);
|
||||
},
|
||||
uploadSuccess(response, file, fileList) {
|
||||
console.log('fileList')
|
||||
@ -807,7 +807,7 @@ export default {
|
||||
},
|
||||
uploadError(err, file, fileList) {
|
||||
// 上传失败！
|
||||
this.$message.error($t('message.dangerousBigProject.uploadFail'));
|
||||
this.$message.error(this.$t('message.dangerousBigProject.uploadFail'));
|
||||
},
|
||||
handleRemove2(file, fileList) {
|
||||
console.log(fileList);
|
||||
@ -818,7 +818,7 @@ export default {
|
||||
},
|
||||
beforeRemove2(file, fileList) {
|
||||
// 确定移除
|
||||
return this.$confirm($t('message.dangerousBigProject.confirmRemove') + `${file.name}？`);
|
||||
return this.$confirm(this.$t('message.dangerousBigProject.confirmRemove') + `${file.name}？`);
|
||||
},
|
||||
uploadSuccess2(response, file, fileList) {
|
||||
console.log('fileList')
|
||||
@ -828,7 +828,7 @@ export default {
|
||||
},
|
||||
uploadError2(err, file, fileList) {
|
||||
// 上传失败！
|
||||
this.$message.error($t('message.dangerousBigProject.uploadFail'));
|
||||
this.$message.error(this.$t('message.dangerousBigProject.uploadFail'));
|
||||
},
|
||||
handleRemove3(file, fileList) {
|
||||
console.log(fileList);
|
||||
@ -839,7 +839,7 @@ export default {
|
||||
},
|
||||
beforeRemove3(file, fileList) {
|
||||
// 确定移除
|
||||
return this.$confirm($t('message.dangerousBigProject.confirmRemove') + `${file.name}？`);
|
||||
return this.$confirm(this.$t('message.dangerousBigProject.confirmRemove') + `${file.name}？`);
|
||||
},
|
||||
uploadSuccess3(response, file, fileList) {
|
||||
console.log('fileList')
|
||||
@ -849,7 +849,7 @@ export default {
|
||||
},
|
||||
uploadError3(err, file, fileList) {
|
||||
// 上传失败！
|
||||
this.$message.error($t('message.dangerousBigProject.uploadFail'));
|
||||
this.$message.error(this.$t('message.dangerousBigProject.uploadFail'));
|
||||
},
|
||||
previewDetail(val) {
|
||||
console.log(val)
|
||||
|
||||
@ -2758,6 +2758,14 @@ export default {
|
||||
} else {
|
||||
data.ufaceDevId = "";
|
||||
}
|
||||
if (
|
||||
this.workerInfo.ufaceDevGroupId &&
|
||||
this.workerInfo.ufaceDevGroupId.length > 0
|
||||
) {
|
||||
data.ufaceDevGroupId = this.workerInfo.ufaceDevGroupId.join(",");
|
||||
} else {
|
||||
data.ufaceDevGroupId = "";
|
||||
}
|
||||
delete data.addTime;
|
||||
editWorkerInfo(data).then((res) => {
|
||||
if (res.code == 200) {
|
||||
|
||||
@ -1553,7 +1553,7 @@
|
||||
>
|
||||
<el-checkbox-group
|
||||
key="group2"
|
||||
v-model="personForm.uGroupId"
|
||||
v-model="personForm.ufaceDevGroupId"
|
||||
@change="handleUGroupChange"
|
||||
>
|
||||
<el-checkbox
|
||||
@ -1987,7 +1987,7 @@ export default {
|
||||
personType: 2,
|
||||
ruleId: '',
|
||||
ufaceDevId: [],
|
||||
uGroupId: [],
|
||||
ufaceDevGroupId: [],
|
||||
personSerial: '',
|
||||
payRollBankName: '',
|
||||
payRollBankNumber: '',
|
||||
@ -2286,12 +2286,12 @@ export default {
|
||||
},
|
||||
handleCheckAllChangeGroup(val){
|
||||
if (val) {
|
||||
this.personForm.uGroupId = [];
|
||||
this.personForm.ufaceDevGroupId = [];
|
||||
this.uGroupAllList.forEach((item) => {
|
||||
this.personForm.uGroupId.push(item.id);
|
||||
this.personForm.ufaceDevGroupId.push(item.id);
|
||||
});
|
||||
} else {
|
||||
this.personForm.uGroupId = [];
|
||||
this.personForm.ufaceDevGroupId = [];
|
||||
}
|
||||
this.isIndeterminate2 = false;
|
||||
},
|
||||
@ -2302,7 +2302,7 @@ export default {
|
||||
if (res.code == 200) {
|
||||
this.uGroupAllList = res.result;
|
||||
console.log(this.uGroupAllList,777888999)
|
||||
this.personForm.uGroupId = [...this.personForm.uGroupId];
|
||||
this.personForm.ufaceDevGroupId = [...this.personForm.ufaceDevGroupId];
|
||||
if (this.$store.state.userInfo.accountType == 6) {
|
||||
this.uGroupAllList.forEach((item) => {
|
||||
item.disabled = true;
|
||||
@ -2646,7 +2646,7 @@ export default {
|
||||
jobName: '',
|
||||
personType: 2,
|
||||
ufaceDevId: [],
|
||||
uGroupId: [],
|
||||
ufaceDevGroupId: [],
|
||||
personSerial: ''
|
||||
}
|
||||
if (this.attendRulesList.length > 0) {
|
||||
@ -2667,6 +2667,7 @@ export default {
|
||||
}, 120)
|
||||
// 默认全选设备
|
||||
this.checkAllFaceDev = true;
|
||||
this.checkAllGroupDev = false;
|
||||
this.ufaceDevAllList.map(item => {
|
||||
this.personForm.ufaceDevId.push(item.id)
|
||||
})
|
||||
@ -2784,18 +2785,20 @@ export default {
|
||||
}
|
||||
//新增
|
||||
if (!this.personForm.id) {
|
||||
let data = JSON.parse(JSON.stringify(this.personForm))
|
||||
let data = {...this.personForm}
|
||||
data.projectSn = this.projectSn
|
||||
data.devType = this.typeRadio;
|
||||
data.departmentId = this.checkedTeamId
|
||||
data.longTerm = data.longTerm ? 1 : 0
|
||||
if (this.personForm.ufaceDevId.length > 0) {
|
||||
if (this.personForm.ufaceDevId.length > 0 && data.devType == 1) {
|
||||
data.ufaceDevId = this.personForm.ufaceDevId.join(',')
|
||||
data.ufaceDevGroupId = "";
|
||||
} else {
|
||||
data.ufaceDevId = ''
|
||||
}
|
||||
if (this.personForm.uGroupId.length > 0) {
|
||||
data.ufaceDevGroupId = this.personForm.uGroupId.join(",");
|
||||
if (this.personForm.ufaceDevGroupId.length > 0 && data.devType == 2) {
|
||||
data.ufaceDevGroupId = this.personForm.ufaceDevGroupId.join(",");
|
||||
data.ufaceDevId = "";
|
||||
} else {
|
||||
data.ufaceDevGroupId = "";
|
||||
}
|
||||
@ -2809,16 +2812,18 @@ export default {
|
||||
})
|
||||
//编辑
|
||||
} else {
|
||||
let data = this.personForm
|
||||
let data = {...this.personForm}
|
||||
data.devType = this.typeRadio;
|
||||
console.log('dadadaa', data)
|
||||
if (this.personForm.ufaceDevId.length > 0) {
|
||||
if (this.personForm.ufaceDevId.length > 0 && data.devType == 1) {
|
||||
data.ufaceDevId = this.personForm.ufaceDevId.join(',')
|
||||
data.ufaceDevGroupId = "";
|
||||
} else {
|
||||
data.ufaceDevId = ''
|
||||
}
|
||||
if (this.personForm.uGroupId.length > 0) {
|
||||
data.ufaceDevGroupId = this.personForm.uGroupId.join(",");
|
||||
if (this.personForm.ufaceDevGroupId.length > 0 && data.devType == 2) {
|
||||
data.ufaceDevGroupId = this.personForm.ufaceDevGroupId.join(",");
|
||||
data.ufaceDevId = "";
|
||||
} else {
|
||||
data.ufaceDevGroupId = "";
|
||||
}
|
||||
@ -2883,7 +2888,7 @@ export default {
|
||||
jobName: '',
|
||||
personType: 2,
|
||||
ufaceDevId: [],
|
||||
uGroupId: [],
|
||||
ufaceDevGroupId: [],
|
||||
personSerial: ''
|
||||
}
|
||||
this.getUfaceDevList()
|
||||
@ -2893,6 +2898,20 @@ export default {
|
||||
this.personForm.sex = Number(value.sex)
|
||||
this.personForm.inserviceType = type == 2 ? 1 : value.inserviceType
|
||||
this.personForm.longTerm = value.longTerm == 1 ? true : false
|
||||
if(value.ufaceDevId){
|
||||
this.personForm.ufaceDevId = value.ufaceDevId.split(',')
|
||||
this.handleUfaceDevChange(this.personForm.ufaceDevId); // 做一下全选按钮的选中与否
|
||||
} else {
|
||||
this.personForm.ufaceDevId = []
|
||||
this.handleUfaceDevChange(this.personForm.ufaceDevId); // 做一下全选按钮的选中与否
|
||||
}
|
||||
if(value.ufaceDevGroupId){
|
||||
this.personForm.ufaceDevGroupId = value.ufaceDevGroupId.split(',')
|
||||
this.handleUGroupChange(this.personForm.ufaceDevGroupId); // 做一下全选按钮的选中与否
|
||||
} else {
|
||||
this.personForm.ufaceDevGroupId = []
|
||||
this.handleUGroupChange(this.personForm.ufaceDevGroupId); // 做一下全选按钮的选中与否
|
||||
}
|
||||
if (this.personForm.ruleId == 0) {
|
||||
this.personForm.ruleId = ''
|
||||
}
|
||||
|
||||
@ -1561,7 +1561,7 @@
|
||||
>
|
||||
<el-checkbox-group
|
||||
key="group2"
|
||||
v-model="personForm.uGroupId"
|
||||
v-model="personForm.ufaceDevGroupId"
|
||||
@change="handleUGroupChange"
|
||||
>
|
||||
<el-checkbox
|
||||
@ -2286,7 +2286,7 @@ export default {
|
||||
idCardDownPhotoUrl: "",
|
||||
ruleId: "",
|
||||
ufaceDevId: [],
|
||||
uGroupId: [],
|
||||
ufaceDevGroupId: [],
|
||||
personSerial: "",
|
||||
locationCardno: "", //人员定位标签号
|
||||
},
|
||||
@ -2555,12 +2555,12 @@ export default {
|
||||
},
|
||||
handleCheckAllChangeGroup(val){
|
||||
if (val) {
|
||||
this.personForm.uGroupId = [];
|
||||
this.personForm.ufaceDevGroupId = [];
|
||||
this.uGroupAllList.forEach((item) => {
|
||||
this.personForm.uGroupId.push(item.id);
|
||||
this.personForm.ufaceDevGroupId.push(item.id);
|
||||
});
|
||||
} else {
|
||||
this.personForm.uGroupId = [];
|
||||
this.personForm.ufaceDevGroupId = [];
|
||||
}
|
||||
this.isIndeterminate2 = false;
|
||||
},
|
||||
@ -2570,8 +2570,8 @@ export default {
|
||||
console.log(res);
|
||||
if (res.code == 200) {
|
||||
this.uGroupAllList = res.result;
|
||||
console.log(this.uGroupAllList,777888999)
|
||||
this.personForm.uGroupId = [...this.personForm.uGroupId];
|
||||
console.log(this.uGroupAllList,123456)
|
||||
this.personForm.ufaceDevGroupId = [...this.personForm.ufaceDevGroupId];
|
||||
if (this.$store.state.userInfo.accountType == 6) {
|
||||
this.uGroupAllList.forEach((item) => {
|
||||
item.disabled = true;
|
||||
@ -3176,7 +3176,7 @@ export default {
|
||||
idCardUpPhotoUrl: "",
|
||||
idCardDownPhotoUrl: "",
|
||||
ufaceDevId: [],
|
||||
uGroupId: [],
|
||||
ufaceDevGroupId: [],
|
||||
personSerial: "",
|
||||
};
|
||||
if (this.attendRulesList.length > 0) {
|
||||
@ -3198,6 +3198,7 @@ export default {
|
||||
this.idCardDownPhotoUrlFile = []; // 身份证人像面
|
||||
// 默认全选设备
|
||||
this.checkAllFaceDev = true;
|
||||
this.checkAllGroupDev = false;
|
||||
this.ufaceDevAllList.map(item => {
|
||||
this.personForm.ufaceDevId.push(item.id)
|
||||
})
|
||||
@ -3217,6 +3218,7 @@ export default {
|
||||
savePersonFn(formName) {
|
||||
this.personForm.isUploadHousing = this.personForm.isUploadHousing ? 1 : 0;
|
||||
console.log("进场确定参数", this.personForm);
|
||||
console.log("进场确定参数", IdentityCodeValid(this.personForm.idCard));
|
||||
// 身份证校验
|
||||
if (!IdentityCodeValid(this.personForm.idCard)) {
|
||||
this.$message.error(this.$t("message.laborMange.correctCellIdCard"));
|
||||
@ -3278,7 +3280,7 @@ export default {
|
||||
}
|
||||
//新增
|
||||
if (!this.personForm.id) {
|
||||
let data = this.personForm;
|
||||
let data = {...this.personForm};
|
||||
data.projectSn = this.projectSn;
|
||||
data.teamId = this.checkedTeamId;
|
||||
data.enterpriseId = this.checkedId;
|
||||
@ -3291,13 +3293,15 @@ export default {
|
||||
} else {
|
||||
data.accountType = 1;
|
||||
}
|
||||
if (this.personForm.ufaceDevId.length > 0) {
|
||||
if (this.personForm.ufaceDevId.length > 0 && data.devType == 1) {
|
||||
data.ufaceDevId = this.personForm.ufaceDevId.join(",");
|
||||
data.ufaceDevGroupId = "";
|
||||
} else {
|
||||
data.ufaceDevId = "";
|
||||
}
|
||||
if (this.personForm.uGroupId.length > 0) {
|
||||
data.ufaceDevGroupId = this.personForm.uGroupId.join(",");
|
||||
if (this.personForm.ufaceDevGroupId.length > 0 && data.devType == 2) {
|
||||
data.ufaceDevGroupId = this.personForm.ufaceDevGroupId.join(",");
|
||||
data.ufaceDevId = "";
|
||||
} else {
|
||||
data.ufaceDevGroupId = "";
|
||||
}
|
||||
@ -3318,28 +3322,22 @@ export default {
|
||||
});
|
||||
//编辑
|
||||
} else {
|
||||
let data = this.personForm;
|
||||
let data = {...this.personForm};
|
||||
data.longTerm = this.personForm.longTerm ? 1 : 0;
|
||||
data.registerType = 1;
|
||||
data.devType = this.typeRadio;
|
||||
// 跟杨珊对接需要再再次进场时多传入一个新的字段
|
||||
data.reEntry = 1;
|
||||
data.userId = this.$store.state.userInfo.userId;
|
||||
if (this.personForm.ufaceDevId.length > 0) {
|
||||
console.log(
|
||||
"this.personForm.ufaceDevId",
|
||||
this.personForm.ufaceDevId
|
||||
);
|
||||
if (this.personForm.ufaceDevId.length > 0 && data.devType == 1) {
|
||||
data.ufaceDevId = this.personForm.ufaceDevId.join(",");
|
||||
data.ufaceDevGroupId = "";
|
||||
} else {
|
||||
data.ufaceDevId = "";
|
||||
}
|
||||
if (this.personForm.uGroupId.length > 0) {
|
||||
console.log(
|
||||
"this.personForm.uGroupId",
|
||||
this.personForm.uGroupId
|
||||
);
|
||||
data.ufaceDevGroupId = this.personForm.uGroupId.join(",");
|
||||
if (this.personForm.ufaceDevGroupId.length > 0 && data.devType == 2) {
|
||||
data.ufaceDevGroupId = this.personForm.ufaceDevGroupId.join(",");
|
||||
data.ufaceDevId = "";
|
||||
} else {
|
||||
data.ufaceDevGroupId = "";
|
||||
}
|
||||
@ -3422,7 +3420,7 @@ export default {
|
||||
idCardUpPhotoUrl: "",
|
||||
idCardDownPhotoUrl: "",
|
||||
ufaceDevId: [],
|
||||
uGroupId: [],
|
||||
ufaceDevGroupId: [],
|
||||
personSerial: "",
|
||||
};
|
||||
this.getUfaceDevList();
|
||||
@ -3432,6 +3430,20 @@ export default {
|
||||
}, 120);
|
||||
this.addPersonDialog = true;
|
||||
this.personForm = JSON.parse(JSON.stringify(value));
|
||||
if(value.ufaceDevId){
|
||||
this.personForm.ufaceDevId = value.ufaceDevId.split(',')
|
||||
this.handleUfaceDevChange(this.personForm.ufaceDevId); // 做一下全选按钮的选中与否
|
||||
} else {
|
||||
this.personForm.ufaceDevId = []
|
||||
this.handleUfaceDevChange(this.personForm.ufaceDevId); // 做一下全选按钮的选中与否
|
||||
}
|
||||
if(value.ufaceDevGroupId){
|
||||
this.personForm.ufaceDevGroupId = value.ufaceDevGroupId.split(',')
|
||||
this.handleUGroupChange(this.personForm.ufaceDevGroupId); // 做一下全选按钮的选中与否
|
||||
} else {
|
||||
this.personForm.ufaceDevGroupId = []
|
||||
this.handleUGroupChange(this.personForm.ufaceDevGroupId); // 做一下全选按钮的选中与否
|
||||
}
|
||||
if (this.personForm.ruleId == 0) {
|
||||
this.personForm.ruleId = "";
|
||||
}
|
||||
|
||||
@ -1158,28 +1158,30 @@ export default {
|
||||
radius: [60, 65],
|
||||
x: '0%', // for funnel
|
||||
data: [
|
||||
{
|
||||
name: 'other',
|
||||
value: this.totalPersonNum - this.totalEducationPerson,
|
||||
label: {
|
||||
normal: {
|
||||
show: false
|
||||
}
|
||||
},
|
||||
labelLine: {
|
||||
normal: {
|
||||
show: false
|
||||
}
|
||||
},
|
||||
itemStyle: {
|
||||
normal: {
|
||||
color: '#e0e0e4'
|
||||
}
|
||||
}
|
||||
},
|
||||
// {
|
||||
// name: 'other',
|
||||
// // value: this.totalPersonNum - this.totalEducationPerson,
|
||||
// value: this.totalPersonNum,
|
||||
// label: {
|
||||
// normal: {
|
||||
// show: false
|
||||
// }
|
||||
// },
|
||||
// labelLine: {
|
||||
// normal: {
|
||||
// show: false
|
||||
// }
|
||||
// },
|
||||
// itemStyle: {
|
||||
// normal: {
|
||||
// color: '#e0e0e4'
|
||||
// }
|
||||
// }
|
||||
// },
|
||||
{
|
||||
name: that.$t('message.POverview.numberTrainees'),
|
||||
value: this.totalEducationPerson,
|
||||
// value: this.totalEducationPerson,
|
||||
value: this.totalPersonNum,
|
||||
label: {
|
||||
normal: {
|
||||
position: 'center',
|
||||
@ -1244,7 +1246,8 @@ export default {
|
||||
},
|
||||
{
|
||||
name: that.$t('message.POverview.untrainedNumber'),
|
||||
value: this.totalPersonNum - this.totalEducationPerson,
|
||||
// value: this.totalPersonNum - this.totalEducationPerson,
|
||||
value: 0,
|
||||
label: {
|
||||
normal: {
|
||||
position: 'center',
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2,7 +2,7 @@
|
||||
<div class="fullHeight videoOverview">
|
||||
<closePage></closePage>
|
||||
<div class="header">
|
||||
<span>视频管理中心</span>
|
||||
<span>{{topTitle}}</span>
|
||||
</div>
|
||||
<div class="videoContent">
|
||||
<div class="videoListBox fullHeight">
|
||||
@ -87,7 +87,15 @@ export default {
|
||||
dataType: 1,
|
||||
activeNames: [0],
|
||||
screens: {},
|
||||
pluginType: ''
|
||||
pluginType: '',
|
||||
topTitle: '视频管理中心',
|
||||
COMPANY: COMPANY
|
||||
}
|
||||
},
|
||||
created() {
|
||||
console.log(COMPANY)
|
||||
if(COMPANY == 'agjt'){
|
||||
this.topTitle = "AI训练模型"
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@ -99,7 +107,6 @@ export default {
|
||||
// this.loadData2()
|
||||
// }
|
||||
this.loadData()
|
||||
|
||||
},
|
||||
|
||||
methods: {
|
||||
|
||||
@ -524,9 +524,9 @@ export default {
|
||||
openInfoDialog(){
|
||||
this.addInfoForm = {...this.supplierDetail}
|
||||
this.addInfoDialog = true
|
||||
// this.$nextTick(() => {
|
||||
// // this.$refs.addInfoForm.resetFields();
|
||||
// })
|
||||
this.$nextTick(() => {
|
||||
this.$refs.addInfoForm.clearValidate();
|
||||
})
|
||||
},
|
||||
// 获取企业类型列表
|
||||
getCompanyTypeList(){
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user