fix: BUG修改

This commit is contained in:
kun 2023-07-27 16:05:49 +08:00
parent 230ac446e2
commit 988a39e157
19 changed files with 287 additions and 168 deletions

View File

@ -377,7 +377,7 @@
// border-bottom: 1px solid var(--el-border-color-lighter);
.el-dialog__title {
font-size: 24px;
color: white;
color: var(--el-menu-text-color);
}
}
.el-dialog__footer {
@ -500,6 +500,7 @@
width: 18px !important;
height: 18px !important;
background-color: transparent;
border: 1px solid var(--el-color-primary);
}
.el-radio__input.is-checked .el-radio__inner {
width: 18px !important;

View File

@ -579,13 +579,53 @@ watch(
<style scoped lang="scss">
.leftMenu {
width: 300px;
background-color: #092945;
// width: 290px;
//
:deep(.item) {
height: 78px !important;
}
:deep(.content) {
height: calc(100% - 160px) !important;
:deep() {
.item {
height: 78px !important;
}
.content {
height: calc(100% - 160px) !important;
}
.tab {
color: white;
}
.tab.active {
color: #0bc4f0;
}
.isActive {
background-color: #09314e;
}
.el-pager li {
background-color: transparent !important;
color: white !important;
font-size: 20px !important;
border: 1px solid #087ba4 !important;
height: 26px !important;
}
.el-pager li:active {
color: white !important;
font-size: 20px !important;
border: none !important;
height: 26px !important;
}
.el-pager li.is-active {
background-color: #087ba4 !important;
color: white !important;
font-size: 20px !important;
}
.btn-prev,
.btn-next,
.btn-prev:disabled,
.btn-next:disabled {
color: white !important;
font-size: 20px !important;
background-color: transparent !important;
border: 1px solid #087ba4 !important;
height: 26px !important;
}
}
.leftProject {
// padding: 5px 8px;

View File

@ -23,7 +23,7 @@
// font-weight: 700;
font-family: "siyuan_Medium";
font-size: 20px;
color: #ffffff;
color: var(--el-menu-text-color);
text-overflow: ellipsis;
white-space: nowrap;
}
@ -35,7 +35,7 @@
.middleSize {
display: inline-block;
font-size: 18px;
color: #c4c4c4;
color: var(--el-menu-text-color);
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;

View File

@ -20,10 +20,6 @@
<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
</div>
<!-- <div>
<img src="@/assets/images/AIwaring/报警.png" alt="" />
<span class="middleSize">今日报警次数{{ data.todayAlarm }}</span>
</div> -->
</div>
</div>
</div>

View File

@ -24,7 +24,7 @@
// font-weight: 700;
font-family: "siyuan_Medium";
font-size: 20px;
color: #ffffff;
color: var(--el-menu-text-color);
text-overflow: ellipsis;
white-space: nowrap;
}
@ -36,7 +36,7 @@
.middleSize {
display: inline-block;
font-size: 18px;
color: #c4c4c4;
color: var(--el-menu-text-color);
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;

View File

@ -52,7 +52,7 @@
style="margin-left: 20px"
:show-file-list="false"
>
<el-button type="primary">导入</el-button>
<el-button class="hzStyle" type="primary">导入</el-button>
</el-upload>
</template>
<!-- 表格操作 -->

View File

@ -24,7 +24,7 @@
// font-weight: 700;
font-family: "siyuan_Medium";
font-size: 20px;
color: #ffffff;
color: var(--el-menu-text-color);
text-overflow: ellipsis;
white-space: nowrap;
}
@ -36,7 +36,7 @@
.middleSize {
display: inline-block;
font-size: 18px;
color: #c4c4c4;
color: var(--el-menu-text-color);
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;

View File

@ -25,7 +25,7 @@
// font-weight: 700;
font-family: "siyuan_Medium";
font-size: 20px;
color: #ffffff;
color: var(--el-menu-text-color);
text-overflow: ellipsis;
white-space: nowrap;
}
@ -34,14 +34,17 @@
justify-content: space-between;
margin-top: 10px;
overflow: hidden;
.middleSize {
display: inline-block;
font-size: 18px;
color: var(--el-menu-text-color);
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.video {
display: flex;
align-items: center;
.middleSize {
font-size: 18px;
color: #c4c4c4;
white-space: nowrap;
}
img {
width: 14px;
height: 14px;

View File

@ -15,9 +15,11 @@
(data as ResAiProjectPage).projectName || (data as ResAiEngineerPage).engineeringName
}}</span>
<div class="leftMenu_item">
<div class="video">
<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
<div class="leftMenu_item flx-justify-between">
<div style="margin-top: 5px" class="flx-justify-between">
<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
</div>
</div>
</div>
</div>

View File

@ -24,7 +24,7 @@
// font-weight: 700;
font-family: "siyuan_Medium";
font-size: 20px;
color: #ffffff;
color: var(--el-menu-text-color);
text-overflow: ellipsis;
white-space: nowrap;
}
@ -36,7 +36,7 @@
.middleSize {
display: inline-block;
font-size: 18px;
color: #c4c4c4;
color: var(--el-menu-text-color);
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;

View File

@ -24,7 +24,7 @@
// font-weight: 700;
font-family: "siyuan_Medium";
font-size: 20px;
color: #ffffff;
color: var(--el-menu-text-color);
text-overflow: ellipsis;
white-space: nowrap;
}
@ -35,7 +35,7 @@
overflow: hidden;
.middleSize {
font-size: 18px;
color: #c4c4c4;
color: var(--el-menu-text-color);
display: inline-block;
width: 100%;
white-space: nowrap;

View File

@ -286,95 +286,103 @@
<el-button type="primary" @click="submitForm">提交</el-button>
</div>
</div>
<!-- 工程/项目库 -->
<el-dialog v-model="projectVisible" custom-class="project-style" width="100%">
<template #title>
<div style="border-left: 2px solid #0f81ff; font-size: 20px; color: var(--el-menu-text-color)">
<span style="margin-left: 5px">选择工程/项目</span>
</div>
</template>
<div class="content-select">
<div class="left-menu">
<el-tree :data="projectData" style="margin-top: 10px" :highlight-current="true" node-key="id">
<template #default="{ node, data }">
<span class="custom-tree-node" @click.capture="selectProjectTree(data)">
<span>{{ data.label }}</span>
</span>
</template>
</el-tree>
</div>
<div class="right-menu">
<div class="table-select" v-if="projectTreeData.id">
<span style="margin: 0 10px 2px 0">工程/项目名称</span>
<el-input style="width: 200px" v-model="projectForm.name" placeholder="请输入" clearable />
<el-button type="primary" style="margin-left: 20px" @click="searchData">查询</el-button>
</div>
<div class="table" v-if="projectTreeData.id">
<el-table
style="width: 100%; height: 350px"
ref="multipleTable"
:data="projectTableData"
tooltip-effect="dark"
@row-click="projectRowClick"
>
<!-- <el-table-column type="selection" width="55"></el-table-column> -->
<el-table-column
prop="engineeringName"
align="center"
label="工程名称"
v-if="projectTreeData.id == 1"
></el-table-column>
<el-table-column
prop="projectName"
align="center"
label="项目名称"
v-if="projectTreeData.id == 2"
></el-table-column>
<el-table-column prop="roleName" label="用户名称"></el-table-column>
<el-table-column prop="userTel" label="手机号码"></el-table-column>
</el-table>
</div>
</div>
</el-dialog>
<!-- 工程/项目库 -->
<el-dialog v-model="projectVisible" custom-class="project-style" width="60%">
<template #title>
<div style="border-left: 2px solid #0f81ff; font-size: 20px; color: var(--el-menu-text-color)">
<span style="margin-left: 5px">选择工程/项目</span>
</div>
<!-- <template #footer>
<span class="dialog-footer">
<el-button @click="projectVisible = false"> </el-button>
<el-button type="primary" @click="projectVisible = false"> </el-button>
</span>
</template> -->
</el-dialog>
<!-- 检查人员 -->
<el-dialog v-model="memberVisible" style="width: 500px" custom-class="project-style">
<template #title>
<div style="border-left: 2px solid #0f81ff; font-size: 20px; color: #333333">
<span style="margin-left: 5px">添加检查人员</span>
</template>
<div class="content-select">
<div class="left-menu">
<el-tree :data="projectData" style="margin-top: 10px" :highlight-current="true" node-key="id">
<template #default="{ node, data }">
<span class="custom-tree-node" @click.capture="selectProjectTree(data)">
<span>{{ data.label }}</span>
</span>
</template>
</el-tree>
</div>
<div class="right-menu">
<div class="table-select" v-if="projectTreeData.id">
<span style="margin: 0 10px 2px 0">工程/项目名称</span>
<el-input style="width: 200px" v-model="projectForm.name" placeholder="请输入" clearable />
<el-button type="primary" style="margin-left: 20px" @click="searchData">查询</el-button>
</div>
</template>
<div class="content-select">
<div class="member-menu">
<div class="table" v-if="projectTreeData.id">
<el-table
style="width: 100%; height: 350px"
ref="multipleTable"
:data="membertableData"
row-key="userId"
:data="projectTableData"
tooltip-effect="dark"
@selection-change="handleSelectionChange"
@row-click="projectRowClick"
>
<el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
<el-table-column prop="realName" label="检查人员"></el-table-column>
<!-- <el-table-column type="selection" width="55"></el-table-column> -->
<el-table-column
prop="engineeringName"
align="center"
label="工程名称"
v-if="projectTreeData.id == 1"
></el-table-column>
<el-table-column
prop="projectName"
align="center"
label="项目名称"
v-if="projectTreeData.id == 2"
></el-table-column>
<el-table-column prop="roleName" label="用户名称"></el-table-column>
<el-table-column prop="userTel" label="手机号码"></el-table-column>
</el-table>
</div>
</div>
<template #footer>
<span class="dialog-footer">
<el-button @click="memberVisible = false"> </el-button>
<el-button type="primary" @click="confirmMemberSelected"> </el-button>
</span>
</template>
</el-dialog>
</div>
<!-- <template #footer>
<span class="dialog-footer">
<el-button @click="projectVisible = false"> </el-button>
<el-button type="primary" @click="projectVisible = false"> </el-button>
</span>
</template> -->
</el-dialog>
<!-- 检查人员 -->
<el-dialog v-model="memberVisible" style="width: 700px" custom-class="project-style">
<template #title>
<div style="border-left: 2px solid #0f81ff; font-size: 20px; color: var(--el-menu-text-color)">
<span style="margin-left: 5px">添加检查人员</span>
</div>
</template>
<div class="content-select">
<div class="member-menu">
<el-table
ref="multipleTable"
:data="membertableData"
height="400"
row-key="userId"
tooltip-effect="dark"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
<el-table-column prop="realName" label="检查人员"></el-table-column>
<el-table-column prop="roleName" label="用户名称"></el-table-column>
<el-table-column prop="userTel" label="手机号码"></el-table-column>
<template #empty>
<div class="table-empty">
<slot name="empty">
<img src="@/assets/images/notData.png" alt="notData" />
<div>暂无数据</div>
</slot>
</div>
</template>
</el-table>
</div>
</div>
<template #footer>
<span class="dialog-footer">
<el-button class="hzCancelStyle" @click="memberVisible = false"> </el-button>
<el-button class="hzStyle" type="primary" @click="confirmMemberSelected"> </el-button>
</span>
</template>
</el-dialog>
<!-- 隐患库 -->
<el-dialog v-model="storeVisible" style="width: 800px" custom-class="store-style">
<template #title>
@ -482,6 +490,7 @@ const transformDialog = ref(false); // 整改记录对话框
const recordData = ref([]); //
const basicData = ref({
//
requireType: 1,
opSignature: [],
supervisorSignature: [],
inspectSignature: [],
@ -687,10 +696,34 @@ const submitForm = async () => {
};
//
const allSubmit = async () => {
if (!(projectSelectedData.value.projectName || projectSelectedData.value.engineeringName)) {
ElMessage.error("请选择工程/项目");
return;
}
if (!basicData.value.selectedMember) {
ElMessage.error("请选择检查人员");
return;
}
if (!basicData.value.deadline) {
ElMessage.error("请选择整改期限");
return;
}
if (basicData.value.opSignature.length == 0) {
ElMessage.error("请上传施工单位责任人签名");
return;
}
if (basicData.value.supervisorSignature.length == 0) {
ElMessage.error("请上传监理单位责任人签名");
return;
}
if (basicData.value.inspectSignature.length == 0) {
ElMessage.error("请上传检查人员责任人签名");
return;
}
if (basicData.value.otherSignature.length == 0) {
ElMessage.error("请上传其他单位责任人签名");
return;
}
recordData.value.map(item => {
item.image = JSON.stringify(item.image);
});
@ -731,6 +764,7 @@ watch(
visible1.value = n;
if (n) {
basicData.value = {
requireType: 1,
opSignature: [],
supervisorSignature: [],
inspectSignature: [],

View File

@ -23,7 +23,7 @@
// font-weight: 700;
font-family: "siyuan_Medium";
font-size: 20px;
color: #ffffff;
color: var(--el-menu-text-color);
text-overflow: ellipsis;
white-space: nowrap;
}
@ -34,7 +34,7 @@
overflow: hidden;
.middleSize {
font-size: 18px;
color: #c4c4c4;
color: var(--el-menu-text-color);
display: inline-block;
width: 100%;
white-space: nowrap;

View File

@ -23,7 +23,7 @@
// font-weight: 700;
font-family: "siyuan_Medium";
font-size: 20px;
color: #ffffff;
color: var(--el-menu-text-color);
text-overflow: ellipsis;
white-space: nowrap;
}
@ -34,7 +34,7 @@
overflow: hidden;
.middleSize {
font-size: 18px;
color: #c4c4c4;
color: var(--el-menu-text-color);
display: inline-block;
width: 100%;
white-space: nowrap;

View File

@ -199,46 +199,7 @@
:deep(.el-tooltip) {
font-size: 16px;
}
:deep() {
.isActive {
background-color: #09314e;
}
}
// 页面的项目工程
.leftProject {
color: #333333;
// background-color: pink;
.projectName {
display: block;
width: 100%;
overflow: hidden;
color: var(--el-menu-text-color);
// font-weight: 700;
font-family: "siyuan_Medium";
font-size: 20px;
text-overflow: ellipsis;
white-space: nowrap;
}
.leftMenu_item {
overflow: hidden;
.middleSize {
color: var(--el-menu-text-color);
font-size: 16px;
white-space: nowrap;
}
img {
margin: 0 4px;
}
}
.bottom_item {
.bottomSize {
font-size: 18px !important;
color: rgba(196, 196, 196, 0.65);
}
}
}
.LeftMenu {
.leftMenu {
position: absolute;
top: 0px;
left: 10px;
@ -249,9 +210,92 @@
opacity: 0.9;
width: 290px;
overflow-y: scroll;
background: rgba(9, 41, 69, 0.9);
z-index: 20;
// background-color: rgba(255 255 255 / 80%) !important;
background-color: #092945;
// width: 290px;
// 页面的项目工程
:deep() {
.item {
height: 106px !important;
}
.content {
height: calc(100% - 160px) !important;
}
.tab {
color: white;
}
.tab.active {
color: #0bc4f0;
}
.isActive {
background-color: #09314e;
}
.el-pager li {
background-color: transparent !important;
color: white !important;
font-size: 20px !important;
border: 1px solid #087ba4 !important;
height: 26px !important;
}
.el-pager li:active {
color: white !important;
font-size: 20px !important;
border: none !important;
height: 26px !important;
}
.el-pager li.is-active {
background-color: #087ba4 !important;
color: white !important;
font-size: 20px !important;
}
.btn-prev,
.btn-next,
.btn-prev:disabled,
.btn-next:disabled {
color: white !important;
font-size: 20px !important;
background-color: transparent !important;
border: 1px solid #087ba4 !important;
height: 26px !important;
}
}
.leftProject {
// padding: 5px 8px;
color: #333333;
.projectName {
display: block;
width: 100%;
overflow: hidden;
// font-weight: 700;
font-family: "siyuan_Medium";
font-size: 20px;
color: #ffffff;
text-overflow: ellipsis;
white-space: nowrap;
}
.leftMenu_item {
display: flex;
justify-content: space-between;
margin-top: 10px;
overflow: hidden;
.middleSize {
display: inline-block;
font-size: 18px;
color: #c4c4c4;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
margin-left: 5px;
}
}
.bottom_item {
.bottomSize {
font-size: 18px !important;
color: #c4c4c4;
}
}
}
}
.mapTopData {
position: absolute;

View File

@ -6,7 +6,7 @@
:tabs="['项目名称', '工程名称']"
:records="records"
:pageable="pages"
class="LeftMenu"
class="leftMenu"
@search="onSearchInput"
@change-page="onCurChange"
>
@ -20,10 +20,6 @@
<img src="@/assets/images/AIwaring/dustMap.png" alt="" />
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
</div>
<!-- <div>
<img src="@/assets/images/AIwaring/报警.png" alt="" />
<span class="middleSize">今日报警次数{{ data.todayAlarm }}</span>
</div> -->
</div>
<div class="bottom_item flx-justify-between" style="margin-top: 6px">

View File

@ -208,7 +208,7 @@
<template #footer>
<div>
<el-button class="hzCancelStyle" @click="childrenVisible = false">取消</el-button>
<el-button type="primary" @click="childrenConfirm(ruleFormRef, childrenFormData)"> 保存 </el-button>
<el-button class="hzStyle" type="primary" @click="childrenConfirm(ruleFormRef, childrenFormData)"> 保存 </el-button>
</div>
</template>
</el-dialog>

View File

@ -9,7 +9,7 @@
width: 100%;
// margin-left: 20px;
padding: 0 0 0 20px;
// padding: 0 0 0 20px;
.form_div {
height: 56px;
@ -20,7 +20,7 @@
padding: 16px 0 0 36px;
border-radius: 8px;
// height: 56px;
background-color: #092945;
background-color: var(--el-menu-bg-color);
}
.imgPage {
box-sizing: border-box;
@ -29,10 +29,11 @@
padding: 20px 10px 20px 20px;
margin-top: 20px;
overflow-y: scroll;
background-color: #092945;
background-color: var(--el-menu-bg-color);
border-radius: 8px;
display: flex;
flex-direction: column;
position: relative;
.imgTable {
width: 100%;
display: flex;
@ -43,7 +44,7 @@
width: 23.1%;
height: 260px;
margin: 10px;
border: 2px solid #09405f;
border: 1px solid #087ba4;
border-radius: 4px;
opacity: 1;
.page_text {
@ -53,7 +54,7 @@
display: flex;
justify-content: space-between;
font-size: 20px;
color: #c4c4c4;
color: var(--el-menu-text-color);
.position {
width: 97px;
overflow: hidden;
@ -141,7 +142,7 @@
margin: 0 0 4px;
font-family: "siyuan_Medium";
font-size: 20px;
color: #0bc4f0;
color: var(--el-color-primary);
display: flex;
align-items: center;
> span {

View File

@ -34,11 +34,11 @@
<div class="page_text flx-justify-column">
<div class="img_title">
<span>{{ item.title }}</span>
<el-button type="primary" link @click="handleEditItem(2, item)">
<el-button class="hzStyle" type="primary" link @click="handleEditItem(2, item)">
<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
<span>编辑</span>
</el-button>
<el-button style="margin-right: 12px" type="danger" link :icon="Delete" @click="deleteAccount(item)"
<el-button style="margin-right: 12px" type="primary" link :icon="Delete" @click="deleteAccount(item)"
>删除</el-button
>
</div>
@ -63,6 +63,7 @@
:background="background"
class="pagination"
/>
<changeTheme />
</div>
</div>
</div>
@ -105,7 +106,7 @@
<template #footer>
<div class="form-footer">
<el-button class="hzCancelStyle" @click="visible = false">取消</el-button>
<el-button class="btnStyle" :disabled="isBool" type="primary" @click="confirm(ruleFormRef, formData)"> 保存 </el-button>
<el-button class="hzStyle" :disabled="isBool" type="primary" @click="confirm(ruleFormRef, formData)"> 保存 </el-button>
</div>
</template>
</el-dialog>
@ -121,6 +122,7 @@ import { GlobalStore } from "@/stores";
import { Delete } from "@element-plus/icons-vue";
import { jxj_User } from "@/api/types";
import { useHandleData } from "@/hooks/useHandleData";
import changeTheme from "@/components/changeTheme/index.vue";
const upload = ref<UploadInstance>();
const fileList = ref([]);
const store = GlobalStore();