Ver Fonte

环路监测移除换热站页面、换热站启用禁用状态修改、换热站管理和环路管理途经点支持任意点击点

picasso há 2 anos atrás
pai
commit
fea8a9eb05

+ 6 - 3
.env

@@ -8,11 +8,14 @@ VITE_OPEN = true
 VITE_PUBLIC_PATH = /
 
 # 基础服务路径
-VITE_SERVER_URL = '/base-api'
+# VITE_SERVER_URL = '/base-api'
+VITE_SERVER_URL = '/'
 # 基础接口路径
-VITE_API_URL = '/base-api/api/v1'
+# VITE_API_URL = '/base-api/api/v1'
+VITE_API_URL = '/api/v1'
 # 指数管理页面用到的
-VITE_ASSESS_URL = '/base-api/assess/v1'
+# VITE_ASSESS_URL = '/base-api/assess/v1'
+VITE_ASSESS_URL = '/assess/v1'
 # 大屏前端
 VITE_SCREEN_URL = '/plugin/screen/'
 # 组态图前端

+ 4 - 4
.env.development

@@ -1,7 +1,7 @@
-VITE_SERVER_PROTOCOL = 'https:'
-VITE_SERVER_HOSTNAME = 'zhgy.sagoo.cn'
+# VITE_SERVER_PROTOCOL = 'https:'
+# VITE_SERVER_HOSTNAME = 'zhgy.sagoo.cn'
 
-# VITE_SERVER_PROTOCOL = 'http:'
-# VITE_SERVER_HOSTNAME = 'sgadserver.wdeveloperw.xyz'
+VITE_SERVER_PROTOCOL = 'http:'
+VITE_SERVER_HOSTNAME = 'sgadserver.wdeveloperw.xyz'
 # VITE_SERVER_URL = ''
 # VITE_API_URL = '/api/v1'

+ 1 - 1
src/views/heating/heatStation/heatStation/component/detail.vue

@@ -12,7 +12,7 @@
 					{{ ruleForm.principalInfo.userNickname }}
 				</el-form-item>
 				<el-form-item label="状态" prop="status">
-					{{ ruleForm.status === 1 ? '在线' : '不在线' }}
+					{{ ruleForm.status === 1 ? '启用' : '禁用' }}
 				</el-form-item>
         <el-form-item label="地图展示" prop="">
 					<div>

+ 15 - 6
src/views/heating/heatStation/heatStation/component/edit.vue

@@ -35,8 +35,8 @@
 					</el-select>
 				</el-form-item>
 				<el-form-item label="状态" prop="status">
-					<el-radio v-model="ruleForm.status" :label="1">在线</el-radio>
-					<el-radio v-model="ruleForm.status" :label="0">不在线</el-radio>
+					<el-radio v-model="ruleForm.status" :label="1">启用</el-radio>
+					<el-radio v-model="ruleForm.status" :label="0">禁用</el-radio>
 				</el-form-item>
 				<!-- <el-form-item label="数据模型" prop="dataTemplateIds">
 					<el-select v-model="ruleForm.dataTemplateIds" multiple clearable style="width: 100%;" placeholder="请选择">
