2 Commits 929d047027 ... 7e03a22432

Autore SHA1 Messaggio Data
  wang_xy 7e03a22432 Merge remote-tracking branch 'origin/lifeline_develop_siping_v3' into lifeline_develop_siping_v3 4 giorni fa
  wang_xy a41d639486 生命线管线接口更改提交 4 giorni fa

+ 1 - 1
src/api/UtillityTunnel.js

@@ -30,7 +30,7 @@ export function utilityTunnelManholeList(param) {
  */
 export function utilityTunnelMaintenanceRepairList(param) {
   return request({
-    url: '/sooka-digital-construction/utilityTunnelView/utilityTunnelMaintenanceRepairList',
+    url: '/sooka-digital-construction/utilityTunnelView/getUtilityTunnelMaintenanceRepairList',
     method: 'get',
     params: param
   })

+ 4 - 3
src/api/data.js

@@ -17,7 +17,7 @@ export function userStats(deptId) {
  */
 export function getPipeLengthByPressureLevel() {
   return request({
-    url: '/sooka-digital-construction/gas/getPipeLengthByPressureLevel',
+    url: '/sooka-digital-construction/gasView/getPipeLengthByPressureLevel',
     method: 'get',
   })
 }
@@ -36,10 +36,11 @@ export function countByWarningCategory() {
  * 根据企业查小区
  * @returns {*}
  */
-export function getCommunityByDeptId(deptId) {
+export function getCommunityByDeptId(param) {
   return request({
-    url: '/sooka-digital-construction/community/getCommunityByDeptId?deptId='+deptId,
+    url: '/sooka-digital-construction/community/getCommunityByDeptId',
     method: 'get',
+    params:param
   })
 }
 /**

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

@@ -365,9 +365,9 @@ export default {
 
 
       that.flyTo(longitude, latitude, height)
-      that.viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(
-        Cesium.ScreenSpaceEventType.LEFT_DOUBLE_CLICK
-      );
+      // that.viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(
+      //   Cesium.ScreenSpaceEventType.LEFT_DOUBLE_CLICK
+      // );
       setTimeout(() => {
         //   that.viewer.imageryLayers.addImageryProvider(new SuperMap3D.SuperMapImageryProvider({
         //     url:that.superMapRootUrl + '/map-RLyicierci-2/rest/maps/TD_all@erci'
@@ -383,7 +383,7 @@ export default {
         //   }));
 
         //设置鼠标左键单击回调事件
-        this.handler.setInputAction(function (e) {
+        that.handler.setInputAction(function (e) {
           if (that.isObtainLaAndLon) {
 
             if (that.positioningEntity != null) {
@@ -412,7 +412,7 @@ export default {
                 disableDepthTestDistance: Number.POSITIVE_INFINITY
               },
             })
-
+            debugger
             that.$emit('setPositioning', longitude, latitude);
           }
         }, SuperMap3D.ScreenSpaceEventType.LEFT_DOUBLE_CLICK);
@@ -2342,7 +2342,6 @@ export default {
       })
     },
     setIsObtainLaAndLon(isObtainLaAndLon) {
-      let that=this
       this.isObtainLaAndLon = isObtainLaAndLon
     },
     clearDW() {

+ 12 - 13
src/components/tableInfo.vue

@@ -156,7 +156,7 @@
           <template #append></template>
         </el-input>
       </div>
-      <div v-if="type=='调蓄设施'" class="sjxq_inp">
+      <div v-if="type=='调蓄设施信息'" class="sjxq_inp">
         <el-input v-model="searchCode"  placeholder="设施编号" clearable >
           <template #append></template>
         </el-input>
@@ -164,7 +164,7 @@
           <template #append></template>
         </el-input>
       </div>
-      <div v-if="type=='管廊本体个数'" class="sjxq_inp">
+      <div v-if="type=='管廊本体信息'" class="sjxq_inp">
         <el-input v-model="searchCode"  placeholder="管廊编码" clearable>
           <template #append></template>
         </el-input>
@@ -180,7 +180,7 @@
           <template #append></template>
         </el-input>
       </div>
-      <div v-if="type=='管廊隐患信息个数'" class="sjxq_inp">
+      <div v-if="type=='管廊隐患信息'" class="sjxq_inp">
         <el-input v-model="searchCode"  placeholder="隐患编号" clearable>
           <template #append></template>
         </el-input>
@@ -188,7 +188,7 @@
           <template #append></template>
         </el-input>
       </div>
-      <div v-if="type=='管廊养护维修个数'" class="sjxq_inp">
+      <div v-if="type=='管廊养护维修'" class="sjxq_inp">
         <el-input v-model="searchValue" placeholder="维修地址" clearable>
           <template #append></template>
         </el-input>
@@ -994,7 +994,7 @@ export default {
         }
         this.$refs.detailDialog.openDetail(type,obj);
       }
-      else if (type == '调蓄设施') {
+      else if (type == '调蓄设施信息') {
         let obj = {
           '设施编号': row.facilityCode,
           '设施名称': row.facilityName,
@@ -1022,7 +1022,7 @@ export default {
       }
       /****************************************************************排水部分*******************************************************/
       /****************************************************************管廊部分*******************************************************/
-      else if (type == "管廊本体个数") {
+      else if (type == "管廊本体信息") {
         let obj = {
           "管廊编码": row.tunnelCode,
           "管廊类别": this.dict.type.utilityTunnel_body_type.find(item => item.value == row.tunnelCategory)?.label,
@@ -1083,7 +1083,7 @@ export default {
         this.$refs.detailDialog.openDetail(type,obj);
         return;
       }
-      else if (type == "管廊隐患信息个数") {
+      else if (type == "管廊隐患信息") {
         let obj = {
           "隐患编号": row.dangerId,
           "隐患描述": row.dangerDesc,
@@ -1107,7 +1107,7 @@ export default {
         this.$refs.detailDialog.openDetail(type,obj);
         return;
       }
-      else if (type == "管廊养护维修个数") {
+      else if (type == "管廊养护维修") {
         let obj = {
           "维修地址": row.repairAddress,
           "维修性质": this.dict.type.utilityTunnel_repair_properties.find(item => item.value == row.repairNature)?.label,
@@ -2665,7 +2665,7 @@ export default {
           })
         })
       }
-      else if (type == '调蓄设施'){
+      else if (type == '调蓄设施信息'){
         storageFacilitiesList({
           pageNum: pageNum || 1,
           pageSize: 10,
@@ -2711,7 +2711,7 @@ export default {
       }
       /****************************************************************排水部分*******************************************************/
       /****************************************************************管廊部分*******************************************************/
-      else if (type == '管廊本体个数') {
+      else if (type == '管廊本体信息') {
         this.tableListVisible = true
         utilityTunnelBodyInformationList({
           pageNum: pageNum || 1,
@@ -3011,7 +3011,7 @@ export default {
           }
         })
       }
-      else if (type == '管廊隐患信息个数') {
+      else if (type == '管廊隐患信息') {
         this.tableListVisible = true
         utilityTunnelHiddenDangerList({
           pageNum: pageNum || 1,
@@ -3050,12 +3050,11 @@ export default {
           }
         })
       }
-      else if (type == '管廊养护维修个数') {
+      else if (type == '管廊养护维修') {
         this.tableListVisible = true
         utilityTunnelMaintenanceRepairList({
           pageNum: pageNum || 1,
           pageSize: 10,
-          repairNature:'2,3,4',
           ...(this.searchValue ? {
             repairAddress: this.searchValue
           } : {})

File diff suppressed because it is too large
+ 24 - 24
src/views/Database.vue


+ 2 - 1
src/views/SentryEmergencyCenter.vue

@@ -51,7 +51,7 @@
       popper-class="popperClass"
       content="请选择经纬度"
       v-model="visible">
-      <div class="setEmergencyEvent" slot="reference" @click="getLocation">发起应急事件</div>
+      <div class="setEmergencyEvent" slot="reference" @click="setEmergencyEvent">发起应急事件</div>
     </el-popover>
 		<div class="visual-body">
 			<!--弹框演示模板 开始-->
@@ -721,6 +721,7 @@
 			// 事件日志 结束
 
       setPositioning(longitude, latitude) {
+        debugger
         this.positioning.longitude = longitude
         this.positioning.latitude = latitude
         this.setEmergencyEvent();

+ 1 - 0
src/views/SentryPage.vue

@@ -375,6 +375,7 @@
         this.$refs.eventLogUpload.eventLogUpload(eventDetails)
       },
       setPositioning(longitude, latitude) {
+        debugger
         this.$refs.SentryEmergencyCenter.setPositioning(longitude,latitude)
       },
       async logout() {

+ 5 - 2
src/views/industry/ThermalPower.vue

@@ -1634,7 +1634,7 @@ export default {
             {prop: 'id',label: '主键',hidden: true},
             {prop: 'pipeName',label: '管线名称'},
             {prop: 'pipeCode',label: '管线编码'},
-            {prop: 'pipeType',label: '管线类别',isDict: true,dictKey: 'gas_pipeline_category'},
+            {prop: 'pipeType',label: '管线类别'},
             {prop: 'cityCode',label: '地市编码',hidden: true},
             {prop: 'districtName',label: '区划名称'},
             {prop: 'startPointCode',label: '起点编号',hidden: true},
@@ -3075,6 +3075,9 @@ export default {
           case "设备管理":
             markersMap.icon = "shebei";
             break;
+          case "维修管理":
+            markersMap.icon = "weixiu";
+            break;
           case "物资管理":
             markersMap.icon = "wuzi";
             break;
@@ -3125,7 +3128,7 @@ export default {
           this.heatingPipe = {
             '管线名称': res.data.pipeName,
             '管线编码': res.data.pipeCode,
-            '管线类别': this.dict.type.gas_pipeline_category.find(item => item.value == res.data.pipeType)?.label,
+            '管线类别': res.data.pipeType,
             '区划名称': res.data.districtName,
             '起点编号': res.data.startPointCode,
             '终点编号': res.data.endPointCode,

+ 72 - 2
src/views/industry/UtilityTunnel.vue

@@ -529,6 +529,14 @@
           <el-date-picker type="date" value-format="yyyy-MM-dd" placeholder="维修时间" v-model="searchTime"
                           :clearable="true" style="width: 40%;"></el-date-picker>
         </div>
+        <div v-else-if="currentType=='隐患管理'">
+          <el-input v-model="searchCode"  placeholder="隐患编号" clearable>
+            <template #append></template>
+          </el-input>
+          <el-input v-model="searchValue" placeholder="隐患描述" clearable>
+            <template #append></template>
+          </el-input>
+        </div>
         <!-- 风险清单管理筛查项 -->
         <div v-else-if="currentType=='风险清单管理'">
           <!--<el-input v-model="searchTime" placeholder="建筑名称" clearable>-->
@@ -750,7 +758,7 @@ import {
   utilityTunnelManholeList,
   getUtilityTunnelDOOByDept,
   getUtilityTunnelByDataSetAndSmId,
-  getDeviceTypeCount,                           // 管廊-按照类型统计设备数量
+  getDeviceTypeCount, utilityTunnelHiddenDangerList,                           // 管廊-按照类型统计设备数量
 } from '@/api/UtillityTunnel'
 	export default {
     dicts: ['heating_device_type','heating_pipeline_category','construction_tasks_status','lifeline_industry','sys_notice_status','sys_notice_type','sys_normal_disable','sys_user_sex','lifeline_enterprise','task_issuing_dept','heating_device_type','utilityTunnel_body_type','utilityTunnel_repair_properties','utilityTunnel_fult_type'],
@@ -1381,7 +1389,6 @@ import {
           utilityTunnelMaintenanceRepairList({
             pageNum: pageNum || 1,
             pageSize: 10,
-            repairNature:'2,3,4',
             ...(this.searchValue ? {
               repairAddress: this.searchValue
             } : {}),
@@ -1446,6 +1453,45 @@ import {
             }
           })
         }
+        else if (type == '隐患管理') {
+          this.tableListVisible = true
+          utilityTunnelHiddenDangerList({
+            pageNum: pageNum || 1,
+            pageSize: 10,
+            ...(this.searchCode ? {
+              dangerId: this.searchCode
+            } : {}),
+            ...(this.searchValue ? {
+              dangerDesc: this.searchValue
+            } : {})
+          }).then(res => {
+            this.tablePropAndLabel = [
+              {prop: 'dangerId', label:'隐患编号'},
+              {prop: 'dangerDesc', label:'隐患描述'},
+              {prop: 'cityCode', label:'地市编码',hidden: true},
+              {prop: 'districtName', label:'区划名称',hidden: true},
+              {prop: 'dangerType',label: '隐患类型',isDict: true,dictKey: 'items_type'},
+              {prop: 'address', label:'隐患点地址'},
+              {prop: 'longitude', label:'经度',hidden: true},
+              {prop: 'latitude', label:'纬度',hidden: true},
+              {prop: 'orgStatus', label:'所属机构整改状态',hidden: true},
+              {prop: 'reporter', label:'上报人',hidden: true},
+              {prop: 'reporterUnit', label:'上报人单位',hidden: true},
+              {prop: 'reportTime', label:'上报时间',hidden: true},
+              {prop: 'responsiblePerson', label:'整改负责人',hidden: true},
+              {prop: 'contact', label:'联系方式',hidden: true},
+              {prop: 'planFixTime', label:'计划整改时间',hidden: true},
+              {prop: 'actualFixTime', label:'实际整改时间',hidden: true},
+              {prop: 'fixResult', label:'整改结果反馈',hidden: true},
+              {prop: 'deptName', label:'部门名称',hidden: true}
+            ]
+            this.tableList = res.rows
+            this.total = res.total
+            if (res.rows) {
+              this.dataText = "暂无数据"
+            }
+          })
+        }
         else if (type == '风险清单管理') {
           this.tableListVisible = true
           selectRiskRegisterlist({
@@ -2819,6 +2865,30 @@ import {
           this.$refs.detailDialog.openDetail(type,obj);
           return;
         }
+        else if (type == "隐患管理") {
+          let obj = {
+            "隐患编号": row.dangerId,
+            "隐患描述": row.dangerDesc,
+            "地市编码": row.cityCode,
+            "区划名称": row.districtName,
+            "隐患类型": this.dict.type.items_type.find(item => item.value == row.dangerType)?.label,
+            "隐患点地址": row.address,
+            "经度": row.longitude,
+            "纬度": row.latitude,
+            "所属机构整改状态": row.orgStatus,
+            "上报人": row.reporter,
+            "上报人单位": row.reporterUnit,
+            "上报时间": row.reportTime,
+            "整改负责人": row.responsiblePerson,
+            "联系方式": row.contact,
+            "计划整改时间": row.planFixTime,
+            "实际整改时间": row.actualFixTime,
+            "整改结果反馈": row.fixResult,
+            "部门名称": row.deptName,
+          };
+          this.$refs.detailDialog.openDetail(type,obj);
+          return;
+        }
         else if (type == "设备管理") {
           let obj = {
             // "id号": row.id,

+ 2 - 2
src/views/industry/lookall.vue

@@ -40,11 +40,11 @@
 						@click="showInfoDialog('热力管线')"><i></i>热力管线</span>
 					<span class="span_tit" :class="{ 'active': activeSubItem === '窨井管理' }"
 						@click="showInfoDialog('窨井管理')"><i></i>窨井管理</span>
-					<span class="span_tit" :class="{ 'active': activeSubItem === '窨井管理' }"
+					<span class="span_tit" :class="{ 'active': activeSubItem === '换热所信息' }"
 						@click="showInfoDialog('换热所信息')"><i></i>换热所信息</span>
 					<span class="span_tit" :class="{ 'active': activeSubItem === '换热站信息' }"
 						@click="showInfoDialog('换热站信息')"><i></i>换热站信息</span>
-					<span class="span_tit" :class="{ 'active': activeSubItem === '换热站信息' }"
+					<span class="span_tit" :class="{ 'active': activeSubItem === '用户管理' }"
 						@click="showInfoDialog('用户管理')"><i></i>用户管理</span>
 				</div>
 			</div>

+ 5 - 2
src/views/industry/paishui.vue

@@ -575,7 +575,7 @@
 					<div class="er-nav" v-show="currentShowList == 'isRiskVisible'">
 						<img src="~@/assets/images/paishui/er-navbj.png" />
 						<div>
-							<span @click="getDataBaseList('设备管理')"><img src="~@/assets/images/paishui/sj-icon-half.png" />风险清单管理</span>
+							<span @click="getDataBaseList('风险清单管理')"><img src="~@/assets/images/paishui/sj-icon-half.png" />风险清单管理</span>
 						</div>
 					</div>
 				</div>
@@ -3960,6 +3960,9 @@
 						parameter: ''
 					};
 					switch (type) {
+						case "管线管理":
+							markersMap.icon = "kaiwa";
+						break;
 						case "维修管理":
 							markersMap.icon = "weixiu";
 						break;
@@ -5153,7 +5156,7 @@
 	}
 
 	::v-deep .el-icon-date::before{
-		position: relative !important; 
+		position: relative !important;
     	bottom: 22% !important;
 	}
 

+ 1 - 1
src/views/industry/rwList.vue

@@ -1158,7 +1158,7 @@
 	}
 
 	.content-box .hy-tab-bar-style-2 .el-tabs__header {
-		width: 20%
+		width: 33%
 	}
 
 	.content-box .hy-tab-bar-style-2 .el-tabs__item {

+ 117 - 8
src/views/industry/tableInfoHandler.vue

@@ -210,7 +210,7 @@
           <el-input v-model="searchValue" placeholder="物资名称" clearable>
             <template #append></template>
           </el-input>
-          <el-select v-model="searchCode" placeholder="请选择物资类型" clearable  popper-class="rl-pop"> 
+          <el-select v-model="searchCode" placeholder="请选择物资类型" clearable  popper-class="rl-pop">
             <el-option v-for="dict in dict.type.material_type" :key="dict.value" :label="dict.label"
                        :value="dict.value" />
           </el-select>
@@ -383,10 +383,94 @@
 
     <div class="w_tq">
 			<span>
-				<i style="text-align: right;">晴 15℃</i>
+				<img style="width: 25px" v-if="weatherinformationWeather==1"
+             src="../../assets/images/integrated/weather/qing-1.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==2"
+             src="../../assets/images/integrated/weather/duoyun-2.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==3"
+             src="../../assets/images/integrated/weather/yin-3.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==4"
+             src="../../assets/images/integrated/weather/zhenyu-4.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==5"
+             src="../../assets/images/integrated/weather/leizhenyu-5.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==6"
+             src="../../assets/images/integrated/weather/leizhenyubingbao-6.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==7"
+             src="../../assets/images/integrated/weather/yujiaxue-7.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==8"
+             src="../../assets/images/integrated/weather/xiaoyu-8.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==9||weatherinformationWeather==22"
+             src="../../assets/images/integrated/weather/zhongyu-9.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==10||weatherinformationWeather==23"
+             src="../../assets/images/integrated/weather/dayu-10.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==11||weatherinformationWeather==24"
+             src="../../assets/images/integrated/weather/baoyu-11.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==12||weatherinformationWeather==25"
+             src="../../assets/images/integrated/weather/dabaoyu-12.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==13||weatherinformationWeather==26"
+             src="../../assets/images/integrated/weather/tedabaoyu-13.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==14"
+             src="../../assets/images/integrated/weather/zhenxue-14.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==15"
+             src="../../assets/images/integrated/weather/xiaoxue-15.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==16||weatherinformationWeather==27"
+             src="../../assets/images/integrated/weather/zhongxue-16.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==17||weatherinformationWeather==28"
+             src="../../assets/images/integrated/weather/daxue-17.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==18||weatherinformationWeather==29"
+             src="../../assets/images/integrated/weather/baoxue-18.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==19"
+             src="../../assets/images/integrated/weather/wu-19.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==20"
+             src="../../assets/images/integrated/weather/dongyu-20.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==21"
+             src="../../assets/images/integrated/weather/shachenbao-21.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==30"
+             src="../../assets/images/integrated/weather/fuchen-30.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==31"
+             src="../../assets/images/integrated/weather/yangsha-31.png">
+				<img style="width: 25px" v-if="weatherinformationWeather==32"
+             src="../../assets/images/integrated/weather/qiangshachenbao-32.png">
+			</span>
+      <span>
+
+				<i style="text-align: right;">
+					<span v-if="weatherinformationWeather==1">晴</span>
+					<span v-if="weatherinformationWeather==2">多云</span>
+					<span v-if="weatherinformationWeather==3">阴</span>
+					<span v-if="weatherinformationWeather==4">阵雨</span>
+					<span v-if="weatherinformationWeather==5">雷阵雨</span>
+					<span v-if="weatherinformationWeather==6">雷阵雨伴有冰雹</span>
+					<span v-if="weatherinformationWeather==7">雨夹雪</span>
+					<span v-if="weatherinformationWeather==8">小雨</span>
+					<span v-if="weatherinformationWeather==9">中雨</span>
+					<span v-if="weatherinformationWeather==10">大雨</span>
+					<span v-if="weatherinformationWeather==11">暴雨</span>
+					<span v-if="weatherinformationWeather==12">大暴雨</span>
+					<span v-if="weatherinformationWeather==13">特大暴雨</span>
+					<span v-if="weatherinformationWeather==14">阵雪</span>
+					<span v-if="weatherinformationWeather==15">小雪</span>
+					<span v-if="weatherinformationWeather==16">中雪</span>
+					<span v-if="weatherinformationWeather==17">大雪</span>
+					<span v-if="weatherinformationWeather==18">暴雪</span>
+					<span v-if="weatherinformationWeather==19">雾</span>
+					<span v-if="weatherinformationWeather==20">冻雨</span>
+					<span v-if="weatherinformationWeather==21">沙尘暴</span>
+					<span v-if="weatherinformationWeather==22">小雨—中雨</span>
+					<span v-if="weatherinformationWeather==23">中雨—大雨</span>
+					<span v-if="weatherinformationWeather==24">大雨—暴雨</span>
+					<span v-if="weatherinformationWeather==25">暴雨—大暴雨</span>
+					<span v-if="weatherinformationWeather==26">大暴雨—特大暴雨</span>
+					<span v-if="weatherinformationWeather==27">小雪—中雪</span>
+					<span v-if="weatherinformationWeather==28">中雪—大雪</span>
+					<span v-if="weatherinformationWeather==29">大雪—暴雪</span>
+					<span v-if="weatherinformationWeather==30">浮尘</span>
+					<span v-if="weatherinformationWeather==31">扬沙</span>
+					<span v-if="weatherinformationWeather==32">强沙尘暴</span>
+					{{weather}}℃</i>
 				<i id="day">2025.10.17</i>
 			</span>
-      <span><img src="~@/assets/images/paishui/weather.png" /></span>
+      <!--      <span><img src="~@/assets/images/paishui/weather.png"/></span>-->
     </div>
     <div class="w_data">
       <h4 id="time">14:40:05</h4>
@@ -721,6 +805,7 @@ import {
   getEventDetail, getDeviceOnlineOfflineByDept
 } from '@/api/tableInfo'
 import DetailDialog from "@/components/DetailDialog/tableInfoHandler.vue";
+import {getWeather} from "@/api/data";
 
 export default {
   name: 'lookall',
@@ -931,6 +1016,7 @@ export default {
     sessionStorage.removeItem('tableInfoParams')
   },
   mounted() {
+    this.getWeather();
     this.time();
     // 初始化地图数据
     this.getSuperMapUrl();
@@ -940,6 +1026,29 @@ export default {
     }, 5000)
   },
   methods: {
+    getWeather() {
+      let date = new Date()
+      let y = date.getFullYear()
+      let m = date.getMonth() + 1
+      m = m < 10 ? '0' + m : m
+      let d = date.getDate()
+      d = d < 10 ? '0' + d : d
+      let day = y + '-' + m + '-' + d
+      let that = this
+      //右侧获取天气信息
+      getWeather({
+        day: day
+      }).then(res => {
+        if (res.code == 200) {
+          if (Array.isArray(res.data) && res.data.length) {
+            this.weather = res.data[0].weatherinformationLow + '~' + res.data[0]
+              .weatherinformationHigh
+            this.weatherinformationWeather = res.data[0].weatherinformationWeather
+            this.weatherinformationLevelValue = res.data[0].weatherinformationLevelValue
+          }
+        }
+      })
+    },
     percentage(totalCount,onlineCount) {
       // 防止除以0的情况
       if (totalCount === 0) return 0;
@@ -4475,26 +4584,26 @@ export default {
 	.rl-pop {
 		background-color: #273a5e;
 		border: 1px solid #15467a;
-	
+
 		.el-select-dropdown {
 			border: 1px solid #15467a;
 			background-color: #4c535e;
 		}
-	
+
 		.el-select-dropdown__item.hover,
 		.el-select-dropdown__item:hover {
 			background-color: #3e4a5c;
 		}
-	
+
 		.el-select-dropdown__item {
 			color: #ffffff;
 			padding: 0px 10px !important;
 		}
-	
+
 		.el-select-dropdown__item.selected {
 			color: #77e5dc !important;
 		}
-	
+
 		.popper__arrow {
 			top: -6px;
 			left: 50%;

+ 2 - 2
src/views/industry/water.vue

@@ -3461,8 +3461,8 @@
 			initPipeLineChart(){
         getWaterPipeAnalysis().then(res => {
           this.trafficWay = res.data.type
-          this.tiedong = res.data.tiedong
-          this.tiexi = res.data.tiexi
+          this.tiedong = res.data.hasOwnProperty("tiedong")?res.data.tiedong:0;
+          this.tiexi = res.data.hasOwnProperty("tiexi")?res.data.tiexi:0;
           let myChart = echarts.init(document.getElementById('w_chart3'))
           const totalValue =  this.trafficWay.reduce((sum, item) => sum + (item && item.num ? item.num : 0), 0)
           var data = [];

+ 2 - 1
src/views/useCenter.vue

@@ -11,6 +11,7 @@
       <el-input
         placeholder="请输入小区名称"
         suffix-icon="el-icon-search"
+        @change="getCommunityByDeptId(botIndex)"
         v-model="communitySearch">
       </el-input>
       <dl class="sp_list">
@@ -139,7 +140,7 @@ export default {
   methods: {
     getCommunityByDeptId(id){
       let that = this;
-      getCommunityByDeptId(id).then(req => {
+      getCommunityByDeptId({deptId:id,name:this.communitySearch}).then(req => {
         that.botIndex=id
         that.communityList = req.data;
         that.communityListSearch = req.data;