fix: BUG修改
This commit is contained in:
kun
parent
375f02960a
commit
6b9d7be619
@ -83,7 +83,7 @@ if (process.env.NODE_ENV == 'development') {
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
|
||||
// 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/' //沈阳和盈
|
||||
@ -91,7 +91,7 @@ if (process.env.NODE_ENV == 'development') {
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
|
||||
// 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://jxj.zhgdyun.com:15551/'//测试地址
|
||||
|
||||
|
||||
} else if (process.env.NODE_ENV == 'debug') {
|
||||
|
||||
@ -61,7 +61,7 @@ export default new Vuex.Store({
|
||||
"//" +
|
||||
window.location.host +
|
||||
"/upload/image", //正式环境
|
||||
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
|
||||
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
|
||||
// WORKFLOWURL: 'http://jxj.zhgdyun.com:9811/#/workspace/forms',//正式工作流地址
|
||||
//---------------------------------------------------------------------------------------------
|
||||
// BASEURL: baseUrl
|
||||
|
||||
@ -35,22 +35,22 @@
|
||||
v-model="workerName"
|
||||
:placeholder="
|
||||
$t('message.projectInfo.placeholder') +
|
||||
$t('message.projectInfo.name')
|
||||
$t('message.projectInfo.name')
|
||||
"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<!-- 查询-->
|
||||
<el-button type="primary" plain @click="query">{{
|
||||
$t('message.alarmWarning.query')
|
||||
$t("message.alarmWarning.query")
|
||||
}}</el-button>
|
||||
<!-- //刷新-->
|
||||
<el-button type="warning" plain @click="refresh">{{
|
||||
$t('message.alarmValueSet.refresh')
|
||||
$t("message.alarmValueSet.refresh")
|
||||
}}</el-button>
|
||||
<!-- 新增-->
|
||||
<el-button type="primary" @click="add">{{
|
||||
$t('message.videoManage.add')
|
||||
$t("message.videoManage.add")
|
||||
}}</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@ -87,7 +87,7 @@
|
||||
@click="configFn(scope.row)"
|
||||
>
|
||||
<!-- 配置企业 -->
|
||||
{{ $t('message.projectInfo.configCompany') }}
|
||||
{{ $t("message.projectInfo.configCompany") }}
|
||||
</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
@ -96,7 +96,7 @@
|
||||
@click="configFn2(scope.row, 1)"
|
||||
>
|
||||
<!-- 配置闸机 -->
|
||||
{{ $t('message.projectInfo.configGate') }}
|
||||
{{ $t("message.projectInfo.configGate") }}
|
||||
</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
@ -105,7 +105,7 @@
|
||||
@click="configFn2(scope.row, 2)"
|
||||
>
|
||||
<!-- 配置视频 -->
|
||||
{{ $t('message.projectInfo.configVideo') }}
|
||||
{{ $t("message.projectInfo.configVideo") }}
|
||||
</el-button>
|
||||
<div @click="edit(scope.row)" class="operationText">
|
||||
<img
|
||||
@ -113,7 +113,7 @@
|
||||
width="15px"
|
||||
height="15px"
|
||||
/>
|
||||
<span>{{ $t('message.alarmValueSet.edit') }}</span>
|
||||
<span>{{ $t("message.alarmValueSet.edit") }}</span>
|
||||
</div>
|
||||
<div @click="deleteDev(scope.row)" class="operationText">
|
||||
<img
|
||||
@ -121,7 +121,7 @@
|
||||
width="15px"
|
||||
height="15px"
|
||||
/>
|
||||
<span>{{ $t('message.alarmValueSet.delete') }}</span>
|
||||
<span>{{ $t("message.alarmValueSet.delete") }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@ -167,7 +167,7 @@
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
style="margin-bottom: 30px;"
|
||||
style="margin-bottom: 30px;"
|
||||
:label="$t('message.personnelAccess.LabPwd')"
|
||||
prop="password"
|
||||
v-if="!addEditForm.showPassword && addEditForm.showPassword != ''"
|
||||
@ -180,7 +180,7 @@
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
style="margin-bottom: 30px;"
|
||||
style="margin-bottom: 30px;"
|
||||
:label="$t('message.personnelAccess.LabPwd')"
|
||||
prop="showPassword"
|
||||
v-else
|
||||
@ -192,14 +192,8 @@
|
||||
:placeholder="$t('message.companyDiagram.PleaseEnter')"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="选择组织"
|
||||
prop="xzProjectOrgId"
|
||||
>
|
||||
<el-select
|
||||
v-model="selectVal"
|
||||
placeholder="请选择"
|
||||
>
|
||||
<el-form-item label="选择组织" prop="xzProjectOrgId">
|
||||
<el-select v-model="selectVal" placeholder="请选择">
|
||||
<el-option style="height:auto" :value="[]">
|
||||
<el-tree
|
||||
:data="treeList"
|
||||
@ -267,14 +261,14 @@
|
||||
@click="Popup.show = false"
|
||||
icon="el-icon-circle-close"
|
||||
size="medium"
|
||||
>{{ $t('message.alarmValueSet.cancel') }}
|
||||
>{{ $t("message.alarmValueSet.cancel") }}
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-circle-check"
|
||||
@click="submit"
|
||||
size="medium"
|
||||
>{{ $t('message.alarmValueSet.save') }}
|
||||
>{{ $t("message.alarmValueSet.save") }}
|
||||
</el-button>
|
||||
</div>
|
||||
</el-form>
|
||||
@ -296,7 +290,7 @@
|
||||
@change="handleCheckAllChange"
|
||||
>
|
||||
<!-- 全选 -->
|
||||
{{ $t('message.projectInfo.allChoose') }}
|
||||
{{ $t("message.projectInfo.allChoose") }}
|
||||
</el-checkbox>
|
||||
<div style="margin: 15px 0"></div>
|
||||
<el-checkbox-group
|
||||
@ -319,14 +313,14 @@
|
||||
@click="companyDialog = false"
|
||||
icon="el-icon-circle-close"
|
||||
size="medium"
|
||||
>{{ $t('message.alarmValueSet.cancel') }}
|
||||
>{{ $t("message.alarmValueSet.cancel") }}
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-circle-check"
|
||||
@click="saveCompanyFn"
|
||||
size="medium"
|
||||
>{{ $t('message.alarmValueSet.save') }}
|
||||
>{{ $t("message.alarmValueSet.save") }}
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
@ -350,7 +344,7 @@
|
||||
@change="handleCheckAllChange"
|
||||
>
|
||||
<!-- 全选 -->
|
||||
{{ $t('message.projectInfo.allChoose') }}
|
||||
{{ $t("message.projectInfo.allChoose") }}
|
||||
</el-checkbox>
|
||||
<div style="margin: 15px 0"></div>
|
||||
<div v-if="configDevType == 2">
|
||||
@ -391,14 +385,14 @@
|
||||
@click="configDevDialog = false"
|
||||
icon="el-icon-circle-close"
|
||||
size="medium"
|
||||
>{{ $t('message.alarmValueSet.cancel') }}
|
||||
>{{ $t("message.alarmValueSet.cancel") }}
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-circle-check"
|
||||
@click="saveDevConfigDataFn"
|
||||
size="medium"
|
||||
>{{ $t('message.alarmValueSet.save') }}
|
||||
>{{ $t("message.alarmValueSet.save") }}
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
@ -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;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user