@@ -210,8 +210,8 @@ export default defineComponent({
 			let map = new BMapGL.Map("map-container");
 			// 获取布局配置信息
 			let getThemeConfig =  store.state.themeConfig.themeConfig;
-			// 116.404, 39.915
-			let point = new BMapGL.Point(state.ruleForm.lnt || 116.404, state.ruleForm.lat || 39.915);
+			// 124.383044, 40.124296
+			let point = new BMapGL.Point(state.ruleForm.lnt || 124.383044, state.ruleForm.lat || 40.124296);
 			let zoomCtrl = new BMapGL.ZoomControl();  // 添加缩放控件
 			let cityCtrl = new BMapGL.CityListControl()
 			if(getThemeConfig.isIsDark) {
@@ -236,11 +236,20 @@ export default defineComponent({
 			})
 
 			map.addEventListener('click', (e: any) => {
-				console.log('map--click', e)
+				// console.log('map--click', e)
 				let point = e.latlng
 				state.ruleForm.lnt = point.lng
 				state.ruleForm.lat = point.lat
-				state.ruleForm.position = e.currentTarget.infoWindow.contentDiv.innerText.replace(/[^\s]+[\s\t\n]+([^\s\t\n]+)[\s\t\n]+.*/g, '$1')
+				// if (e.currentTarget.infoWindow) {
+				// 	state.ruleForm.position = e.currentTarget.infoWindow.contentDiv.innerText.replace(/[^\s]+[\s\t\n]+([^\s\t\n]+)[\s\t\n]+.*/g, '$1')
+				// }
+				let myGeo = new BMapGL.Geocoder
+				myGeo.getLocation(new BMapGL.Point(point.lng, point.lat), (result: any) => {
+					if (result) {
+						// console.log(result);
+						state.ruleForm.position = result.address
+					}
+				})
 			})
 		}
 

+ 1 - 1
src/views/heating/heatStation/heatStation/index.vue

@@ -47,7 +47,7 @@
 	    	<el-table-column label="负责人" prop="principalInfo.userNickname" v-col="'principalInfo.userNickname'" width="80"/>
 	    	<el-table-column label="状态" prop="status" v-col="'status'" width="80">
           <template #default="scope">
-						{{ scope.row.status === 1 ? '在线' : '不在线' }}
+						{{ scope.row.status === 1 ? '启用' : '禁用' }}
           </template>
         </el-table-column>
 	    	<el-table-column label="创建时间" prop="createdAt" v-col="'createdAt'" :show-overflow-tooltip="true" />

+ 33 - 13
src/views/heating/heatStation/loop/component/edit.vue

@@ -95,7 +95,7 @@
 							<el-input-number v-model="item.sort" :controls="false" :disabled="!item.editFalg" placeholder="排序" clearable style="width: 100px; margin-right: 10px"></el-input-number>
 
 							<el-button type="primary" v-if="item.editFalg" @click="onSavePoint(item, index)">保存</el-button>
-							<el-button type="primary" v-else @click="item.editFalg = true">修改</el-button>
+							<el-button type="primary" v-else @click="onEditChange(item, index)">修改</el-button>
 							<el-button type="danger" @click="onRemovePoint(index)">删除</el-button>
 						</div>
 					</div>
@@ -291,6 +291,10 @@ export default defineComponent({
 		}
 		// 新增途经点
 		const onAddPoint = () => {
+			if (state.pointList.find((item: any) => item.editFalg)) {
+				ElMessage.warning('请先保存途经点')
+				return
+			}
 			state.pointList.push({
 				sort: undefined,
 				position: '',
@@ -298,6 +302,16 @@ export default defineComponent({
 				lat: '',
 				editFalg: true
 			})
+			state.pointIndex = state.pointList.length - 1
+		}
+		// 修改途经点
+		const onEditChange = (item: any, index: number) => {
+			if (state.pointList.find((point: any) => point.editFalg && point !== item)) {
+				ElMessage.warning('请先保存途经点')
+				return
+			}
+			state.pointIndex = index
+			item.editFalg = true
 		}
 		// 保存途经点
 		const onSavePoint = (item: any, index: number) => {
@@ -312,7 +326,7 @@ export default defineComponent({
 			let BMapGL = (window as any).BMapGL
 			let map = new BMapGL.Map("loop-map-container");
 			// 116.404, 39.915
-			let point = new BMapGL.Point(116.404, 39.915);
+			let point = new BMapGL.Point(124.383044, 40.124296);
 			let zoomCtrl = new BMapGL.ZoomControl();  // 添加缩放控件
 			let cityCtrl = new BMapGL.CityListControl()
 			map.centerAndZoom(point, 15); 
@@ -328,20 +342,25 @@ export default defineComponent({
 			state.mapLocal = new BMapGL.LocalSearch(map, {
 				renderOptions:{map: map}
 			})
-			console.log('map', map)
 			map.addEventListener('click', (e: any) => {
 				console.log('map--click', e)
+				if (!state.pointList.length) return
 				let point = e.latlng
-				if (state.pointIndex > -1) {
-					state.pointList[state.pointIndex].lnt = point.lng
-					state.pointList[state.pointIndex].lat = point.lat
-					let str = e.currentTarget.infoWindow.centerDiv.innerText
-					let address = str.replace(/[^\s]+[\s\t\n]+([^\s\t\n]+)[\s\t\n]+.*/g, '$1')
-					state.pointList[state.pointIndex].position = address
-				}
-				// state.ruleForm.lnt = point.lng
-				// state.ruleForm.lat = point.lat
-				// .replace(/[^\s]+[\s\t\n]+([^\s\t\n]+)[\s\t\n]+.*/g, '$1')
+				// if (state.pointIndex > -1) {
+				let index = state.pointIndex
+				state.pointList[index].lnt = point.lng
+				state.pointList[index].lat = point.lat
+					// let str = e.currentTarget.infoWindow.centerDiv.innerText
+					// let address = str.replace(/[^\s]+[\s\t\n]+([^\s\t\n]+)[\s\t\n]+.*/g, '$1')
+					// state.pointList[index].position = address
+				// }
+				
+				let myGeo = new BMapGL.Geocoder
+				myGeo.getLocation(new BMapGL.Point(point.lng, point.lat), (result: any) => {
+					if (result) {
+						state.pointList[index].position = result.address
+					}
+				})
 			})
 		}
 
@@ -360,6 +379,7 @@ export default defineComponent({
 			onAddPoint,
 			onRemovePoint,
 			onSavePoint,
+			onEditChange,
 			...toRefs(state)
 		}
 	}

+ 3 - 3
src/views/heating/monitor/loopSupervision/index.vue

@@ -3,7 +3,7 @@
     <el-card shadow="hover">
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
-          <el-form-item label="" prop="">
+          <!-- <el-form-item label="" prop="">
             <el-radio-group v-model="tableData.param.types" size="default" @change="initTableData">
               <el-radio-button label="station" v-auth="'heatStation'">
                 换热站
@@ -12,7 +12,7 @@
                 环路
               </el-radio-button>
             </el-radio-group>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="环路名称" prop="name">
             <el-input v-model="tableData.param.name" placeholder="环路名称" size="default"></el-input>
           </el-form-item>
@@ -100,7 +100,7 @@ export default defineComponent({
         param: {
           pageNum: 1,
           pageSize: 10,
-          types: 'station', // 类型 station 换热站 loop环路
+          types: 'loop', // 类型 station 换热站 loop环路
           name: '',
           code: '',
         },