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:
X_Rian 2024-07-26 17:15:30 +08:00
parent 3b9a5a506c
commit ed342725af
7 changed files with 74 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/store/index.js
View File

@ -59,7 +59,7 @@ export default new Vuex.Store({
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", //坤工作流地址(本地)
WORKFLOWURL: "http://192.168.34.175:88/#/workspace/forms", //罗峰工作流地址(本地)
WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地)
CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.175:5173/#/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程

9
src/views/projectFront/configManage/personnelAccess.vue
View File

@ -307,6 +307,7 @@
>
<el-select
v-model="addEditForm.roleId"
multiple
filterable
:placeholder="$t('message.personnelAccess.juese')"
>
@ -662,7 +663,7 @@ export default {
{
required: true,
message: "请选择",
trigger: "blur",
trigger: "change",
},
],
userId: [
@ -683,7 +684,7 @@ export default {
{
required: true,
message: this.$t("message.personnelPosition.required"),
trigger: "blur",
trigger: "change",
},
],
},
@ -1166,7 +1167,7 @@ export default {
this.selectTreeData = {};
this.selectVal = "";
this.defaultExpandArr = [];
this.$refs.groupTree.setCurrentKey("");
// this.$refs.groupTree.setCurrentKey("");
});
},
edit(obj) {
@ -1189,6 +1190,7 @@ export default {
this.selectVal = "";
this.defaultExpandArr = [];
}
this.addEditForm.roleId = obj.roleId.split(',');
this.handle("edit", true);
this.$nextTick(() => {
if (this.addEditForm.xzProjectOrgObj) {
@ -1234,6 +1236,7 @@ export default {
if (this.selectVal) {
params.xzProjectOrgObj = JSON.stringify(this.selectTreeData);
}
params.roleId = this.addEditForm.roleId.join(",");
if (this.Popup.type === "add") {
addProjectUserApi(params).then((result) => {
if (result.success) {

10
src/views/projectFront/dangerousBigProject/checkTable.vue
View File

@ -237,7 +237,7 @@
</div>
</div>
<div class="table_box" style="margin: 13px">
<el-table height="652px" :data="threeData" class="tables">
<el-table height="671px" :data="threeData" class="tables">
<el-table-column
type="index"
label="序号"
@ -325,6 +325,9 @@
label="检查内容"
align="center"
>
<template slot-scope="scope">
{{ scope.row.checkContent }}
</template>
</el-table-column>
<el-table-column
prop="checkDetailContent"
@ -693,7 +696,10 @@ export default {
checkDetailContent: [{ required: true, message: "必填", trigger: "blur" }],
},
addCheckTable: {
optionResult: []
optionResult: [],
remark:"",
tableName:"",
createTime:"",
},
addTable: false,
resultList: [

1
src/views/projectFront/examSystem2/examRegulation/examRegulation.vue
View File

@ -260,6 +260,7 @@ export default {
url: this.$store.state.FILEURL + file.response.data[0].imageUrl
})
this.addEditForm.fileUrl = JSON.stringify(this.fileList)
this.$refs.addEditForm.clearValidate("fileUrl")
console.log('===========fileList===========',this.fileList)
console.log('===========addEditForm===========',this.addEditForm)

1
src/views/projectFront/examSystem2/safetyManual/safetyManual.vue
View File

@ -259,6 +259,7 @@ export default {
url: this.$store.state.FILEURL + file.response.data[0].imageUrl
})
this.addEditForm.fileUrl = JSON.stringify(this.fileList)
this.$refs.addEditForm.clearValidate("fileUrl")
console.log('===========fileList===========',this.fileList)
console.log('===========addEditForm===========',this.addEditForm)

12
src/views/projectFront/examSystem2/trainRecord/trainPlan.vue
View File

@ -766,7 +766,11 @@ export default {
},
async addlocal() {
await this.getWorkerInfoList();
this.echoFn();
this.dialogVisible3 = true;
},
echoFn(){
setTimeout(() => {
this.$nextTick(() => {
for (let i = 0; i < this.workerList.length; i++) {
@ -783,7 +787,6 @@ export default {
}
});
}, 10);
this.dialogVisible3 = true;
},
localSubmitBtn() {
this.selectedWorkerList = this.$refs.multipleTable.selection;
@ -833,7 +836,7 @@ export default {
});
}, 10);
},
async getWorkerInfoList() {
getWorkerInfoList() {
// this.workerInfo.departmentAndTeam.gtMaterialDepartmentTeamId = ''
let data = {
workerName: this.workerInfo.workerName,
@ -869,10 +872,11 @@ export default {
: "";
}
}
await getWorkerInfoListApi(data).then((res) => {
getWorkerInfoListApi(data).then((res) => {
if (res.code == 200) {
console.log(res.result.records);
this.workerList = res.result.records;
this.echoFn();
this.worker.total = res.result.total;
}
});

49
src/views/projectFront/safeSame/v2/projectSelfInspection.vue
View File

@ -116,6 +116,23 @@
{{ scope.row.startTime }} 至 {{ scope.row.endTime }}
</template>
</el-table-column>
<!-- <el-table-column
prop="inspectNum"
label="任务状态"
align="center"
>
<template slot-scope="scope">
<div class="stateItem">
<div>
3/10
</div>
bg-cbad14(进行中) bg-57b54b(已完成) bg-6389f6(未开始) bg-ffc8c8(已逾期)
<div class="bg-ffc8c8">
已逾期
</div>
</div>
</template>
</el-table-column> -->
<!-- 隐患总数 -->
<el-table-column
prop="inspectNum"
@ -647,6 +664,38 @@ export default {
}
</script>
<style lang="less" scoped>
.stateItem{
display: flex;
align-items: center;
justify-content: center;
>div:last-child {
margin-left: 10px;
padding: 2px 5px;
border-radius: 5px;
}
.bg-ffc8c8 {
background-color: #FFC8C8;
color:#FF5A5F;
border: 1px solid #FF5A5F;
}
.bg-6389f6 {
background-color: #D9E3FD;
color:#6389F6;
border: 1px solid #6389F6;
}
.bg-57b54b {
background-color: #C2E8BD;
color:#57B54B;
border: 1px solid #57B54B;
}
.bg-cbad14 {
background-color: #F4E9AB;
color:#CBAD14;
border: 1px solid #CBAD14;
}
}
.filterBox {
margin: 15px;
}