调整+增加打点功能

src/views/info/areaInfo/index.vue

@@ -138,7 +138,7 @@ export default {
       polygonTool: null,
       geoJson: {
         type: "Polygon",
-        coordinates: [[]],
+        coordinates: [],
       },
       loading: true,
       // 导出遮罩层
@@ -168,7 +168,7 @@ export default {
       },
       queryAreaTypeParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 99999,
       },
       // 表单参数
       form: {},
@@ -190,7 +190,7 @@ export default {
   methods: {
 
     openPolygonTool() {
-      if (  JSON.parse(this.form.location).coordinates[0].length > 0 || this.geoJson.coordinates[0].length > 0 ) {
+      if (  JSON.parse(this.form.location).coordinates.length > 0 || this.geoJson.coordinates.length > 0 ) {
         this.$notify({
           title: '警告',
           message: '请先清空地图',
@@ -207,8 +207,8 @@ export default {
         let drawData = yu.currentLnglats.map((item) => {
           return [item.lng, item.lat];
         });
-        this.geoJson.coordinates[0] = drawData;
-        console.log("区域之后处理数据", this.geoJson.coordinates[0]);
+        this.geoJson.coordinates = drawData;
+        console.log("区域之后处理数据", this.geoJson.coordinates);
 
       });
     },
@@ -216,7 +216,7 @@ export default {
     tijiao() {
       console.log('多边形数据:', this.form.location);
 
-      if (this.geoJson.coordinates[0].length > 0) {
+      if (this.geoJson.coordinates.length > 0) {
         this.form.location = JSON.stringify(this.geoJson)
       }
 
@@ -229,7 +229,7 @@ export default {
  destructionTMap ()  {
   if (this.map) {
     this.map = null;
-    this.geoJson.coordinates[0]=[]
+    this.geoJson.coordinates=[]
     // 直接将节点给删掉
     console.log('1qsad');
 
@@ -247,7 +247,7 @@ export default {
 
     clearmian() {
 
-      this.geoJson.coordinates[0] = []
+      this.geoJson.coordinates = []
       this.$set(this.form, 'location', JSON.stringify(this.geoJson))
       this.map.clearOverLays()
 
@@ -286,7 +286,7 @@ export default {
 
 
         var points = [];
-        JSON.parse(this.form.location).coordinates[0].map((item) => {
+        JSON.parse(this.form.location).coordinates.map((item) => {
           points.push(new T.LngLat(item[0], item[1]));
         })
 

src/views/info/buildingInfo/index.vue

@@ -157,7 +157,9 @@
           <wang-editor v-model="form.memo" :min-height="140" />
         </el-form-item>
         <el-form-item label="三维坐标" prop="rasterLngLat">
-          <el-input v-model="form.rasterLngLat" placeholder="请输入三维坐标" />
+          <el-input v-model="form.rasterLngLat" @focus="openditu">
+            {{ form.rasterLngLat}}
+          </el-input>
         </el-form-item>
         <el-form-item label="地址" prop="address">
           <el-input v-model="form.address" placeholder="请输入地址" />
@@ -184,6 +186,19 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="地图" :visible.sync="dialogVisible" width="80%">
+      <div id='mainMap'>
+        <div id="mapDiv" style="width:100%; height:700px">
+        </div>
+      </div>
+      <input type="button" value="清除" @click='clearmian()' />
+      <input type="button" value="标点工具" @click='openMarkTool()' />
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click='tijiao'>确定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -194,6 +209,10 @@ export default {
   name: "BuildingInfo",
   data() {
     return {
+      dialogVisible: false,
+      map: null,
+      handler: null,
+      markPoints: '', // 保存标记点的坐标
       buildingTypeList: [],
       // 遮罩层
       loading: true,
@@ -233,6 +252,9 @@ export default {
         buildingId: [
           { required: true, message: "大楼编号不能为空", trigger: "blur" }
         ],
+        typeId: [
+          { required: true, message: "类别不能为空", trigger: "change" }
+        ],
       }
     };
   },
@@ -242,6 +264,82 @@ export default {
   },
   methods: {
 
+    // 销毁天地图
+    destructionTMap ()  {
+      if (this.map) {
+        this.map = null;
+        // 直接将节点给删掉
+        console.log('1qsad');
+
+        const parentEl = document.getElementById('mainMap');
+        const cahildrenEl1 = document.getElementById('mapDiv');
+        if(cahildrenEl1) parentEl.removeChild(cahildrenEl1);
+        // 然后再手动将节点加进来
+        const newCahildrenEl = document.createElement("div");
+        newCahildrenEl.id = 'mapDiv'
+        newCahildrenEl.style = 'height: 700px;width: 100%;'
+        parentEl.appendChild(newCahildrenEl)
+      }
+    },
+
+    tijiao() {
+      console.log('多边形数据:', this.form.rasterLngLat);
+      console.log('多边形数据:', this.markPoints);
+      this.form.rasterLngLat = this.markPoints
+      this.destructionTMap()
+      this.dialogVisible = false;
+    },
+
+    clearmian() {
+      if (this.handler) this.handler.close();
+      this.map.clearOverLays(); // 清除所有覆盖物
+      this.markPoints = ''; // 清除保存的标记点坐标
+    },
+
+    openMarkTool() {
+      console.log("1111111111")
+      if (this.handler) this.handler.close(); // 关闭之前的工具
+
+      this.handler = new T.MarkTool(this.map); // 创建标点工具
+      this.handler.open(); // 打开标点工具
+
+      this.handler.on("mouseup", (e) => {
+        let drawData1 = e.currentLnglat.lat+","+e.currentLnglat.lng;
+        this.markPoints = drawData1;
+      });
+
+      this.handler.on("close", () => {
+        // 标点工具关闭时的处理
+        this.handler = null;
+      });
+    },
+
+
+    openditu() {
+      console.log('打开地图对话框');
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        const T = window.T;
+        const zoom = 12;
+        this.map = new T.Map('mapDiv');
+        this.map.centerAndZoom(new T.LngLat(103.96, 30.66), zoom);
+        // 创建标注工具对象
+        this.handler = new T.MarkTool(this.map);
+        console.log('handler 初始化完成:', this.handler);
+        console.log('kanknak1', this.form.rasterLngLat);
+        let points = new T.LngLat();
+        if (this.form.rasterLngLat) {
+          const coordinates = this.form.rasterLngLat.split(',');
+          points =  new T.LngLat(coordinates[1], coordinates[0]);
+        }
+        // 创建面对象
+        console.log('kanknak2', points);
+        const marker = new T.Marker(points);
+        // 向地图上添加面
+        this.map.addOverLay(marker);
+      });
+    },
+
     getBuildingTypeList() {
       listBuildingType(this.queryBuildingTypeParams).then(response => {
       this.buildingTypeList = response.data.list;

src/views/info/equipmentInfo/index.vue

@@ -259,7 +259,9 @@
           <el-input v-model="form.lngLat" placeholder="请输入二维坐标" />
         </el-form-item>
         <el-form-item label="三维坐标" prop="rasterLngLat">
-          <el-input v-model="form.rasterLngLat" placeholder="请输入三维坐标" />
+          <el-input v-model="form.rasterLngLat" @focus="openditu">
+            {{ form.rasterLngLat}}
+          </el-input>
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择状态">
@@ -297,6 +299,19 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="地图" :visible.sync="dialogVisible" width="80%">
+      <div id='mainMap'>
+        <div id="mapDiv" style="width:100%; height:700px">
+        </div>
+      </div>
+      <input type="button" value="清除" @click='clearmian()' />
+      <input type="button" value="标点工具" @click='openMarkTool()' />
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click='tijiao'>确定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -311,6 +326,10 @@ export default {
   dicts: ['equipment_info_type', 'device_status', 'equip_brand'],
   data() {
     return {
+      dialogVisible: false,
+      map: null,
+      handler: null,
+      markPoints: '', // 保存标记点的坐标
       equipmentTypeList: [],
       areaList: [],
       roomList: [],
@@ -371,6 +390,81 @@ export default {
 
   },
   methods: {
+    // 销毁天地图
+    destructionTMap ()  {
+      if (this.map) {
+        this.map = null;
+        // 直接将节点给删掉
+        console.log('1qsad');
+
+        const parentEl = document.getElementById('mainMap');
+        const cahildrenEl1 = document.getElementById('mapDiv');
+        if(cahildrenEl1) parentEl.removeChild(cahildrenEl1);
+        // 然后再手动将节点加进来
+        const newCahildrenEl = document.createElement("div");
+        newCahildrenEl.id = 'mapDiv'
+        newCahildrenEl.style = 'height: 700px;width: 100%;'
+        parentEl.appendChild(newCahildrenEl)
+      }
+    },
+
+    tijiao() {
+      console.log('多边形数据:', this.form.rasterLngLat);
+      console.log('多边形数据:', this.markPoints);
+      this.form.rasterLngLat = this.markPoints
+      this.destructionTMap()
+      this.dialogVisible = false;
+    },
+
+    clearmian() {
+      if (this.handler) this.handler.close();
+      this.map.clearOverLays(); // 清除所有覆盖物
+      this.markPoints = ''; // 清除保存的标记点坐标
+    },
+
+    openMarkTool() {
+      console.log("1111111111")
+      if (this.handler) this.handler.close(); // 关闭之前的工具
+
+      this.handler = new T.MarkTool(this.map); // 创建标点工具
+      this.handler.open(); // 打开标点工具
+
+      this.handler.on("mouseup", (e) => {
+        let drawData1 = e.currentLnglat.lat+","+e.currentLnglat.lng;
+        this.markPoints = drawData1;
+      });
+
+      this.handler.on("close", () => {
+        // 标点工具关闭时的处理
+        this.handler = null;
+      });
+    },
+
+
+    openditu() {
+      console.log('打开地图对话框');
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        const T = window.T;
+        const zoom = 12;
+        this.map = new T.Map('mapDiv');
+        this.map.centerAndZoom(new T.LngLat(103.96, 30.66), zoom);
+        // 创建标注工具对象
+        this.handler = new T.MarkTool(this.map);
+        console.log('handler 初始化完成:', this.handler);
+        console.log('kanknak1', this.form.rasterLngLat);
+        let points = new T.LngLat();
+        if (this.form.rasterLngLat) {
+          const coordinates = this.form.rasterLngLat.split(',');
+          points =  new T.LngLat(coordinates[1], coordinates[0]);
+        }
+        // 创建面对象
+        console.log('kanknak2', points);
+        const marker = new T.Marker(points);
+        // 向地图上添加面
+        this.map.addOverLay(marker);
+      });
+    },
 
     getEquipmentTypeName(typeId) {
       const type = this.equipmentTypeList.find(b => b.typeId === typeId);

src/views/info/organizationInfo/index.vue

@@ -376,7 +376,7 @@ export default {
       dialogVisible: false,
       map: null,
       handler: null,
-      markPoints: [], // 保存标记点的坐标
+      markPoints: '', // 保存标记点的坐标
       houseTypeList: [],
       organizationTypeList: [],
       areaList: [],
@@ -462,7 +462,7 @@ export default {
     tijiao() {
       console.log('多边形数据:', this.form.rasterLngLat);
       console.log('多边形数据:', this.markPoints);
-      this.form.rasterLngLat = JSON.stringify(this.markPoints)
+      this.form.rasterLngLat = this.markPoints
       this.destructionTMap()
       this.dialogVisible = false;
     },
@@ -470,7 +470,7 @@ export default {
     clearmian() {
       if (this.handler) this.handler.close();
       this.map.clearOverLays(); // 清除所有覆盖物
-      this.markPoints = []; // 清除保存的标记点坐标
+      this.markPoints = ''; // 清除保存的标记点坐标
     },
 
     openMarkTool() {
@@ -481,7 +481,7 @@ export default {
       this.handler.open(); // 打开标点工具
 
       this.handler.on("mouseup", (e) => {
-        let drawData1 = [e.currentLnglat.lat, e.currentLnglat.lng]
+        let drawData1 = e.currentLnglat.lat+","+e.currentLnglat.lng
         this.markPoints = drawData1;
       });
 
@@ -504,9 +504,9 @@ export default {
         this.handler = new T.MarkTool(this.map);
         console.log('handler 初始化完成:', this.handler);
         console.log('kanknak1', this.form.rasterLngLat);
-        let points = null;
+        let points = [];
         if (this.form.rasterLngLat) {
-          const coordinates = JSON.parse(this.form.rasterLngLat);
+          const coordinates = this.form.rasterLngLat.split(',');
           points =  new T.LngLat(coordinates[1], coordinates[0]);
         }
         // 创建面对象

src/views/info/policyInfo/index.vue

@@ -38,6 +38,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
+        <el-button icon="el-icon-refresh" size="mini" @click="orderBy">反序</el-button>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
@@ -175,6 +176,7 @@ export default {
   },
   data() {
     return {
+      isDesc: false,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -201,7 +203,8 @@ export default {
         pageSize: 10,
         policyName: null,
         createTime: null,
-        fileName: ''
+        fileName: '',
+        orderBy: ''
       },
       // 表单参数
       form: {},
@@ -217,6 +220,14 @@ export default {
     this.getList();
   },
   methods: {
+
+
+    orderBy(){
+      this.isDesc = !this.isDesc; // 切换排序顺序的状态
+      this.queryParams.orderBy = this.isDesc ? "DESC" : ""; // 根据状态设置 orderBy 值
+      this.handleQuery();
+    },
+
     handleFileUploaded(fileName) {
       this.form.fileName = fileName;
     },

src/views/info/stationInfo/index.vue

@@ -185,7 +185,7 @@ export default {
       dialogVisible: false,
       map: null,
       handler: null,
-      markPoints: [], // 保存标记点的坐标
+      markPoints: '', // 保存标记点的坐标
       trafficList: [],
       // 遮罩层
       loading: true,
@@ -255,7 +255,7 @@ export default {
     tijiao() {
       console.log('多边形数据:', this.form.rasterLngLat);
       console.log('多边形数据:', this.markPoints);
-      this.form.rasterLngLat = JSON.stringify(this.markPoints)
+      this.form.rasterLngLat = this.markPoints
       this.destructionTMap()
       this.dialogVisible = false;
     },
@@ -263,7 +263,7 @@ export default {
     clearmian() {
       if (this.handler) this.handler.close();
       this.map.clearOverLays(); // 清除所有覆盖物
-      this.markPoints = []; // 清除保存的标记点坐标
+      this.markPoints = ''; // 清除保存的标记点坐标
     },
 
     openMarkTool() {
@@ -274,7 +274,7 @@ export default {
       this.handler.open(); // 打开标点工具
 
       this.handler.on("mouseup", (e) => {
-        let drawData1 = [e.currentLnglat.lat, e.currentLnglat.lng]
+        let drawData1 = e.currentLnglat.lat+","+e.currentLnglat.lng;
         this.markPoints = drawData1;
       });
 
@@ -297,9 +297,9 @@ export default {
         this.handler = new T.MarkTool(this.map);
         console.log('handler 初始化完成:', this.handler);
         console.log('kanknak1', this.form.rasterLngLat);
-        let points = [];
+        let points = new T.LngLat();
         if (this.form.rasterLngLat) {
-          const coordinates = JSON.parse(this.form.rasterLngLat);
+          const coordinates = this.form.rasterLngLat.split(',');
           points =  new T.LngLat(coordinates[1], coordinates[0]);
         }
         // 创建面对象
@@ -316,7 +316,7 @@ export default {
     },
 
     getTrafficList(){
-      listTrafficInfo().then(response => {
+      listTrafficInfo(this.queryTypeParams).then(response => {
         this.trafficList = response.data.list;
       });
     },

src/views/info/trafficInfo/index.vue

@@ -185,7 +185,7 @@ export default {
       handler: null,
       geoJson: {
         type: "Polyline",
-        coordinates: [[]],
+        coordinates: [],
       },
       map: null,
       dialogVisible: false,
@@ -244,7 +244,7 @@ export default {
     destructionTMap ()  {
       if (this.map) {
         this.map = null;
-        this.geoJson.coordinates[0]=[]
+        this.geoJson.coordinates= []
         // 直接将节点给删掉
         console.log('1qsad');
 
@@ -262,7 +262,7 @@ export default {
     tijiao() {
       console.log('多边形数据:', this.form.location);
 
-      if (this.geoJson.coordinates[0].length > 0) {
+      if (this.geoJson.coordinates.length > 0) {
         this.form.location = JSON.stringify(this.geoJson)
       }
 
@@ -273,7 +273,7 @@ export default {
 
     openPolylineTool(){
       console.log(this.form.location);
-      if (JSON.parse(this.form.location).coordinates[0].length > 0 || this.geoJson.coordinates[0].length > 0 ) {
+      if (JSON.parse(this.form.location).coordinateslength > 0 || this.geoJson.coordinates.length > 0 ) {
         this.$notify({
           title: '警告',
           message: '请先清空地图',
@@ -282,29 +282,24 @@ export default {
         return
       }
       // if (this.handler) this.handler.close();
-      this.handler = new T.PolylineTool(this.map);
+      this.handler = new T.PolylineTool(this.map, {
+        color: "red", weight: 3.5, opacity: 0.8, fillColor: "red", fillOpacity: 0.5
+      });
       this.handler.open();
       this.handler.on("draw", (yu) => {
         console.log("参数？？99", yu.currentLnglats);
         let drawData = yu.currentLnglats.map((item) => {
           return [item.lng, item.lat];
         });
-        this.geoJson.coordinates[0] = drawData;
-        console.log("区域之后处理数据", this.geoJson.coordinates[0]);
+        this.geoJson.coordinates= drawData;
+        console.log("区域之后处理数据", this.geoJson.coordinates);
 
       });
     },
 
     showPolyLine() {
-      var config = {
-      showLabel: true,
-      color: "red", weight: 3.5, opacity: 0.8, fillColor: "red", fillOpacity: 0.5
-      };
-      //创建标注工具对象
-      this.polygonTool = new T.PolylineTool(this.map, config);
-      console.log('kanknak1', this.form.location);
       var points = [];
-      JSON.parse(this.form.location).coordinates[0].map((item) => {
+      JSON.parse(this.form.location).coordinates.map((item) => {
         points.push(new T.LngLat(item[0], item[1]));
       })
       console.log('kanknak2', points);
@@ -317,7 +312,7 @@ export default {
     },
 
     clearmian(){
-      this.geoJson.coordinates[0] = []
+      this.geoJson.coordinates = []
       this.$set(this.form, 'location', JSON.stringify(this.geoJson))
       this.map.clearOverLays()
 
@@ -412,8 +407,8 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.location=JSON.parse(this.form.location)
           if (this.form.trafficId != null) {
-            this.form.location=JSON.parse(this.form.location)
             updateTrafficInfo(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;

src/views/system/dict/data.vue

@@ -145,6 +145,9 @@
         <el-form-item label="数据键值" prop="dictValue">
           <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
         </el-form-item>
+        <el-form-item label="icon图标">
+          <imageUpload :limit="1" v-model="form.icon"/>
+        </el-form-item>
         <el-form-item label="样式属性" prop="cssClass">
           <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
         </el-form-item>
@@ -307,7 +310,8 @@ export default {
         listClass: 'default',
         dictSort: 0,
         status: true,
-        remark: undefined
+        remark: undefined,
+        icon: null,
       };
       this.resetForm("form");
     },

src/views/type/organizationType/index.vue

@@ -122,6 +122,9 @@
         <el-form-item label="类别名称" prop="typeName">
           <el-input v-model="form.typeName" placeholder="请输入类别名称" />
         </el-form-item>
+        <el-form-item label="icon图标">
+          <imageUpload :limit="2" v-model="form.icon"/>
+        </el-form-item>
         <el-form-item label="是否可点击">
           <el-switch v-model="form.click"></el-switch>
         </el-form-item>
@@ -222,7 +225,8 @@ export default {
         description: null,
         orderId: null,
         memo: null,
-        colour: null
+        colour: null,
+        icon: null
       };
       this.resetForm("form");
     },