X
@@ -654,6 +653,10 @@ const submitForm = async () => {
};
// 全部提交
const allSubmit = async () => {
+ if (!basicData.value.deadline) {
+ ElMessage.error("请选择整改期限");
+ return;
+ }
recordData.value.map(item => {
item.image = JSON.stringify(item.image);
});
@@ -772,20 +775,20 @@ onMounted(() => {});
font-size: 16px;
color: #008bff;
}
- .diaMapIcon {
- background-color: #008bff;
- width: 34px;
- position: absolute;
- right: 0;
- border-radius: 0 4px 4px 0;
- color: #fff;
- font-size: 16px;
- display: flex;
- align-items: center;
- justify-content: center;
- height: 100%;
- cursor: pointer;
- }
+ // .diaMapIcon {
+ // background-color: #008bff;
+ // width: 34px;
+ // position: absolute;
+ // right: 0;
+ // border-radius: 0 4px 4px 0;
+ // color: #fff;
+ // font-size: 16px;
+ // display: flex;
+ // align-items: center;
+ // justify-content: center;
+ // height: 100%;
+ // cursor: pointer;
+ // }
}
.face-img {
@include flex;
@@ -826,8 +829,7 @@ onMounted(() => {});
color: var(--el-menu-text-color);
}
.btn-style {
- width: 105px;
- height: 20px;
+ padding: 0 10px;
// background: rgba(48, 172, 124, 0.15);
background: transparent;
opacity: 1;
diff --git a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.scss b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.scss
index 44323e5..c40329b 100644
--- a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.scss
+++ b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.scss
@@ -60,12 +60,14 @@
}
}
.table-box {
+ width: calc(100% - 300px);
height: 100%;
.table {
margin-left: 20px;
height: 100%;
:deep(.table-main) {
height: calc(100% - 82px);
+ overflow-x: scroll;
}
}
}
diff --git a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue
index 686557b..96dd6e8 100644
--- a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue
@@ -109,41 +109,50 @@ const columns: ColumnProps[] = [
{
prop: "engineeringName",
label: "工程名称",
- search: { el: "input" }
+ search: { el: "input" },
+ width: 150
},
{
prop: "inspectUserName",
- label: "监督员"
+ label: "监督员",
+ width: 150
},
{
prop: "createTime",
- label: "检查时间"
+ label: "检查时间",
+ width: 220
},
{
prop: "buildEnt",
- label: "建设单位"
+ label: "建设单位",
+ width: 150
},
{
prop: "supervisorEnt",
- label: "监理单位"
+ label: "监理单位",
+ width: 150
},
{
prop: "opEnt",
- label: "施工单位"
+ label: "施工单位",
+ width: 150
},
{
prop: "surveyEnt",
- label: "勘察单位"
+ label: "勘察单位",
+ width: 150
},
{
prop: "designEnt",
- label: "设计单位"
+ label: "设计单位",
+ width: 150
},
{
prop: "state",
- label: "状态"
+ label: "状态",
+ width: 150
},
- { prop: "slippage", label: "逾期情况(天)" },
+ { prop: "slippage", label: "逾期情况(天)", width: 150 },
{ prop: "operation", label: "操作", fixed: "right", width: 100 }
];
const pageable = ref({
diff --git a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.scss b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.scss
index c1f58e9..ea08e8a 100644
--- a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.scss
+++ b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.scss
@@ -60,9 +60,11 @@
height: 100%;
:deep(.table-main) {
height: calc(100% - 82px);
+ overflow-x: scroll;
}
}
.table-box {
+ width: calc(100% - 300px);
height: 100% !important;
}
}
diff --git a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue
index dd05875..341f150 100644
--- a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue
+++ b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue
@@ -83,7 +83,7 @@ const columns: ColumnProps[] = [
{ type: "index", label: "序号", width: 80 },
// 多级 prop
{ prop: "name", label: "设备名称", isShow: false, search: { el: "input" } },
- { prop: "deviceName", label: "设备名称" },
+ { prop: "deviceName", label: "设备名称", width: 180 },
{
prop: "temperature",
label: "温度",
@@ -101,6 +101,7 @@ const columns: ColumnProps[] = [
{
prop: "pm25",
label: "PM2.5",
+ width: 150,
render: scoped => {
return scoped.row.pm25 + "μg/m³";
}
@@ -108,6 +109,7 @@ const columns: ColumnProps[] = [
{
prop: "noise",
label: "噪音",
+ width: 150,
render: scoped => {
return scoped.row.noise + "db";
}
@@ -115,10 +117,19 @@ const columns: ColumnProps[] = [
{
prop: "pm10",
label: "PM10",
+ width: 150,
render: scoped => {
return scoped.row.pm10 + "μg/m³";
}
},
+ {
+ prop: "tsp",
+ label: "TSP",
+ width: 150,
+ render: scoped => {
+ return scoped.row.tsp + "μg/m³";
+ }
+ },
{
prop: "humidity",
label: "湿度",
@@ -129,11 +140,12 @@ const columns: ColumnProps[] = [
{
prop: "winddirection",
label: "风向",
+ width: 160,
render: scoped => {
return scoped.row.winddirection + "风";
}
},
- { prop: "createTime", label: "上报时间" }
+ { prop: "createTime", label: "上报时间", width: 220 }
];
interface formData {
title: string;
diff --git a/src/views/goverment/qualitySupervision/components/orderAdd.vue b/src/views/goverment/qualitySupervision/components/orderAdd.vue
index ac48a97..789ba95 100644
--- a/src/views/goverment/qualitySupervision/components/orderAdd.vue
+++ b/src/views/goverment/qualitySupervision/components/orderAdd.vue
@@ -805,19 +805,19 @@ onMounted(() => {});
font-weight: 400;
color: #008bff;
}
- .diaMapIcon {
- background-color: #008bff;
- width: 34px;
- position: absolute;
- right: 0;
- border-radius: 0 4px 4px 0;
- color: #fff;
- display: flex;
- align-items: center;
- justify-content: center;
- height: 100%;
- cursor: pointer;
- }
+ // .diaMapIcon {
+ // background-color: #008bff;
+ // width: 34px;
+ // position: absolute;
+ // right: 0;
+ // border-radius: 0 4px 4px 0;
+ // color: #fff;
+ // display: flex;
+ // align-items: center;
+ // justify-content: center;
+ // height: 100%;
+ // cursor: pointer;
+ // }
}
.face-img {
@include flex;
diff --git a/src/views/goverment/safetySupervision/components/orderAdd.vue b/src/views/goverment/safetySupervision/components/orderAdd.vue
index d7da571..8553b07 100644
--- a/src/views/goverment/safetySupervision/components/orderAdd.vue
+++ b/src/views/goverment/safetySupervision/components/orderAdd.vue
@@ -772,19 +772,19 @@ onMounted(() => {});
font-weight: 400;
color: #008bff;
}
- .diaMapIcon {
- background-color: #008bff;
- width: 34px;
- position: absolute;
- right: 0;
- border-radius: 0 4px 4px 0;
- color: #fff;
- display: flex;
- align-items: center;
- justify-content: center;
- height: 100%;
- cursor: pointer;
- }
+ // .diaMapIcon {
+ // background-color: #008bff;
+ // width: 34px;
+ // position: absolute;
+ // right: 0;
+ // border-radius: 0 4px 4px 0;
+ // color: #fff;
+ // display: flex;
+ // align-items: center;
+ // justify-content: center;
+ // height: 100%;
+ // cursor: pointer;
+ // }
}
.face-img {
@include flex;
diff --git a/src/views/hz-project/localeMonitor/attendanceStatistics/index.vue b/src/views/hz-project/localeMonitor/attendanceStatistics/index.vue
index 87a88a7..ecf2083 100644
--- a/src/views/hz-project/localeMonitor/attendanceStatistics/index.vue
+++ b/src/views/hz-project/localeMonitor/attendanceStatistics/index.vue
@@ -158,6 +158,7 @@ const columns: ColumnProps[] = [
{
prop: "teamName",
label: "班组",
+ width: 150,
search: { el: "input" }
},
{
@@ -172,14 +173,17 @@ const columns: ColumnProps[] = [
},
{
prop: "lateDay",
+ width: 150,
label: "迟到天数"
},
{
prop: "earlyDay",
+ width: 150,
label: "早退天数"
},
{
prop: "workerHour",
+ width: 150,
label: "总工时"
}
];
diff --git a/src/views/hz-project/localeMonitor/realTime/index.vue b/src/views/hz-project/localeMonitor/realTime/index.vue
index 5164991..007a726 100644
--- a/src/views/hz-project/localeMonitor/realTime/index.vue
+++ b/src/views/hz-project/localeMonitor/realTime/index.vue
@@ -66,6 +66,14 @@ const columns: ColumnProps[] = [
return scoped.row.pm10 + "μg/m³";
}
},
+ {
+ prop: "tsp",
+ label: "TSP",
+ width: 150,
+ render: scoped => {
+ return scoped.row.tsp + "μg/m³";
+ }
+ },
{
prop: "humidity",
label: "湿度",
@@ -80,7 +88,7 @@ const columns: ColumnProps[] = [
return scoped.row.winddirection + "风";
}
},
- { prop: "createTime", label: "上报时间" }
+ { prop: "createTime", label: "上报时间", width: 220 }
];
const initParam = reactive({
diff --git a/src/views/hz-project/progressManagement/globalPlanManagement/index.vue b/src/views/hz-project/progressManagement/globalPlanManagement/index.vue
index a161977..8edccdd 100644
--- a/src/views/hz-project/progressManagement/globalPlanManagement/index.vue
+++ b/src/views/hz-project/progressManagement/globalPlanManagement/index.vue
@@ -293,7 +293,7 @@ const columns: ColumnProps[] = [
// }
// },
{ prop: "phaseName", label: "智能条线", width: 150 },
- { prop: "chargerNumber", label: "节点责任人编号", width: 150 },
+ { prop: "chargerNumber", label: "节点责任人编号", width: 200 },
{ prop: "chargerName", label: "节点责任人", width: 150 },
{
prop: "isDeleted",
diff --git a/src/views/hz-project/progressManagement/subItemManagement/index.vue b/src/views/hz-project/progressManagement/subItemManagement/index.vue
index 225c312..a89a3ca 100644
--- a/src/views/hz-project/progressManagement/subItemManagement/index.vue
+++ b/src/views/hz-project/progressManagement/subItemManagement/index.vue
@@ -137,6 +137,16 @@
placeholder="请选择时间"
/>
+
+
+
@@ -191,7 +201,7 @@
- 取消
+ 取消
保存
@@ -258,6 +268,7 @@ const childrenFormData = ref({
taskDesc: "",
planStartTime: "",
planEndTime: "",
+ realEndTime: "",
importance: "",
commander: "",
overdueIssueDesc: "",
diff --git a/src/views/hz-project/projectMonitor/qualityManagement/index.vue b/src/views/hz-project/projectMonitor/qualityManagement/index.vue
index 0ec992d..0cf2095 100644
--- a/src/views/hz-project/projectMonitor/qualityManagement/index.vue
+++ b/src/views/hz-project/projectMonitor/qualityManagement/index.vue
@@ -65,7 +65,8 @@ const columns: ColumnProps[] = [
},
{
prop: "createTime",
- label: "检查时间"
+ label: "检查时间",
+ width: 220
},
{
prop: "buildEnt",
diff --git a/src/views/hz-project/projectMonitor/safetyManagement/index.vue b/src/views/hz-project/projectMonitor/safetyManagement/index.vue
index 73ceb34..dbae192 100644
--- a/src/views/hz-project/projectMonitor/safetyManagement/index.vue
+++ b/src/views/hz-project/projectMonitor/safetyManagement/index.vue
@@ -63,7 +63,8 @@ const columns: ColumnProps[] = [
},
{
prop: "createTime",
- label: "检查时间"
+ label: "检查时间",
+ width: 220
},
{
prop: "buildEnt",
diff --git a/src/views/hz-project/smartSite/realTime/index.vue b/src/views/hz-project/smartSite/realTime/index.vue
index 71d210f..4a3d052 100644
--- a/src/views/hz-project/smartSite/realTime/index.vue
+++ b/src/views/hz-project/smartSite/realTime/index.vue
@@ -81,7 +81,7 @@ const columns: ColumnProps[] = [
return scoped.row.winddirection + "风";
}
},
- { prop: "createTime", label: "上报时间" }
+ { prop: "createTime", label: "上报时间", width: 220 }
];
const initParam = reactive({