소스 검색

页面提交

wang_xy 5 일 전
부모
커밋
47a4a5dce1
5개의 변경된 파일63개의 추가작업 그리고 19개의 파일을 삭제
  1. 2 2
      src/api/data.js
  2. 6 5
      src/components/supermap-2.5d.vue
  3. 19 1
      src/views/SentryEmergencyCenter.vue
  4. 21 3
      src/views/SentryPage.vue
  5. 15 8
      src/views/useCenter.vue

+ 2 - 2
src/api/data.js

@@ -36,9 +36,9 @@ export function countByWarningCategory() {
  * 根据企业查小区
  * @returns {*}
  */
-export function getCommunityByDeptId() {
+export function getCommunityByDeptId(deptId) {
   return request({
-    url: '/sooka-digital-construction/gas/getCommunityByDeptId?deptId='+deviceCode,
+    url: '/sooka-digital-construction/gas/getCommunityByDeptId?deptId='+deptId,
     method: 'get',
   })
 }

+ 6 - 5
src/components/supermap-2.5d.vue

@@ -467,16 +467,17 @@ export default {
           }
 
           //加载二维图层
-        if(urlList[1]){
-          if(!this.open_LifelineList_2D.some(item => item.url === urlList[1])){//查找已勾选的图层数组
+        if(urlList[1]) {
+          if (!this.open_LifelineList_2D.some(item => item.url === urlList[1])) {//查找已勾选的图层数组
             let obj = this.viewer.imageryLayers.addImageryProvider(new SuperMap3D.SuperMapImageryProvider({
-              url:this.superMapRootUrl + urlList[1]
+              url: this.superMapRootUrl + urlList[1]
             }));
             this.open_LifelineList_2D.push({
-              url:  urlList[1],
+              url: urlList[1],
               mapObj: obj
             })
-          checkedCities_2D.push(urlList[1])
+            checkedCities_2D.push(urlList[1])
+          }
         }
       });
       const urlsToRemove_2D = this.open_LifelineList_2D.map(item => item.url).filter(url => !checkedCities_2D.includes(url));//查找没勾选的图层数组2D

+ 19 - 1
src/views/SentryEmergencyCenter.vue

@@ -328,7 +328,9 @@
 				let xdata = data.time //x轴
 				let dataArr = data.value //value
 				let dashedArr = data.threshold
-				let titleName = "阈值";
+				let dashedArr1 = data.threshold
+				let titleName = "告警阈值";
+				let titleName1 = "紧急阈值";
 				let titleNames = "实际值";
 				let option = {
 					backgroundColor: "rgba(25,44,59,.4)",
@@ -446,6 +448,22 @@
 							data: dashedArr,
 						},
 						{
+							name: titleName1,
+							type: "line",
+							smooth: true,
+							symbol: "none",
+							itemStyle: {
+								normal: {
+									lineStyle: {
+										type: "dashed",
+									},
+									color: "#f6502b", //拐点的颜色
+									borderColor: "#f6502b", //拐点边框的颜色
+								},
+							},
+							data: dashedArr1,
+						},
+						{
 							name: titleNames,
 							type: "line",
 							stack: "总量",

+ 21 - 3
src/views/SentryPage.vue

@@ -317,9 +317,11 @@
 				const myChart = echarts.init(document.getElementById('sbxqChart'))
 				let xdata = data.time //x轴
 				let dataArr = data.value //value
-				let dashedArr = data.threshold
-				let titleName = "阈值";
-				let titleNames = "实际值";
+        let dashedArr = data.threshold
+        let dashedArr1 = data.urgent
+        let titleName = "告警阈值";
+        let titleName1 = "紧急阈值";
+        let titleNames = "实际值";
 				let option = {
 					backgroundColor: "rgba(25,44,59,.4)",
 					grid: {
@@ -435,6 +437,22 @@
 							},
 							data: dashedArr,
 						},
+            {
+              name: titleName1,
+              type: "line",
+              smooth: true,
+              symbol: "none",
+              itemStyle: {
+                normal: {
+                  lineStyle: {
+                    type: "dashed",
+                  },
+                  color: "#f6502b", //拐点的颜色
+                  borderColor: "#f6502b", //拐点边框的颜色
+                },
+              },
+              data: dashedArr1,
+            },
 						{
 							name: titleNames,
 							type: "line",

+ 15 - 8
src/views/useCenter.vue

@@ -14,13 +14,13 @@
         v-model="input1">
       </el-input>
       <dl class="sp_list">
-        <dt><span class="dt1" style="width: 130px">名称</span><span class="dt2" style="width: 120px">用户数量</span><span class="dt3" style="width: 30px">定位</span>
+        <dt><span class="dt1" style="width: 150px!important">名称</span><span class="dt2" style="width: 100px!important">用户数量</span><span class="dt3" style="width: 30px!important">定位</span>
         </dt>
         <div class="hei_scroll" style="height: 46vh">
           <dd v-for="item in communityList">
-            <span class="dt1" style="width: 130px">{{ item.communityName }}</span>
-            <span class="dt2" style="width: 120px">{{ item.personNum }}</span>
-            <span class="dt3" style="width: 30px"><img
+            <span class="dt1" style="width: 150px!important">{{ item.communityName }}</span>
+            <span class="dt2" style="width: 100px!important">{{ item.personNum }}</span>
+            <span class="dt3" style="width: 30px!important" @click="dropLocation(item.latitude,item.longitude)"><img
               src="../assets/images/sentinel/hz_list_d.png"/></span>
           </dd>
         </div>
@@ -62,12 +62,16 @@
       </div>
 
       <dl class="sp_list">
-        <dt><span class="dt1">序号</span><span class="dt2">用户</span><span class="dt3" style="width: 80px">手机号码</span></dt>
+        <dt>
+          <span class="dt1" style="width: 80px!important;">序号</span>
+          <span class="dt2" style="width: 80px!important;">用户</span>
+          <span class="dt3" style="width: 80px!important;">手机号码</span>
+        </dt>
         <div class="hei_scroll hei56">
           <dd v-for="(e,idx) in userListSearch" :key="idx">
-            <span class="dt1">{{ idx + 1 }}</span>
-            <span class="dt2">{{ e.name }}</span>
-            <span class="dt2">{{ e.number }}</span>
+            <span class="dt1" style="width: 80px!important;">{{ idx + 1 }}</span>
+            <span class="dt2" style="width: 80px!important;">{{ e.name }}</span>
+            <span class="dt2" style="width: 80px!important;">{{ e.number }}</span>
           </dd>
         </div>
       </dl>
@@ -167,6 +171,9 @@ export default {
         this.communityList = req.data;
       })
     },
+    dropLocation(lat, lng) {
+      this.$parent.$refs.supermap.dropLocation(lat*1, lng*1)
+    },
     //设备分析
     chart() {
       const chartDom = this.$refs.chart;