fix: 修复bug
This commit is contained in:
parent
197617997d
commit
605c6e3a85
@ -1,268 +1,271 @@
|
|||||||
<!-- 经典布局 -->
|
<!-- 经典布局 -->
|
||||||
<template>
|
<template>
|
||||||
<el-container class="layout">
|
<el-container class="layout">
|
||||||
<!-- <el-container class="classic-main">
|
<!-- <el-container class="classic-main">
|
||||||
<Main />
|
<Main />
|
||||||
</el-container> -->
|
</el-container> -->
|
||||||
<el-header>
|
<el-header>
|
||||||
<div class="header-lf">
|
<div class="header-lf">
|
||||||
<div @click="goHome" class="logo flx-center">
|
<div @click="goHome" class="logo flx-center">
|
||||||
<img src="@/assets/images/login/china.png" style="margin: 0 15px" alt="logo" />
|
<img src="@/assets/images/login/china.png" style="margin: 0 15px" alt="logo" />
|
||||||
<span>数字化政务监管平台</span>
|
<span>数字化政务监管平台</span>
|
||||||
<span v-if="moduleTitle" style="margin: 0 20px">|</span>
|
<span v-if="moduleTitle" style="margin: 0 20px">|</span>
|
||||||
<span class="title">{{ moduleTitle }}</span>
|
<span class="title">{{ moduleTitle }}</span>
|
||||||
</div>
|
</div>
|
||||||
<ToolBarLeft />
|
<ToolBarLeft />
|
||||||
</div>
|
</div>
|
||||||
<ToolBarRight />
|
<ToolBarRight />
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-container class="classic-content">
|
<el-container class="classic-content">
|
||||||
<el-aside>
|
<!-- <div class="menu" :style="{ width: isCollapse ? '65px' : '210px' }"> 根据屏幕自动收缩 -->
|
||||||
<!-- <div class="menu" :style="{ width: isCollapse ? '65px' : '210px' }"> 根据屏幕自动收缩 -->
|
<el-aside>
|
||||||
<div class="menu">
|
<div class="menu">
|
||||||
<el-scrollbar>
|
<el-scrollbar>
|
||||||
<el-menu
|
<el-menu
|
||||||
:default-active="activeMenu"
|
:default-active="activeMenu"
|
||||||
:router="false"
|
:router="false"
|
||||||
:collapse="isCollapse"
|
:collapse="isCollapse"
|
||||||
:collapse-transition="false"
|
:collapse-transition="false"
|
||||||
:unique-opened="true"
|
:unique-opened="true"
|
||||||
background-color="#ffffff"
|
background-color="#ffffff"
|
||||||
text-color="#333333"
|
text-color="#333333"
|
||||||
style="--el-menu-hover-bg-color: #fff"
|
style="--el-menu-hover-bg-color: #ffffff"
|
||||||
>
|
>
|
||||||
<SubMenu :menuList="menuList" />
|
<SubMenu :menuList="menuList" />
|
||||||
</el-menu>
|
</el-menu>
|
||||||
</el-scrollbar>
|
</el-scrollbar>
|
||||||
</div>
|
</div>
|
||||||
</el-aside>
|
</el-aside>
|
||||||
<el-container class="classic-main">
|
<el-container class="classic-main">
|
||||||
<Main />
|
<Main />
|
||||||
</el-container>
|
</el-container>
|
||||||
</el-container>
|
</el-container>
|
||||||
<!-- <el-dialog class="overview" :show-close="false" v-model="visible1" width="50%" @close="visible1 = false">
|
<!-- <el-dialog class="overview" :show-close="false" v-model="visible1" width="50%" @close="visible1 = false">
|
||||||
<template #title>
|
<template #title>
|
||||||
<div class="title-detail">
|
<div class="title-detail">
|
||||||
<img src="@/assets/images/tableIcon/look.png" alt="" />
|
<img src="@/assets/images/tableIcon/look.png" alt="" />
|
||||||
<span>待处理</span>
|
<span>待处理</span>
|
||||||
<el-icon>
|
<el-icon>
|
||||||
<close @click="visible1 = false" />
|
<close @click="visible1 = false" />
|
||||||
</el-icon>
|
</el-icon>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<div class="detail-table table-box">
|
<div class="detail-table table-box">
|
||||||
<div class="table">
|
<div class="table">
|
||||||
<el-table
|
<el-table
|
||||||
:data="recordData"
|
:data="recordData"
|
||||||
class="el-table"
|
class="el-table"
|
||||||
height="300"
|
height="300"
|
||||||
:row-style="{ height: '40px' }"
|
:row-style="{ height: '40px' }"
|
||||||
:header-cell-style="{ textAlign: 'center', height: '40px' }"
|
:header-cell-style="{ textAlign: 'center', height: '40px' }"
|
||||||
:cell-style="{ textAlign: 'center', height: '40px' }"
|
:cell-style="{ textAlign: 'center', height: '40px' }"
|
||||||
>
|
>
|
||||||
<el-table-column type="index" label="序号" width="80"> </el-table-column>
|
<el-table-column type="index" label="序号" width="80"> </el-table-column>
|
||||||
<el-table-column prop="type" label="待处理事项"> </el-table-column>
|
<el-table-column prop="type" label="待处理事项"> </el-table-column>
|
||||||
<el-table-column prop="projectName" label="项目名称"> </el-table-column>
|
<el-table-column prop="projectName" label="项目名称"> </el-table-column>
|
||||||
<el-table-column align="center" label="操作" width="150">
|
<el-table-column align="center" label="操作" width="150">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button type="primary" link @click="handleDealItem(scope.row)">
|
<el-button type="primary" link @click="handleDealItem(scope.row)">
|
||||||
<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
|
<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
|
||||||
<span>去处理</span>
|
<span>去处理</span>
|
||||||
</el-button>
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<template #empty>
|
<template #empty>
|
||||||
<div class="table-empty">
|
<div class="table-empty">
|
||||||
<slot name="empty">
|
<slot name="empty">
|
||||||
<img src="@/assets/images/notData.png" alt="notData" />
|
<img src="@/assets/images/notData.png" alt="notData" />
|
||||||
<div>暂无数据</div>
|
<div>暂无数据</div>
|
||||||
</slot>
|
</slot>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog> -->
|
</el-dialog> -->
|
||||||
</el-container>
|
</el-container>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts" name="layoutClassic">
|
<script setup lang="ts" name="layoutClassic">
|
||||||
import { computed, ref, onMounted } from "vue";
|
import { computed, ref, onMounted } from "vue";
|
||||||
import { useRoute, useRouter } from "vue-router";
|
import { useRoute, useRouter } from "vue-router";
|
||||||
import { GlobalStore } from "@/stores";
|
import { GlobalStore } from "@/stores";
|
||||||
import { AuthStore } from "@/stores/modules/auth";
|
import { AuthStore } from "@/stores/modules/auth";
|
||||||
import Main from "@/layouts/components/Main/index.vue";
|
import Main from "@/layouts/components/Main/index.vue";
|
||||||
import SubMenu from "@/layouts/components/Menu/SubMenu.vue";
|
import SubMenu from "@/layouts/components/Menu/SubMenu.vue";
|
||||||
import ToolBarLeft from "@/layouts/components/Header/ToolBarLeft.vue";
|
import ToolBarLeft from "@/layouts/components/Header/ToolBarLeft.vue";
|
||||||
import ToolBarRight from "@/layouts/components/Header/ToolBarRight.vue";
|
import ToolBarRight from "@/layouts/components/Header/ToolBarRight.vue";
|
||||||
import { HOME_URL } from "@/enums/Home";
|
import { HOME_URL } from "@/enums/Home";
|
||||||
// import router from "@/routers";
|
// import router from "@/routers";
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const authStore = AuthStore();
|
const authStore = AuthStore();
|
||||||
const globalStore = GlobalStore();
|
const globalStore = GlobalStore();
|
||||||
const activeMenu = computed(() => (route.meta.activeMenu ? route.meta.activeMenu : route.path));
|
const activeMenu = computed(() => (route.meta.activeMenu ? route.meta.activeMenu : route.path));
|
||||||
const menuList = computed(() => authStore.showMenuListGet);
|
const menuList = computed(() => authStore.showMenuListGet);
|
||||||
const isCollapse = computed(() => globalStore.themeConfig?.isCollapse);
|
const isCollapse = computed(() => globalStore.themeConfig?.isCollapse);
|
||||||
const moduleTitle = globalStore.moduleName;
|
const moduleTitle = globalStore.moduleName;
|
||||||
const visible1 = ref(false);
|
const visible1 = ref(false);
|
||||||
const recordData = ref([]);
|
const recordData = ref([]);
|
||||||
// const title = import.meta.env.VITE_GLOB_APP_TITLE;
|
// const title = import.meta.env.VITE_GLOB_APP_TITLE;
|
||||||
// 去处理事件
|
// 去处理事件
|
||||||
const handleDealItem = (obj: any) => {
|
const handleDealItem = (obj: any) => {
|
||||||
visible1.value = false;
|
visible1.value = false;
|
||||||
switch (obj.flag) {
|
switch (obj.flag) {
|
||||||
case 1: // 质量管理
|
case 1: // 质量管理
|
||||||
router.push("/goverment/huizhou/projectMonitoring/qualityControl/index");
|
router.push("/goverment/huizhou/projectMonitoring/qualityControl/index");
|
||||||
break;
|
break;
|
||||||
case 2: // 安全管理
|
case 2: // 安全管理
|
||||||
router.push("/goverment/huizhou/projectMonitoring/safetyManagement/index");
|
router.push("/goverment/huizhou/projectMonitoring/safetyManagement/index");
|
||||||
break;
|
break;
|
||||||
case 3: // 施工节点管理
|
case 3: // 施工节点管理
|
||||||
router.push("/goverment/huizhou/progressManagement/divisionsAndISubItems/index");
|
router.push("/goverment/huizhou/progressManagement/divisionsAndISubItems/index");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
const goHome = () => {
|
const goHome = () => {
|
||||||
router.push(HOME_URL[globalStore.accountType - 1]);
|
router.push(HOME_URL[globalStore.accountType - 1]);
|
||||||
};
|
};
|
||||||
onMounted(async () => {});
|
onMounted(async () => {});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
@import "./index.scss";
|
@import "./index.scss";
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
@mixin flex {
|
@mixin flex {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
@mixin title {
|
@mixin title {
|
||||||
font-size: 16px;
|
padding-left: 5px;
|
||||||
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
|
font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
|
||||||
font-weight: 400;
|
font-size: 16px;
|
||||||
color: #333333;
|
font-weight: 400;
|
||||||
border-left: 2px solid #008bff;
|
color: #333333;
|
||||||
padding-left: 5px;
|
border-left: 2px solid #008bff;
|
||||||
}
|
}
|
||||||
// .classic {
|
|
||||||
// .classic-content {
|
// .classic {
|
||||||
// // margin-top: 10px;
|
// .classic-content {
|
||||||
// // padding-top: 10px;
|
// // margin-top: 10px;
|
||||||
// height: calc(100% - 55px); // 减去头部高度
|
// // padding-top: 10px;
|
||||||
// .classic-main {
|
// height: calc(100% - 55px); // 减去头部高度
|
||||||
// width: calc(100% - 200px);
|
// .classic-main {
|
||||||
// display: flex;
|
// width: calc(100% - 200px);
|
||||||
// flex-direction: column;
|
// display: flex;
|
||||||
// }
|
// flex-direction: column;
|
||||||
// }
|
// }
|
||||||
// .el-menu,
|
// }
|
||||||
// .el-menu--popup {
|
// .el-menu,
|
||||||
// .el-menu-item {
|
// .el-menu--popup {
|
||||||
// &.is-active {
|
// .el-menu-item {
|
||||||
// // background: var(--el-color-primary-light-9);
|
// &.is-active {
|
||||||
// &::before {
|
// // background: var(--el-color-primary-light-9);
|
||||||
// position: absolute;
|
// &::before {
|
||||||
// top: 12px;
|
// position: absolute;
|
||||||
// bottom: 0;
|
// top: 12px;
|
||||||
// right: 0;
|
// bottom: 0;
|
||||||
// width: 4px;
|
// right: 0;
|
||||||
// height: 38px;
|
// width: 4px;
|
||||||
// content: "";
|
// height: 38px;
|
||||||
// background: var(--el-color-primary);
|
// content: "";
|
||||||
// }
|
// background: var(--el-color-primary);
|
||||||
// // border-right: 4px solid #008bff;
|
// }
|
||||||
// &.is:hover {
|
// // border-right: 4px solid #008bff;
|
||||||
// background-color: #fff;
|
// &.is:hover {
|
||||||
// }
|
// background-color: #fff;
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
|
// }
|
||||||
// // guide
|
|
||||||
// #driver-highlighted-element-stage {
|
// // guide
|
||||||
// background-color: #606266 !important;
|
// #driver-highlighted-element-stage {
|
||||||
// }
|
// background-color: #606266 !important;
|
||||||
// }
|
// }
|
||||||
.overview {
|
// }
|
||||||
// background-color: #fff;
|
.overview {
|
||||||
flex: 1;
|
// background-color: #fff;
|
||||||
.title-detail {
|
flex: 1;
|
||||||
@include flex;
|
.title-detail {
|
||||||
> img {
|
@include flex;
|
||||||
width: 16px;
|
> img {
|
||||||
height: 18px;
|
width: 16px;
|
||||||
}
|
height: 18px;
|
||||||
> span {
|
}
|
||||||
font-size: 18px;
|
> span {
|
||||||
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
|
margin-right: auto;
|
||||||
font-weight: 400;
|
margin-left: 5px;
|
||||||
color: var(--el-menu-text-color);
|
font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
|
||||||
margin-left: 5px;
|
font-size: 18px;
|
||||||
margin-right: auto;
|
font-weight: 400;
|
||||||
}
|
color: var(--el-menu-text-color);
|
||||||
:deep(.el-icon) {
|
}
|
||||||
cursor: pointer;
|
:deep(.el-icon) {
|
||||||
color: #a8abb2;
|
color: #a8abb2;
|
||||||
}
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
.detail-table {
|
}
|
||||||
// height: 391px;
|
.detail-table {
|
||||||
.content-title {
|
// height: 391px;
|
||||||
@include title;
|
.content-title {
|
||||||
}
|
@include title;
|
||||||
.table {
|
}
|
||||||
height: 310px;
|
.table {
|
||||||
margin-top: 20px;
|
height: 310px;
|
||||||
:deep(.el-table) {
|
margin-top: 20px;
|
||||||
height: 100%;
|
:deep(.el-table) {
|
||||||
background-color: transparent;
|
height: 100%;
|
||||||
}
|
background-color: transparent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
:deep() {
|
}
|
||||||
.overview {
|
:deep() {
|
||||||
.el-dialog__body {
|
.overview {
|
||||||
padding-top: 0px;
|
.el-dialog__body {
|
||||||
padding-bottom: 0px;
|
padding-top: 0;
|
||||||
}
|
padding-bottom: 0;
|
||||||
.el-table__empty-text {
|
}
|
||||||
min-height: 200px;
|
.el-table__empty-text {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
align-items: center;
|
||||||
align-items: center;
|
justify-content: center;
|
||||||
}
|
min-height: 200px;
|
||||||
td.el-table__cell {
|
}
|
||||||
background-color: transparent !important;
|
td.el-table__cell {
|
||||||
// border-bottom: 0 !important;
|
font-size: 20px !important;
|
||||||
color: var(--el-menu-text-color);
|
|
||||||
font-size: 20px !important;
|
// border-bottom: 0 !important;
|
||||||
border-right: 2px solid #252526;
|
color: var(--el-menu-text-color);
|
||||||
}
|
background-color: transparent !important;
|
||||||
th.el-table__cell {
|
border-right: 2px solid #252526;
|
||||||
background-color: transparent;
|
}
|
||||||
// border-bottom: 0 !important;
|
th.el-table__cell {
|
||||||
border-right: 2px solid #252526;
|
background-color: transparent;
|
||||||
}
|
|
||||||
.el-table__inner-wrapper::before {
|
// border-bottom: 0 !important;
|
||||||
height: 0px;
|
border-right: 2px solid #252526;
|
||||||
}
|
}
|
||||||
.el-table--border::before {
|
.el-table__inner-wrapper::before {
|
||||||
width: 0px;
|
height: 0;
|
||||||
}
|
}
|
||||||
.el-table--border .el-table__inner-wrapper::after {
|
.el-table--border::before {
|
||||||
height: 0px;
|
width: 0;
|
||||||
}
|
}
|
||||||
.el-table--border::after {
|
.el-table--border .el-table__inner-wrapper::after {
|
||||||
width: 0px;
|
height: 0;
|
||||||
}
|
}
|
||||||
.el-table__border-left-patch {
|
.el-table--border::after {
|
||||||
width: 0;
|
width: 0;
|
||||||
}
|
}
|
||||||
}
|
.el-table__border-left-patch {
|
||||||
}
|
width: 0;
|
||||||
</style>
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@ -107,7 +107,7 @@ onMounted(async () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
formConfig.datas.enterpriseSn = stepOptions.value[active.value].dictValue + "名称";
|
formConfig.datas.enterpriseSn = stepOptions.value[active.value].dictValue + "名称";
|
||||||
if (store.Message && store.Message.engineeringMains.length) {
|
if (store.Message && store.Message.engineeringMains.length && store.Message.engineeringMains.flat().length) {
|
||||||
formData.value = store.Message.engineeringMains;
|
formData.value = store.Message.engineeringMains;
|
||||||
}
|
}
|
||||||
formConfig.formData = formData.value[active.value];
|
formConfig.formData = formData.value[active.value];
|
||||||
|
|||||||
@ -192,7 +192,8 @@ const removeEngineeringMainPerson = (row: EngineeringMainPerson, ind: number) =>
|
|||||||
!index >= 0 && formData.value[ind].engineeringMainPersonList?.splice(index, 1);
|
!index >= 0 && formData.value[ind].engineeringMainPersonList?.splice(index, 1);
|
||||||
};
|
};
|
||||||
const getMainData = async () => {
|
const getMainData = async () => {
|
||||||
const data = await queryMainType({ mainType: formData.value[0].type });
|
console.info(formData.value, "formData");
|
||||||
|
const data = await queryMainType({ mainType: formData.value[0]?.type });
|
||||||
nameOptions.value = data.result;
|
nameOptions.value = data.result;
|
||||||
};
|
};
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
|
|||||||
@ -410,9 +410,11 @@ onMounted(async () => {
|
|||||||
structuralStyle.value = res1.result;
|
structuralStyle.value = res1.result;
|
||||||
if (store.Message) {
|
if (store.Message) {
|
||||||
form.value = store.Message;
|
form.value = store.Message;
|
||||||
form.value.position = "经度：" + store.Message.longitude + " 纬度：" + store.Message.latitude;
|
if (store.Message.longitude && store.Message.latitude) {
|
||||||
|
form.value.position = "经度：" + store.Message.longitude + " 纬度：" + store.Message.latitude;
|
||||||
|
}
|
||||||
addressList.value = store.Message;
|
addressList.value = store.Message;
|
||||||
form.value.projectSecondType = store.Message.projectSecondType.split(",").map((item: string) => Number(item));
|
form.value.projectSecondType = store.Message.projectSecondType?.split(",").map((item: string) => Number(item));
|
||||||
}
|
}
|
||||||
const res2 = await getDicList({ dictType: "engineering_state" });
|
const res2 = await getDicList({ dictType: "engineering_state" });
|
||||||
engineeringState.value = res2.result;
|
engineeringState.value = res2.result;
|
||||||
@ -451,9 +453,9 @@ watch(
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
:deep(.el-table__empty-text) {
|
:deep(.el-table__empty-text) {
|
||||||
min-height: 200px;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
min-height: 200px;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user