diff --git a/src/assets/images/dangerousEngineeringImg/dangerAlarm.png b/src/assets/images/dangerousEngineeringImg/dangerAlarm.png new file mode 100644 index 0000000..98380b6 Binary files /dev/null and b/src/assets/images/dangerousEngineeringImg/dangerAlarm.png differ diff --git a/src/layouts/components/Header/components/Message.vue b/src/layouts/components/Header/components/Message.vue index 9b8d3b4..e0ddc9d 100644 --- a/src/layouts/components/Header/components/Message.vue +++ b/src/layouts/components/Header/components/Message.vue @@ -20,7 +20,7 @@ class="message-item" v-for="(item, index) in messageList" :key="index" - @dblclick="changeStatus(item)" + @click="changeStatus(item)" >
{{ item.type == 1 ? "通知公告" : item.type == 2 ? "政策法规" : "无标题" }} @@ -124,11 +124,11 @@ const createMqttConnect = () => { clientInstance.value.subscribe(`wisdomSite/message/${store.userInfo.userId}`, { qos: 1 }, (error, res) => { console.log(error, res); }); - }); - clientInstance.value.on("message", (topic, message) => { - let val = JSON.parse(message.toString()); - console.log(val); - getInfoList(); + clientInstance.value.on("message", (topic, message) => { + let val = JSON.parse(message.toString()); + console.log(val); + getInfoList(); + }); }); }; // 断开连接 @@ -171,6 +171,7 @@ onBeforeUnmount(() => { display: none; } .message-item { + width: 100%; display: flex; align-items: center; padding: 20px 0; diff --git a/src/views/enterprise/monthlyReport/components/monthlyDetails.vue b/src/views/enterprise/monthlyReport/components/monthlyDetails.vue index 92960ac..4787c52 100644 --- a/src/views/enterprise/monthlyReport/components/monthlyDetails.vue +++ b/src/views/enterprise/monthlyReport/components/monthlyDetails.vue @@ -536,6 +536,7 @@ onMounted(() => {}); // height: 100%; > div { display: flex; + min-height: 50px; > div:nth-child(2n-1) { @include flex; justify-content: center; diff --git a/src/views/goverment/AIwarning/warningMap/index.vue b/src/views/goverment/AIwarning/warningMap/index.vue index 88779ee..c642b0b 100644 --- a/src/views/goverment/AIwarning/warningMap/index.vue +++ b/src/views/goverment/AIwarning/warningMap/index.vue @@ -144,11 +144,71 @@ const onSearch = async (params: ResAiEngineerPage | ResAiProjectPage) => { ); // 匹配到的 去做一个处理 开关啥的 monitorList.value = monitorList.value.map(item => (item === curr ? { ...curr, showGif: true } : { ...item, showGif: false })); - params.longitude !== "" && params.longitude !== null - ? map.value?.setCenter([params.longitude, +params.latitude]) - : map.value?.setCenter([116.481181, 39.90923]); + if (params.longitude && params.latitude) { + console.log(111); + map.value?.setCenter([+params.longitude, +params.latitude]); + showInfoPage(curr); + } + // params.longitude !== "" && params.longitude !== null + // ? map.value?.setCenter([params.longitude, +params.latitude]) + // : map.value?.setCenter([116.481181, 39.90923]); }; +// 展示信息窗口 +const showInfoPage = async (obj: any) => { + const createMarkerImage = (state: string) => new URL(`../../../assets/images/AIwaring/${state}`, import.meta.url).href; + // 创建一个 选中的Icon + let selectIcon = getIcon( + "selected", + obj.environAlarmFlag === false ? createMarkerImage("clouding.gif") : createMarkerImage("warnclouding.gif") + ); + + // 将 icon 传入 marker + let startMarker = new AMapRef.value.Marker({ + position: new AMapRef.value.LngLat(Number(obj.longitude) || 113, Number(obj.latitude) || 21), + icon: selectIcon, + offset: new AMapRef.value.Pixel(-13, -30) + }); + map.value?.add([startMarker]); + monitorList.value = monitorList.value.map(val => + val.latitude == obj.latitude && val.longitude == obj.longitude + ? { ...obj, showGif: true } + : { ...val, showGif: false, showInfo: false } + ); + const curr = monitorList.value.find(item => item.showGif); + curr.showInfo = !curr.showInfo; + // addMarker(); + + aiAlarmFlag.value = obj.aiAlarmFlag; + + // e.target.setIcon(selectIcon); + if (active.value === 0) { + infoName.value = obj.projectName; + // @ts-expect-error + const { result } = await getAIprodetail({ projectId: obj.projectId }); + // @ts-expect-error + infoWindowData.value = result; + } else { + infoName.value = obj.engineeringName; + const { result } = await getAIengdetail({ id: obj.id }); + // @ts-expect-error + infoWindowData.value = result; + } + + if (curr.showInfo) { + infoShow.value = true; + const infowindow = new AMapRef.value.InfoWindow({ + isCustom: true, //使用自定义窗体 + content: infoWindowPage.value, + offset: new AMap.Pixel(16, -45) + }); + + infowindow.open(map.value, startMarker.getPosition()); + } else { + infoShow.value = false; + onClose(); + } +}; // 页面的搜索按钮 const onSearchInput = async (params: string) => { if (active.value === 0) { @@ -266,7 +326,7 @@ const addMarker = () => { const mapData = async () => { const AMap = await initAMap(); AMapRef.value = AMap; - map.value = new AMap.Map("map-container", { zoom: 10, center: [116.481181, 39.90923], viewMode: "2D", resizeEnable: true }); + map.value = new AMap.Map("map-container", { zoom: 7, center: [116.481181, 39.90923], viewMode: "2D", resizeEnable: true }); // 这个是点击地图的时候关闭信息弹窗 就不用点击图标或者x的时候 但是得点两次 所以有问题 // map.value?.on("click", function (e) { // infoShow.value = false; diff --git a/src/views/goverment/dangerousEngineering/index.vue b/src/views/goverment/dangerousEngineering/index.vue index 92ad23e..e5e0f23 100644 --- a/src/views/goverment/dangerousEngineering/index.vue +++ b/src/views/goverment/dangerousEngineering/index.vue @@ -15,9 +15,13 @@
- + - {{ data.projectAddress || data.address }} + 危大工程总数：{{ data.number ? data.number : 0 }}
diff --git a/src/views/goverment/dustManagement/index.vue b/src/views/goverment/dustManagement/index.vue index da9e270..3aca564 100644 --- a/src/views/goverment/dustManagement/index.vue +++ b/src/views/goverment/dustManagement/index.vue @@ -185,7 +185,6 @@ const onSearch = async (params: ResAiEngineerPage | ResAiProjectPage) => { map.value?.setCenter([+params.longitude, +params.latitude]); showInfoPage(curr); } - // params.longitude !== "" && params.longitude !== null // ? map.value?.setCenter([params.longitude, +params.latitude]) // : map.value?.setCenter([116.481181, 39.90923]); diff --git a/src/views/goverment/engineeringAcceptance/acceptancePlan/index.scss b/src/views/goverment/engineeringAcceptance/acceptancePlan/index.scss index 418afce..ffb8729 100644 --- a/src/views/goverment/engineeringAcceptance/acceptancePlan/index.scss +++ b/src/views/goverment/engineeringAcceptance/acceptancePlan/index.scss @@ -9,7 +9,7 @@ // width: 290px; // 页面的项目工程 :deep(.item) { - height: 78px !important; + height: 108px !important; } :deep(.content) { height: calc(100% - 150px) !important; @@ -29,15 +29,30 @@ white-space: nowrap; } .leftMenu_item { + width: 100%; display: flex; justify-content: space-between; overflow: hidden; - .middleSize { - display: inline-block; - font-size: 12px; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; + > div { + width: 100%; + .middleSize { + display: inline-block; + font-size: 12px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + } + .count-data { + display: flex; + align-items: center; + margin-top: 15px; + span { + color: #838689; + } + span:nth-child(1) { + margin-right: auto; + } + } } } } diff --git a/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue b/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue index a89195e..d4fe305 100644 --- a/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue +++ b/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue @@ -13,13 +13,17 @@
{{ data.projectName || data.engineeringName }}
-
+
{{ data.projectAddress || data.address }}
+
+ 单体工程数量：{{ data.singleProjectNum ? data.singleProjectNum : 0 }} + 已验收单体工程数量：{{ data.acceptedNum ? data.acceptedNum : 0 }} +
diff --git a/src/views/goverment/monthlyReport/components/monthlyDetails.vue b/src/views/goverment/monthlyReport/components/monthlyDetails.vue index 273d99b..dd34231 100644 --- a/src/views/goverment/monthlyReport/components/monthlyDetails.vue +++ b/src/views/goverment/monthlyReport/components/monthlyDetails.vue @@ -539,6 +539,7 @@ onMounted(() => {}); width: 97%; // height: 100%; > div { + min-height: 50px; display: flex; > div:nth-child(2n-1) { @include flex; diff --git a/src/views/goverment/progressManagement/GanttchartChart/index.vue b/src/views/goverment/progressManagement/GanttchartChart/index.vue index 9ab086a..5fe9aaa 100644 --- a/src/views/goverment/progressManagement/GanttchartChart/index.vue +++ b/src/views/goverment/progressManagement/GanttchartChart/index.vue @@ -152,7 +152,6 @@ const headerList = reactive([ { label: "未开始", color: "#35e5fd" }, { label: "进行中", color: "#f1d520" }, { label: "已完成", color: "#4fd389" }, - , { label: "逾期", color: "#F80840" } // { label: "逾期未开始", color: "#F80840" }, // { label: "逾期进行中", color: "#fc6f8e" }, diff --git a/src/views/home/index.scss b/src/views/home/index.scss index ab28281..41fb805 100644 --- a/src/views/home/index.scss +++ b/src/views/home/index.scss @@ -1,6 +1,11 @@ .el-container { width: 100%; height: 100%; + overflow-y: scroll; + /* 隐藏滚动条 */ + &::-webkit-scrollbar { + display: none; + } .el-header { box-sizing: border-box; display: flex; diff --git a/src/views/project/monthlyReport/components/monthlyDetails.vue b/src/views/project/monthlyReport/components/monthlyDetails.vue index b983790..db99896 100644 --- a/src/views/project/monthlyReport/components/monthlyDetails.vue +++ b/src/views/project/monthlyReport/components/monthlyDetails.vue @@ -541,6 +541,7 @@ onMounted(() => {}); width: 97%; // height: 100%; > div { + min-height: 50px; display: flex; > div:nth-child(2n-1) { @include flex;