diff --git a/src/views/goverment/huizhou/assessmentManagement/rankList/index.scss b/src/views/goverment/huizhou/assessmentManagement/rankList/index.scss index 57d4698..35d3acb 100644 --- a/src/views/goverment/huizhou/assessmentManagement/rankList/index.scss +++ b/src/views/goverment/huizhou/assessmentManagement/rankList/index.scss @@ -117,14 +117,14 @@ margin-top: 17px; padding: 0 22px; .table-header { - height: 28px; - line-height: 28px; + height: 35px; + line-height: 35px; @include flex; background: url("@/assets/images/hzImg/assessmentImg/header-title.png") no-repeat center; background-size: 100% 100%; .td { @include td; - font-size: 20px; + font-size: 22px; } .td:last-child { display: flex; @@ -134,27 +134,27 @@ } } .table-body:nth-child(2n) { - height: 28px; - line-height: 28px; + height: 35px; + line-height: 35px; @include flex; background: url("@/assets/images/hzImg/assessmentImg/tableBg-light.png") no-repeat center; background-size: 100% 100%; margin-top: 12px; .td { @include td; - font-size: 18px; + font-size: 22px; } } .table-body:nth-child(2n - 1) { - height: 28px; - line-height: 28px; + height: 35px; + line-height: 35px; @include flex; background: url("@/assets/images/hzImg/assessmentImg/tableBg-dark.png") no-repeat center; background-size: 100% 100%; margin-top: 12px; .td { @include td; - font-size: 18px; + font-size: 22px; } } } diff --git a/src/views/goverment/huizhou/assessmentManagement/rankList/index.vue b/src/views/goverment/huizhou/assessmentManagement/rankList/index.vue index 7b1f16a..8d51ca6 100644 --- a/src/views/goverment/huizhou/assessmentManagement/rankList/index.vue +++ b/src/views/goverment/huizhou/assessmentManagement/rankList/index.vue @@ -73,7 +73,7 @@ -
未验收项目
+
序号
@@ -95,8 +95,8 @@
-
已验收项目
-
+ +
@@ -139,7 +139,7 @@ -
未验收项目
+
序号
@@ -161,8 +161,8 @@
-
已验收项目
-
+ +
@@ -292,7 +292,7 @@ const getEngineerData = async () => { } }; const getRedCountData = () => { - getRedSuccessCountData(); + // getRedSuccessCountData(); getRedNoSuccessCountData(); }; const getRedSuccessCountData = async () => { @@ -312,7 +312,7 @@ const getRedSuccessCountData = async () => { const getRedNoSuccessCountData = async () => { let requestData = { ...redCountSearch.value, - engineeringState: 0, + // engineeringState: 0, scoreSort: redNoSuccessSort.value, enterpriseType: companyType.value }; @@ -324,7 +324,7 @@ const getRedNoSuccessCountData = async () => { } }; const getBlackCountData = () => { - getBlackSuccessCountData(); + // getBlackSuccessCountData(); getBlackNoSuccessCountData(); }; const getBlackSuccessCountData = async () => { @@ -344,7 +344,7 @@ const getBlackSuccessCountData = async () => { const getBlackNoSuccessCountData = async () => { let requestData = { ...blackCountSearch.value, - engineeringState: 0, + // engineeringState: 0, scoreSort: blackNoSuccessSort.value, enterpriseType: companyType.value }; diff --git a/src/views/goverment/huizhou/assessmentManagement/scoreStandard/index.vue b/src/views/goverment/huizhou/assessmentManagement/scoreStandard/index.vue index 6ebbe7f..fe97873 100644 --- a/src/views/goverment/huizhou/assessmentManagement/scoreStandard/index.vue +++ b/src/views/goverment/huizhou/assessmentManagement/scoreStandard/index.vue @@ -106,11 +106,11 @@ const formConfig = reactive({ prop: "scoreCriteria", type: "input" }, - { - label: "违约处理", - prop: "punish", - type: "input" - }, + // { + // label: "违约处理", + // prop: "punish", + // type: "input" + // }, { label: "扣分标准", prop: "deductPointsStandard", @@ -160,13 +160,13 @@ const formConfig = reactive({ trigger: "blur" } ], - deductPointsStandard: [ - { - required: true, - message: "请输入", - trigger: "blur" - } - ], + // deductPointsStandard: [ + // { + // required: true, + // message: "请输入", + // trigger: "blur" + // } + // ], standardScore: [ { required: true, @@ -192,10 +192,10 @@ const columns: ColumnProps[] = [ prop: "scoreCriteria", label: "评分标准" }, - { - prop: "punish", - label: "违约处理" - }, + // { + // prop: "punish", + // label: "违约处理" + // }, { prop: "deductPointsStandard", label: "扣分标准" diff --git a/src/views/goverment/huizhou/assessmentManagement/unitList/index.vue b/src/views/goverment/huizhou/assessmentManagement/unitList/index.vue index 982e2c0..e30ebd4 100644 --- a/src/views/goverment/huizhou/assessmentManagement/unitList/index.vue +++ b/src/views/goverment/huizhou/assessmentManagement/unitList/index.vue @@ -87,12 +87,12 @@ - + @@ -276,7 +282,7 @@ - + - + @@ -146,11 +150,13 @@ const columns: ColumnProps[] = [ search: { el: "select" }, width: 150, enum: [ - { label: "执法中", value: 1 }, - { label: "待整改", value: 2 }, - { label: "待审核", value: 3 }, - { label: "已闭合", value: 4 }, - { label: "已驳回", value: 5 } + // { label: "执法中", value: 1 }, + { label: "待整改", value: "2" }, + { label: "待初审", value: "3-1" }, + { label: "待终审", value: "4-1" }, + { label: "已闭合", value: "4-2" }, + { label: "初审驳回", value: "5-1" }, + { label: "终审驳回", value: "5-2" } ] }, { prop: "slippage", label: "逾期情况(天)", width: 150 }, @@ -214,16 +220,25 @@ const onCurChange = async (params: number) => { }; const getTableList = (params: any) => { let newParams = JSON.parse(JSON.stringify(params)); + newParams.type = 2; + newParams.level = 1; // console.log(newParams); if (newParams.createTime) { newParams.createTime_begin = newParams.createTime[0]; newParams.createTime_end = newParams.createTime[1]; delete newParams.createTime; } + if (newParams.state) { + if (newParams.state.indexOf("-")) { + newParams.level = Number(newParams.state[2]); + newParams.state = Number(newParams.state[0]); + } else { + newParams.state = newParams.state; + } + } newParams.engineeringSn = searchSn.value; - newParams.type = 2; - if (!(newParams.projectSn || newParams.engineeringSn)) { - return { result: { records: [], current: "1", total: "0", size: "10" } }; + if (!newParams.engineeringSn) { + return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } }; } return statisticsTable(newParams); }; @@ -279,8 +294,8 @@ watch( ); onMounted(async () => { await getEngPage(); - searchSn.value = (records.value as any[])[0].projectSn; - searchName.value = (records.value as any[])[0].projectName; + searchSn.value = (records.value as any[])[0].engineeringSn; + searchName.value = (records.value as any[])[0].engineeringName; onSearch(records.value[0]); await sendIframeMessage({ obj: { path: route.path } }, 2, undefined); }); diff --git a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue index 17be737..d2de22f 100644 --- a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue +++ b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue @@ -19,15 +19,19 @@ >检查情况： {{ basicData?.state == 1 - ? "待整改" + ? "执法中" : basicData?.state == 2 - ? "待审核" + ? "待整改" : basicData?.state == 3 && basicData?.level == 1 - ? "初审通过" - : basicData?.state == 3 && basicData?.level == 2 - ? "终审通过" - : basicData?.state == 4 - ? "已驳回" + ? "待初审" + : basicData?.state == 4 && basicData?.level == 1 + ? "待终审" + : basicData?.state == 4 && basicData?.level == 2 + ? "已闭合" + : basicData?.state == 5 && basicData?.level == 1 + ? "初审驳回" + : basicData?.state == 5 && basicData?.level == 2 + ? "终审驳回" : "" }} @@ -106,13 +110,15 @@ scope.row.state == 1 ? "待整改" : scope.row.state == 2 - ? "待审核" + ? "待初审" : scope.row.state == 3 && scope.row.level == 1 - ? "初审通过" + ? "待终审" : scope.row.state == 3 && scope.row.level == 2 - ? "终审通过" - : scope.row.state == 4 - ? "已驳回" + ? "已闭合" + : scope.row.state == 4 && scope.row.level == 1 + ? "初审驳回" + : scope.row.state == 4 && scope.row.level == 2 + ? "终审驳回" : "" }} @@ -269,7 +275,7 @@ - + - + @@ -147,11 +151,13 @@ const columns: ColumnProps[] = [ search: { el: "select" }, width: 150, enum: [ - { label: "执法中", value: 1 }, - { label: "待整改", value: 2 }, - { label: "待审核", value: 3 }, - { label: "已闭合", value: 4 }, - { label: "已驳回", value: 5 } + // { label: "执法中", value: 1 }, + { label: "待整改", value: "2" }, + { label: "待初审", value: "3-1" }, + { label: "待终审", value: "4-1" }, + { label: "已闭合", value: "4-2" }, + { label: "初审驳回", value: "5-1" }, + { label: "终审驳回", value: "5-2" } ] }, { prop: "slippage", label: "逾期情况(天)", width: 150 }, @@ -183,6 +189,7 @@ const onSearch = async (params: any) => { }; // 全部审核完成 const allConfirm = () => { + console.log(666777888); proTable.value.getTableList(); }; const handleLookItem = row => { @@ -215,19 +222,23 @@ const onCurChange = async (params: number) => { }; const getTableList = (params: any) => { let newParams = JSON.parse(JSON.stringify(params)); + newParams.type = 1; if (newParams.createTime) { newParams.createTime_begin = newParams.createTime[0]; newParams.createTime_end = newParams.createTime[1]; delete newParams.createTime; } - if (active.value === 0) { - newParams.projectSn = searchSn.value; - } else { - newParams.engineeringSn = searchSn.value; + if (newParams.state) { + if (newParams.state.indexOf("-")) { + newParams.level = Number(newParams.state[2]); + newParams.state = Number(newParams.state[0]); + } else { + newParams.state = newParams.state; + } } - newParams.type = 1; - if (!(newParams.projectSn || newParams.engineeringSn)) { - return { result: { records: [], current: "1", total: "0", size: "10" } }; + newParams.engineeringSn = searchSn.value; + if (!newParams.engineeringSn) { + return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } }; } return statisticsTable(newParams); }; @@ -283,9 +294,9 @@ watch( ); onMounted(async () => { await getEngPage(); + searchSn.value = (records.value as any[])[0].engineeringSn; + searchName.value = (records.value as any[])[0].engineeringName; onSearch(records.value[0]); - searchSn.value = (records.value as any[])[0].projectSn; - searchName.value = (records.value as any[])[0].projectName; await sendIframeMessage({ obj: { path: route.path } }, 2, undefined); }); diff --git a/src/views/goverment/huizhou/siteSupervision/monitorManagement/index.vue b/src/views/goverment/huizhou/siteSupervision/monitorManagement/index.vue index 41a37c5..ba2d618 100644 --- a/src/views/goverment/huizhou/siteSupervision/monitorManagement/index.vue +++ b/src/views/goverment/huizhou/siteSupervision/monitorManagement/index.vue @@ -284,7 +284,7 @@ const getTableList = (params: any) => { let newParams = JSON.parse(JSON.stringify(params)); newParams.engineeringSn = searchSn.value; if (!newParams.engineeringSn) { - return { result: { records: [], current: "1", total: "0", size: "10" } }; + return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } }; } return getvideoManagementPage(newParams); }; diff --git a/src/views/goverment/qualitySupervision/checkStore/index.vue b/src/views/goverment/qualitySupervision/checkStore/index.vue index 23dce46..5e0a816 100644 --- a/src/views/goverment/qualitySupervision/checkStore/index.vue +++ b/src/views/goverment/qualitySupervision/checkStore/index.vue @@ -258,7 +258,7 @@ const getTableList = (params: any) => { console.log(newParams); return smallStore(newParams); } else { - return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } }; + return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } }; } }; // dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段 diff --git a/src/views/goverment/safetySupervision/checkStore/index.vue b/src/views/goverment/safetySupervision/checkStore/index.vue index acba7ca..f15db3b 100644 --- a/src/views/goverment/safetySupervision/checkStore/index.vue +++ b/src/views/goverment/safetySupervision/checkStore/index.vue @@ -238,7 +238,7 @@ const getTableList = (params: any) => { console.log(newParams); return smallStore(newParams); } else { - return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } }; + return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } }; } }; // dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段 diff --git a/src/views/hz-enterprise/largeScreen/largeScreenOne/components/projectInfoDialog.vue b/src/views/hz-enterprise/largeScreen/largeScreenOne/components/projectInfoDialog.vue index 60a3a9f..d926aef 100644 --- a/src/views/hz-enterprise/largeScreen/largeScreenOne/components/projectInfoDialog.vue +++ b/src/views/hz-enterprise/largeScreen/largeScreenOne/components/projectInfoDialog.vue @@ -105,6 +105,144 @@ +
+
履约评价
+
+
+
+ 序号 +
+
+ 企业名称 +
+
+ 企业类型 +
+
+ 履约得分 +
+
+
+
+ - +
+
+ - +
+
+ 承建单位 +
+
+ - +
+
+
+
+ - +
+
+ - +
+
+ 监理单位 +
+
+ - +
+
+
+
+ - +
+
+ - +
+
+ 设计单位 +
+
+ - +
+
+
+
+ - +
+
+ - +
+
+ - +
+
+ - +
+
+
+
+
+
招标管理
+
+
+ +
+
招标概况
+
+
+
+
+
+
+ 招标名称 + +
+
+ 招标日期 + +
+
+
+
+ 类型 + +
+
+ 中标单位 + +
+
+
+
+ 规模 + +
+
+ 负责人 + +
+
+
+
+ 所属行业 + +
+
+ 联系人 + +
+
+
+
+ +
+
+ +
-
+
+
+ +
+
@@ -127,7 +265,7 @@ const closeFn = () => { .dialogBox { position: fixed; top: 50%; - left: 50%; + left: calc(50% + 100px); z-index: 99; width: 1430px; padding-top: 40px; @@ -209,6 +347,48 @@ const closeFn = () => { } } } +.detailTable { + margin: 20px 20px; + .item { + display: flex; + align-items: center; + color: rgb(255 255 255 / 80%); + border-bottom: 1px solid #1e3758; + &:last-child { + border-bottom: none; + } + .label { + display: inline-block; + width: 100%; + color: #97baa4; + text-align: center; + } + span { + padding: 8px; + } + .itemInner { + width: 25%; + border-right: 1px solid #1e3758; + border-bottom: 1px solid #1e3758; + } + .address { + display: inline-block; + width: 150px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + vertical-align: top; + } + } + .item:not(:first-child) .itemInner { + .label { + display: inline-block; + width: 100%; + color: #c4c6ce; + text-align: center; + } + } +} .intro { height: 150px; margin: 0 40px; diff --git a/src/views/hz-enterprise/largeScreen/largeScreenOne/style.scss b/src/views/hz-enterprise/largeScreen/largeScreenOne/style.scss index e7c7f4d..38b7d38 100644 --- a/src/views/hz-enterprise/largeScreen/largeScreenOne/style.scss +++ b/src/views/hz-enterprise/largeScreen/largeScreenOne/style.scss @@ -91,9 +91,9 @@ margin-bottom: 0; } .name { - width: 100px; + width: max-content; display: inline-flex; - margin: 0 0 0 12px; + margin: 0 5px 0 12px; white-space: nowrap; } .rect { diff --git a/src/views/hz-enterprise/smartSite/alarmLedger/index.vue b/src/views/hz-enterprise/smartSite/alarmLedger/index.vue index 453c9a7..ddb89cc 100644 --- a/src/views/hz-enterprise/smartSite/alarmLedger/index.vue +++ b/src/views/hz-enterprise/smartSite/alarmLedger/index.vue @@ -318,7 +318,7 @@ const getTableList = (params: any) => { } newParams.engineeringSn = searchSn.value; if (!newParams.engineeringSn) { - return { result: { records: [], current: "1", total: "0", size: "10" } }; + return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } }; } return getLedgerPage(newParams); }; diff --git a/src/views/hz-enterprise/smartSite/dustManagement/index.vue b/src/views/hz-enterprise/smartSite/dustManagement/index.vue index f205e1b..7b68e7c 100644 --- a/src/views/hz-enterprise/smartSite/dustManagement/index.vue +++ b/src/views/hz-enterprise/smartSite/dustManagement/index.vue @@ -283,7 +283,7 @@ const getTableList = (params: any) => { let newParams = JSON.parse(JSON.stringify(params)); newParams.engineeringSn = searchSn.value; if (!newParams.engineeringSn) { - return { result: { records: [], current: "1", total: "0", size: "10" } }; + return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } }; } return getDustManagementPage(newParams); }; diff --git a/src/views/hz-enterprise/smartSite/realTime/index.vue b/src/views/hz-enterprise/smartSite/realTime/index.vue index 6891f02..91e784c 100644 --- a/src/views/hz-enterprise/smartSite/realTime/index.vue +++ b/src/views/hz-enterprise/smartSite/realTime/index.vue @@ -194,7 +194,7 @@ const getTableList = (params: any) => { let newParams = JSON.parse(JSON.stringify(params)); newParams.engineeringSn = searchSn.value; if (!newParams.engineeringSn) { - return { result: { records: [], current: "1", total: "0", size: "10" } }; + return { result: { records: [], current: "1", pages: "1", size: "10", total: "0" } }; } return getRealTimePage(newParams); };