{{ $t('message.alarmValueSet.cancel') }}
+ >{{ $t("message.alarmValueSet.cancel") }}
{{ $t('message.alarmValueSet.save') }}
+ >{{ $t("message.alarmValueSet.save") }}
@@ -350,7 +344,7 @@
@change="handleCheckAllChange"
>
- {{ $t('message.projectInfo.allChoose') }}
+ {{ $t("message.projectInfo.allChoose") }}
@@ -391,14 +385,14 @@
@click="configDevDialog = false"
icon="el-icon-circle-close"
size="medium"
- >{{ $t('message.alarmValueSet.cancel') }}
+ >{{ $t("message.alarmValueSet.cancel") }}
{{ $t('message.alarmValueSet.save') }}
+ >{{ $t("message.alarmValueSet.save") }}
@@ -436,7 +430,7 @@ export default {
},
data() {
return {
- defaultExpandArr: [],
+ defaultExpandArr: [],
// 对应的字段
defaultProps: {
children: "children",
@@ -445,7 +439,7 @@ export default {
treeList: [],
selectVal: "",
selectTreeData: {},
- workerName: '',
+ workerName: "",
addEditForm: {
account: "",
password: "",
@@ -470,9 +464,10 @@ export default {
},
{
pattern: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[!@#$%^&*()_+~`\-={}[\]:";'<>?,./])[a-zA-Z\d!@#$%^&*()_+~`\-={}[\]:";'<>?,./]{8,}$/,
- message: '密码必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数',
- trigger: 'blur'
- }
+ message:
+ "密码必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数",
+ trigger: "blur",
+ },
],
showPassword: [
{
@@ -482,22 +477,30 @@ export default {
},
{
pattern: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[!@#$%^&*()_+~`\-={}[\]:";'<>?,./])[a-zA-Z\d!@#$%^&*()_+~`\-={}[\]:";'<>?,./]{8,}$/,
- message: '密码必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数',
- trigger: 'blur'
- }
+ message:
+ "密码必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数",
+ trigger: "blur",
+ },
+ ],
+ xzProjectOrgId: [
+ {
+ required: true,
+ message: "请选择",
+ trigger: "blur",
+ },
],
userId: [
{
required: true,
message: this.$t("message.personnelPosition.required"),
- trigger: "blur",
+ trigger: "change",
},
],
roleId: [
{
required: true,
message: this.$t("message.personnelPosition.required"),
- trigger: "blur",
+ trigger: "change",
},
],
workerId: [
@@ -506,7 +509,7 @@ export default {
message: this.$t("message.personnelPosition.required"),
trigger: "blur",
},
- ]
+ ],
},
List: [],
Popup: {
@@ -537,7 +540,7 @@ export default {
methods: {
getTreeList() {
getTreeGroupApi({
- projectSn: this.$store.state.projectSn
+ projectSn: this.$store.state.projectSn,
}).then((result) => {
if (result.success) {
this.treeList = result.result;
@@ -550,6 +553,7 @@ export default {
this.selectVal = data.deptName;
this.selectTreeData = data;
this.addEditForm.xzProjectOrgId = data.id;
+ // this.$refs.addEditForm.validateField("xzProjectOrgId")
},
configFn(item) {
this.companyDialog = true;
@@ -560,14 +564,14 @@ export default {
console.log(id);
this.editComapnyDataId = res.result.id;
if (id.indexOf(",") != -1) {
- let arr = []
- this.enterpriseListData.forEach(item => {
+ let arr = [];
+ this.enterpriseListData.forEach((item) => {
for (let i = 0; i < id.split(",").length; i++) {
if (item.id == id.split(",")[i]) {
- arr.push(id.split(",")[i])
+ arr.push(id.split(",")[i]);
}
}
- })
+ });
this.selectCompanyData = arr;
} else {
this.selectCompanyData = [id];
@@ -594,26 +598,26 @@ export default {
console.log(res.result.devId);
this.editComapnyDataId = res.result.id;
if (id.indexOf(",") != -1) {
- let arr = []
+ let arr = [];
console.log(this.allUfaceDev, this.allVideoDev);
if (this.configDevType == 1) {
- this.allUfaceDev.forEach(item => {
+ this.allUfaceDev.forEach((item) => {
for (let i = 0; i < id.split(",").length; i++) {
if (item.id == id.split(",")[i]) {
- arr.push(id.split(",")[i])
+ arr.push(id.split(",")[i]);
}
}
- })
+ });
} else {
- this.allVideoDev.forEach(item => {
+ this.allVideoDev.forEach((item) => {
for (let i = 0; i < id.split(",").length; i++) {
if (item.itemId == id.split(",")[i]) {
- arr.push(id.split(",")[i])
+ arr.push(id.split(",")[i]);
}
}
- })
+ });
}
- console.log(arr, id)
+ console.log(arr, id);
this.selectCompanyData = arr;
// this.selectCompanyData = id.split(",");
} else {
@@ -655,11 +659,11 @@ export default {
}
}
// console.log(arr)
- //
+ //
let checkedCount = this.selectCompanyData.length;
console.log(this.selectCompanyData);
this.checkAll = checkedCount === arr.length;
- console.log(this.checkAll = checkedCount === arr.length);
+ console.log((this.checkAll = checkedCount === arr.length));
console.log(checkedCount, checkedCount, arr.length);
this.isIndeterminate = checkedCount > 0 && checkedCount < arr.length;
},
@@ -739,10 +743,16 @@ export default {
},
query() {
console.log("查询的参数", this.queryInfo);
- this.getList()
+ this.getList();
},
add() {
this.handle("add", true);
+ this.$nextTick(() => {
+ this.selectTreeData = {};
+ this.selectVal = "";
+ this.defaultExpandArr = [];
+ this.$refs.groupTree.setCurrentKey("");
+ })
},
edit(obj) {
console.log("编辑", obj);
@@ -767,7 +777,8 @@ export default {
this.handle("edit", true);
this.$nextTick(() => {
if (this.addEditForm.xzProjectOrgObj) {
- this.$refs.groupTree.setCurrentKey(this.addEditForm.xzProjectOrgId);
+ this.$refs.groupTree.setCurrentKey(this.addEditForm.xzProjectOrgId);
+ this.$refs.addEditForm.clearValidate();
}
});
},
@@ -775,9 +786,9 @@ export default {
console.log("删除", obj);
this.$confirm(
this.$t("message.personnelPosition.beaconManage.table.confirmText") +
- "【" +
- obj.workerName +
- "】?",
+ "【" +
+ obj.workerName +
+ "】?",
this.$t("message.personnelPosition.beaconManage.table.Tips"),
{
confirmButtonText: this.$t(
@@ -797,7 +808,7 @@ export default {
}
});
})
- .catch(() => { });
+ .catch(() => {});
},
submit() {
this.$refs["addEditForm"].validate((valid) => {
@@ -805,7 +816,7 @@ export default {
let params = this.addEditForm;
// params.alarmPushWorkerId = this.addEditForm.alarmPushWorkerId.join(',');
params.sn = this.$store.state.projectSn;
- if(this.selectVal){
+ if (this.selectVal) {
params.xzProjectOrgObj = JSON.stringify(this.selectTreeData);
}
if (this.Popup.type === "add") {
@@ -833,13 +844,13 @@ export default {
});
},
refresh() {
- this.workerName = ''
+ this.workerName = "";
this.getList();
},
getList() {
getProjectChilderSystemUserListApi({
projectSn: this.$store.state.projectSn,
- workerName: this.workerName
+ workerName: this.workerName,
}).then((result) => {
if (result.success) {
this.List = result.result;