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

flx:修复bug

Browse Source
This commit is contained in:
Rain_ 2025-09-10 20:15:48 +08:00
parent d7e70362ab
commit e76fc2656d
3 changed files with 79 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/views/companyAdmin/basicSafeSetup/checkItem.vue
View File

@ -54,11 +54,11 @@
<vue-scroll class="treeList"> <vue-scroll class="treeList">
<div style="padding-top: 10px"> <div style="padding-top: 10px">
<ul v-for="(ele, eIndex) in dataListUp" :key="eIndex"> <ul v-for="(ele, eIndex) in dataListUp" :key="eIndex">
<li :class="{ active: eIndex == ele.currentRight }"> <li :class="{ active: ele.id == ele.currentRight }">
<div class="clickName" @click="isOpen(ele, eIndex)"> <div class="clickName" @click="isOpen(ele, eIndex)">
<div class="imgbox"> <div class="imgbox">
<i <i
v-if="ele.currentRight != eIndex" v-if="ele.currentRight != ele.id"
class="el-icon-arrow-right" class="el-icon-arrow-right"
></i> ></i>
<i v-else class="el-icon-arrow-down"></i> <i v-else class="el-icon-arrow-down"></i>
@ -86,7 +86,7 @@
<ul <ul
id="child" id="child"
class="child1" class="child1"
v-if="ele.currentRight == eIndex" v-if="ele.currentRight == ele.id"
v-for="(name, index) in ele.children" v-for="(name, index) in ele.children"
:key="index" :key="index"
> >
@ -99,7 +99,7 @@
> >
<div class="imgbox"> <div class="imgbox">
<i <i
v-if="name.currentRight != index" v-if="name.currentRight != name.id"
class="el-icon-arrow-right" class="el-icon-arrow-right"
></i> ></i>
<i v-else class="el-icon-arrow-down"></i> <i v-else class="el-icon-arrow-down"></i>
@ -157,7 +157,7 @@
<ul <ul
v-for="(item, i) in name.children" v-for="(item, i) in name.children"
id="child2" id="child2"
v-if="name.currentRight == index" v-if="name.currentRight == name.id"
:key="i" :key="i"
> >
<!-- <li :class="{actives:index==current&&i==threeIndex}"> --> <!-- <li :class="{actives:index==current&&i==threeIndex}"> -->
@ -223,7 +223,12 @@
</div> </div>
</vue-scroll> </vue-scroll>
<div class="sidebar_btn2"> <div class="sidebar_btn2">
<el-button style="color: #b3b3b3" @click="setCheckedNodes" size="mini" type="text" plain <el-button
style="color: #b3b3b3"
@click="setCheckedNodes"
size="mini"
type="text"
plain
>全部展开</el-button >全部展开</el-button
> >
<el-button <el-button
@ -738,7 +743,10 @@ export default {
return { Authorization: this.$store.state.userInfo.token }; return { Authorization: this.$store.state.userInfo.token };
}, },
dataListUp() { dataListUp() {
const searchResult = this.fuzzySearchTree(this.dataList, this.riskListForm.name); const searchResult = this.fuzzySearchTree(
this.dataList,
this.riskListForm.name
);
return searchResult; return searchResult;
}, },
}, },
@ -753,7 +761,11 @@ export default {
result.push(newNode); result.push(newNode);
} else if (node.children && node.children.length > 0) { } else if (node.children && node.children.length > 0) {
// 递归查询子节点 // 递归查询子节点
const childrenResult = this.fuzzySearchTree(node.children, keyword, key); const childrenResult = this.fuzzySearchTree(
node.children,
keyword,
key
);
if (childrenResult.length > 0) { if (childrenResult.length > 0) {
newNode.children = childrenResult; newNode.children = childrenResult;
result.push(newNode); result.push(newNode);
@ -782,13 +794,13 @@ export default {
.catch(() => {}); .catch(() => {});
}, },
isOpen(ele, eIndex) { isOpen(ele, eIndex) {
const find = this.dataList.find(item => item.id == ele.id) const find = this.dataList.find((item) => item.id == ele.id);
if (find.currentRight == eIndex) { if (find.currentRight == ele.id) {
find.currentRight = -1; find.currentRight = -1;
return; return;
} }
find.currentRight = eIndex; find.currentRight = ele.id;
}, },
// 获取字典工程类别列表 // 获取字典工程类别列表
getDicProjectTypeList() { getDicProjectTypeList() {
@ -826,10 +838,10 @@ export default {
this.dataList.forEach((item, index) => { this.dataList.forEach((item, index) => {
if (item.children && item.children.length > 0) { if (item.children && item.children.length > 0) {
item.children.forEach((ele, index) => { item.children.forEach((ele, index) => {
this.$set(ele, "currentRight", index); this.$set(ele, "currentRight", ele.id);
}); });
} }
this.$set(item, "currentRight", index); this.$set(item, "currentRight", item.id);
}); });
console.log(this.dataList); console.log(this.dataList);
}, },
@ -956,7 +968,7 @@ export default {
this.dialogVisible = false; this.dialogVisible = false;
this.dialogVisible2 = false; this.dialogVisible2 = false;
this.dialogVisible3 = false; this.dialogVisible3 = false;
this.loadList(); this.loadList("unfold");
this.$message.success("更新成功！"); this.$message.success("更新成功！");
}); });
} else { } else {
@ -965,7 +977,7 @@ export default {
this.dialogVisible = false; this.dialogVisible = false;
this.dialogVisible2 = false; this.dialogVisible2 = false;
this.dialogVisible3 = false; this.dialogVisible3 = false;
this.loadList(); this.loadList("unfold");
this.$message.success("添加成功！"); this.$message.success("添加成功！");
}); });
} }
@ -1037,7 +1049,7 @@ export default {
message: "删除成功", message: "删除成功",
type: "success", type: "success",
}); });
this.loadList(); this.loadList("unfold");
this.loadRigthtList(); this.loadRigthtList();
} else { } else {
this.$message({ this.$message({
@ -1054,7 +1066,7 @@ export default {
message: "删除成功", message: "删除成功",
type: "success", type: "success",
}); });
this.loadList(); this.loadList("unfold");
this.loadRigthtList(); this.loadRigthtList();
} else { } else {
this.$message({ this.$message({
@ -1126,15 +1138,15 @@ export default {
this.threeData = []; this.threeData = [];
this.type = type; this.type = type;
this.parentid1 = data.id; this.parentid1 = data.id;
if (this.current == index || data.currentRight == index) { if (this.current == index || data.currentRight == data.id) {
this.current = -1; this.current = -1;
data.currentRight = -1; data.currentRight = -1;
} else { } else {
this.current = index; this.current = index;
data.currentRight = index; data.currentRight = data.id;
} }
}, },
loadList() { loadList(type) {
let param = { let param = {
sn: this.$store.state.userInfo.headquartersSn, sn: this.$store.state.userInfo.headquartersSn,
projectClassify: this.riskListForm.projectClassify, projectClassify: this.riskListForm.projectClassify,
@ -1164,6 +1176,11 @@ export default {
...item, ...item,
}; };
}); });
if (type == "unfold") {
this.$nextTick(() => {
this.setCheckedNodes();
});
}
// if(res.result.length>0){ // if(res.result.length>0){
// } // }

56
src/views/companyAdmin/companyDiagram.vue
View File

@ -8,7 +8,7 @@
v-if=" v-if="
($store.state.userInfo.addProjectType == 1 && ($store.state.userInfo.addProjectType == 1 &&
$store.state.userInfo.accountType != 7) || $store.state.userInfo.accountType != 7) ||
$store.state.userInfo.addProjectType == 0 $store.state.userInfo.addProjectType == 0
" "
class="plusBtn" class="plusBtn"
@click=" @click="
@ -345,7 +345,7 @@
<div <div
@click="editGroup(scope.row)" @click="editGroup(scope.row)"
class="operationText" class="operationText"
style="margin-right: 10px;" style="margin-right: 10px"
> >
<i class="el-icon-s-operation"></i> <i class="el-icon-s-operation"></i>
<span>调整组织</span> <span>调整组织</span>
@ -353,7 +353,7 @@
<div <div
@click="deleteAccountFn(scope.row)" @click="deleteAccountFn(scope.row)"
class="operationText" class="operationText"
style="margin-right: 10px;" style="margin-right: 10px"
> >
<img <img
src="@/assets/images/icon-delete.png" src="@/assets/images/icon-delete.png"
@ -1204,11 +1204,11 @@
> >
<div class="dialog_content"> <div class="dialog_content">
<div class="dialog_content-part"> <div class="dialog_content-part">
<div class="dialog-search" style="margin-top: 20px;"> <div class="dialog-search" style="margin-top: 20px">
<el-input <el-input
placeholder="请输入组织名称搜索" placeholder="请输入组织名称搜索"
suffix-icon="el-icon-search" suffix-icon="el-icon-search"
style="flex: 1;" style="flex: 1"
v-model="filterText" v-model="filterText"
size="small" size="small"
> >
@ -1288,7 +1288,7 @@
<el-input <el-input
placeholder="请输入组织名称搜索" placeholder="请输入组织名称搜索"
suffix-icon="el-icon-search" suffix-icon="el-icon-search"
style="flex: 1;" style="flex: 1"
v-model="filterText" v-model="filterText"
size="small" size="small"
> >
@ -1351,12 +1351,16 @@
</div> </div>
</el-dialog> </el-dialog>
<largeScreenConfig :uniqueFlag="this.uniqueFlag" :authType="this.authType" v-model="largeVisible" ></largeScreenConfig> <largeScreenConfig
:uniqueFlag="this.uniqueFlag"
:authType="this.authType"
v-model="largeVisible"
></largeScreenConfig>
</div> </div>
</template> </template>
<script> <script>
import gdMap from "../../components/map/gd-map"; import gdMap from "../../components/map/gd-map";
import largeScreenConfig from '@/views/jxjadmin/largeScreenConfig.vue' import largeScreenConfig from "@/views/jxjadmin/largeScreenConfig.vue";
import { import {
getCompanyProjectListApi, getCompanyProjectListApi,
addCompanyApi, addCompanyApi,
@ -1403,7 +1407,7 @@ import { checkPhone } from "@/assets/js/util.js";
export default { export default {
components: { components: {
gdMap, gdMap,
largeScreenConfig largeScreenConfig,
}, },
data() { data() {
var checkAge = (rule, value, callback) => { var checkAge = (rule, value, callback) => {
@ -1528,7 +1532,8 @@ export default {
trigger: "blur", trigger: "blur",
}, },
{ {
pattern: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[!@#$%^&*()_+~`\-={}[\]:";'<>?,./])[a-zA-Z\d!@#$%^&*()_+~`\-={}[\]:";'<>?,./]{8,}$/, pattern:
/^(?=.*\d)(?=.*[a-zA-Z])(?=.*[!@#$%^&*()_+~`\-={}[\]:";'<>?,./])[a-zA-Z\d!@#$%^&*()_+~`\-={}[\]:";'<>?,./]{8,}$/,
message: message:
"密码必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数", "密码必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数",
trigger: "blur", trigger: "blur",
@ -1541,7 +1546,8 @@ export default {
trigger: "blur", trigger: "blur",
}, },
{ {
pattern: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[!@#$%^&*()_+~`\-={}[\]:";'<>?,./])[a-zA-Z\d!@#$%^&*()_+~`\-={}[\]:";'<>?,./]{8,}$/, pattern:
/^(?=.*\d)(?=.*[a-zA-Z])(?=.*[!@#$%^&*()_+~`\-={}[\]:";'<>?,./])[a-zA-Z\d!@#$%^&*()_+~`\-={}[\]:";'<>?,./]{8,}$/,
message: message:
"密码必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数", "密码必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数",
trigger: "blur", trigger: "blur",
@ -2200,7 +2206,8 @@ export default {
// }) // })
}, },
mounted() { mounted() {
this.addCompanyForm.headquartersSn = this.$store.state.userInfo.headquartersSn; this.addCompanyForm.headquartersSn =
this.$store.state.userInfo.headquartersSn;
this.getModuleList(); this.getModuleList();
this.initData(); this.initData();
this.loadProvincesCityList(); this.loadProvincesCityList();
@ -2209,9 +2216,9 @@ export default {
}, },
methods: { methods: {
handleSettingLarge(authType, uniqueFlag) { handleSettingLarge(authType, uniqueFlag) {
this.authType = authType this.authType = authType;
this.uniqueFlag = uniqueFlag this.uniqueFlag = uniqueFlag;
this.largeVisible = true this.largeVisible = true;
}, },
filterNode(value, data) { filterNode(value, data) {
if (!value) return true; if (!value) return true;
@ -3344,8 +3351,10 @@ export default {
this.editGroupDialog = true; this.editGroupDialog = true;
this.filterText = ""; this.filterText = "";
// 打开弹窗时调用上面的接口勾选 // 打开弹窗时调用上面的接口勾选
const res = await getSelectedGroupApi({ userId: row.userId, const res = await getSelectedGroupApi({
headquartersSn: this.$store.state.userInfo.headquartersSn, }); userId: row.userId,
headquartersSn: this.$store.state.userInfo.headquartersSn,
});
// 打开弹窗时调用上面的接口勾选 // 打开弹窗时调用上面的接口勾选
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.groupTree.setCheckedKeys(this.getRelativeKeys(res.result)); this.$refs.groupTree.setCheckedKeys(this.getRelativeKeys(res.result));
@ -3554,7 +3563,9 @@ export default {
item.provincesCode, item.provincesCode,
item.cityCode, item.cityCode,
item.areaCode, item.areaCode,
]; ].filter((item) => item);
console.log(this.provincesCityArr);
}, 200); }, 200);
}); });
}, },
@ -3568,8 +3579,8 @@ export default {
} }
this.$refs["addProjectForm"].validate((valid) => { this.$refs["addProjectForm"].validate((valid) => {
if (valid) { if (valid) {
console.log(this.addProjectForm);
if (this.isAdd) { if (this.isAdd) {
console.log(this.addProjectForm);
addProjectApi(this.addProjectForm).then((res) => { addProjectApi(this.addProjectForm).then((res) => {
console.log("添加成功", res); console.log("添加成功", res);
this.addProjectDialog = false; this.addProjectDialog = false;
@ -3579,7 +3590,12 @@ export default {
); //添加成功！ ); //添加成功！
}); });
} else { } else {
editProjectApi(this.addProjectForm).then((res) => { editProjectApi({
...this.addProjectForm,
areaCode: this.addProjectForm.areaCode
? this.addProjectForm.areaCode
: "",
}).then((res) => {
console.log("信息编辑", res); console.log("信息编辑", res);
this.addProjectDialog = false; this.addProjectDialog = false;
this.initData(); this.initData();

7
src/views/projectFront/workTicketManage/homeworkControlProcess.vue
View File

@ -998,7 +998,9 @@
v-for="item in workTicketDetail.otherAttachment" v-for="item in workTicketDetail.otherAttachment"
:key="item.url" :key="item.url"
> >
<div> <div @click="perviewFile(
$store.state.FILEURL + item.url
)">
<i class="el-icon-files"></i> <i class="el-icon-files"></i>
<div>{{ item.name }}</div> <div>{{ item.name }}</div>
</div> </div>
@ -2037,6 +2039,9 @@ export default {
console.error(error); console.error(error);
}); });
}, },
perviewFile(url) {
window.open(url, "_blank");
},
}, },
computed: { computed: {
itemListDevNameUp() { itemListDevNameUp() {