diff --git a/src/api/modules/project.ts b/src/api/modules/project.ts index f551b53..fa495d5 100644 --- a/src/api/modules/project.ts +++ b/src/api/modules/project.ts @@ -707,3 +707,9 @@ export const monthlyReportDetails = (params: any) => { export const engineerMainDetails = (params: any) => { return http.post(BASEURL + `/project/engineering/queryAndMainById`, params); }; + +// 危大工程 +// 危大工程台账 +export const dangerousEngineerPage = (params: any) => { + return http.post(BASEURL + `/project/dangerousEngineering/page`, params); +}; diff --git a/src/assets/images/dangerousEngineeringImg/下月计划施工的危大工程.png b/src/assets/images/dangerousEngineeringImg/下月计划施工的危大工程.png new file mode 100644 index 0000000..9fd3ddc Binary files /dev/null and b/src/assets/images/dangerousEngineeringImg/下月计划施工的危大工程.png differ diff --git a/src/assets/images/dangerousEngineeringImg/危大工程施工部位.png b/src/assets/images/dangerousEngineeringImg/危大工程施工部位.png new file mode 100644 index 0000000..5f8e58c Binary files /dev/null and b/src/assets/images/dangerousEngineeringImg/危大工程施工部位.png differ diff --git a/src/assets/images/dangerousEngineeringImg/图片.png b/src/assets/images/dangerousEngineeringImg/图片.png new file mode 100644 index 0000000..d1a5609 Binary files /dev/null and b/src/assets/images/dangerousEngineeringImg/图片.png differ diff --git a/src/assets/images/dangerousEngineeringImg/在施危大工程.png b/src/assets/images/dangerousEngineeringImg/在施危大工程.png new file mode 100644 index 0000000..d956e87 Binary files /dev/null and b/src/assets/images/dangerousEngineeringImg/在施危大工程.png differ diff --git a/src/assets/images/dangerousEngineeringImg/本月危大工程导致隐患数量.png b/src/assets/images/dangerousEngineeringImg/本月危大工程导致隐患数量.png new file mode 100644 index 0000000..44045e4 Binary files /dev/null and b/src/assets/images/dangerousEngineeringImg/本月危大工程导致隐患数量.png differ diff --git a/src/assets/images/dangerousEngineeringImg/本月危大工程排查覆盖率.png b/src/assets/images/dangerousEngineeringImg/本月危大工程排查覆盖率.png new file mode 100644 index 0000000..e613d98 Binary files /dev/null and b/src/assets/images/dangerousEngineeringImg/本月危大工程排查覆盖率.png differ diff --git a/src/assets/images/dangerousEngineeringImg/本月检查总数.png b/src/assets/images/dangerousEngineeringImg/本月检查总数.png new file mode 100644 index 0000000..82d6902 Binary files /dev/null and b/src/assets/images/dangerousEngineeringImg/本月检查总数.png differ diff --git a/src/assets/images/leftTab/危大工程台账.png b/src/assets/images/leftTab/危大工程台账.png new file mode 100644 index 0000000..eefbd44 Binary files /dev/null and b/src/assets/images/leftTab/危大工程台账.png differ diff --git a/src/components/AMap/AMap.ts b/src/components/AMap/AMap.ts index 1691c42..d77ee96 100644 --- a/src/components/AMap/AMap.ts +++ b/src/components/AMap/AMap.ts @@ -7,13 +7,14 @@ import { AMAP_MAP_KEY } from "@/config/config"; // see: https://lbs.amap.com/api/jsapi-v2/guide/abc/prepare window._AMapSecurityConfig = { securityJsCode: "df19aa4c9f83a52f7ef66843449f438e" // 密钥 + // securityJsCode: "6caf6429e4b98cf7f39db9bf7014a78b" // 密钥 }; const amap = (async function (Loader, AMAP_MAP_KEY) { return Loader.load({ key: AMAP_MAP_KEY, version: "2.0", - plugins: ["AMap.PlaceSearch", "AMap.AutoComplete", "AMap.Geocoder"] + plugins: ["AMap.AutoComplete", "AMap.PlaceSearch", "AMap.Geocoder"] }); })(AMapLoader, AMAP_MAP_KEY); diff --git a/src/components/AMap/AMap.vue b/src/components/AMap/AMap.vue index 5c0c32e..021ad2b 100644 --- a/src/components/AMap/AMap.vue +++ b/src/components/AMap/AMap.vue @@ -13,7 +13,11 @@

坐标拾取

- +
@@ -98,7 +102,7 @@ const open = async () => { }); // 联想输入与 POI 搜索 - autocomplete.value = new AMap.AutoComplete({ extensions: "all", input: "map-input" }); + autocomplete.value = new AMap.AutoComplete({ input: "map-input" }); search.value = new AMap.PlaceSearch({ map: map.value, extensions: "base" }); autocomplete.value?.on("select", (e: any) => { map.value?.clearMap(); diff --git a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue index faa2d51..e6b435a 100644 --- a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue +++ b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue @@ -18,7 +18,9 @@ 检查情况： {{ - basicData?.state == 1 + basicData?.state == 0 + ? "待检查" + : basicData?.state == 1 ? "执法中" : basicData?.state == 2 ? "待整改" diff --git a/src/views/goverment/approve/company/index.vue b/src/views/goverment/approve/company/index.vue index e5315ad..e91ecfe 100644 --- a/src/views/goverment/approve/company/index.vue +++ b/src/views/goverment/approve/company/index.vue @@ -120,7 +120,7 @@
- + diff --git a/src/views/login/CompanyLogon/basic-form.ts b/src/views/login/CompanyLogon/basic-form.ts index 67efbc2..09e90e3 100644 --- a/src/views/login/CompanyLogon/basic-form.ts +++ b/src/views/login/CompanyLogon/basic-form.ts @@ -65,6 +65,11 @@ export const rules = reactive({ required: true, message: "请输入统一社会信用码", trigger: "blur" + }, + { + pattern: /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/, + message: "格式错误", + trigger: "blur" } // { // type: "number", diff --git a/src/views/project/dangerousEngineering/components/engineerAdd.vue b/src/views/project/dangerousEngineering/components/engineerAdd.vue new file mode 100644 index 0000000..6a16d9f --- /dev/null +++ b/src/views/project/dangerousEngineering/components/engineerAdd.vue @@ -0,0 +1,274 @@ + + + + + diff --git a/src/views/project/dangerousEngineering/components/engineerDetails.vue b/src/views/project/dangerousEngineering/components/engineerDetails.vue new file mode 100644 index 0000000..d7e5904 --- /dev/null +++ b/src/views/project/dangerousEngineering/components/engineerDetails.vue @@ -0,0 +1,590 @@ + + + + + diff --git a/src/views/project/dangerousEngineering/index.scss b/src/views/project/dangerousEngineering/index.scss new file mode 100644 index 0000000..7cc623d --- /dev/null +++ b/src/views/project/dangerousEngineering/index.scss @@ -0,0 +1,50 @@ +.type-select { + display: grid; + grid-template-columns: repeat(6, 1fr); + grid-gap: 20px; + // display: flex; + // justify-content: space-between; + // align-content: flex-start; + // flex-wrap: wrap; + margin-bottom: 20px; + .sta-item { + background-color: rgba(255, 255, 255, 0.9); + border-radius: 8px 8px 8px 8px; + padding: 24px 0; + &-content { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + > img { + width: 44px; + height: 44px; + margin-bottom: 17px; + } + > span:nth-child(2) { + font-size: 36px; + font-family: OPPOSans-Heavy, OPPOSans; + font-weight: 800; + color: #2e3038; + margin-bottom: 8px; + } + > span:nth-child(3) { + font-size: 16px; + font-family: Source Han Sans CN-Regular, Source Han Sans CN; + font-weight: 400; + color: #6b7275; + } + } + } +} +.table-box { + height: calc(100% - 205px); + :deep() { + .table { + height: 100%; + .table-main { + height: calc(100% - 82px); + } + } + } +} diff --git a/src/views/project/dangerousEngineering/index.vue b/src/views/project/dangerousEngineering/index.vue new file mode 100644 index 0000000..431bd94 --- /dev/null +++ b/src/views/project/dangerousEngineering/index.vue @@ -0,0 +1,261 @@ + + + + diff --git a/src/views/project/engineeringAcceptance/acceptanceApply/components/transformInfo.vue b/src/views/project/engineeringAcceptance/acceptanceApply/components/transformInfo.vue index 0e08096..029adb2 100644 --- a/src/views/project/engineeringAcceptance/acceptanceApply/components/transformInfo.vue +++ b/src/views/project/engineeringAcceptance/acceptanceApply/components/transformInfo.vue @@ -18,7 +18,9 @@ 检查情况： {{ - basicData?.state == 1 + basicData?.state == 0 + ? "待检查" + : basicData?.state == 1 ? "执法中" : basicData?.state == 2 ? "待整改"