rui.jiang 11 maanden geleden
bovenliggende
commit
44be64f143

BIN
dist.zip


File diff suppressed because it is too large
+ 5 - 129
package-lock.json


+ 2 - 2
src/components/map/index.vue

@@ -121,8 +121,8 @@ export default {
       layers: [
         new TileLayer({
           source: new XYZ({
-            url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
-            // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内外
+            // url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
+            url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内外
           }),
         }),
         new VectorLayer({

+ 19 - 47
src/views/admin/cockpitManage/Index.vue

@@ -1,19 +1,13 @@
 <template>
-  <div class="map-ditu" v-loading="loading">
+  <div class="map-ditu">
     <Tmap ref="map" :maplist="maplist" @feature-click="featureClick"></Tmap>
     <div class="ledata">
-      <selecttree
-        placeholder="请选择上级单位"
-        :list="parentOpt"
-        type="1"
-        v-model="companyCode"
-        @change="parentChange"
+      <selecttree placeholder="请选择上级单位" :list="parentOpt" type="1" v-model="companyCode" @change="parentChange"
         :defaultParentProps="{
           children: 'children',
           label: 'companyName',
           value: 'codeNumber',
-        }"
-      >
+        }">
       </selecttree>
 
       <p>
@@ -48,21 +42,11 @@
         <span class="yellow"></span>
         <span class="green"></span>
       </p>
-      <el-switch
-        v-model="value1"
-        active-text="显示"
-        inactive-text="隐藏"
-        @change="handleSwitchChange"
-      >
+      <el-switch v-model="value1" active-text="显示" inactive-text="隐藏" @change="handleSwitchChange">
       </el-switch>
     </div>
-    <Rightdata
-      v-show="ShowRi"
-      ref="childRef"
-      :maplistArr="maplistArr"
-      :defaultdata="defaultdata"
-      class="ridata"
-    ></Rightdata>
+    <Rightdata v-show="ShowRi" ref="childRef" :maplistArr="maplistArr" :defaultdata="defaultdata" class="ridata">
+    </Rightdata>
     <router-view></router-view>
   </div>
 </template>
@@ -84,13 +68,12 @@ export default {
   },
   data() {
     return {
-      loading: false,
       ShowRi: true,
       treeval: "",
       value1: true,
       treeval: "", // 绑定的输入框值
       showTree: false, // 控制树列表显示
-      treeData: [], // 树列表数据,根据实际需求自行替换
+      treeData: [],
       maplist: [],
       maplistArr: {},
       totalList: [],
@@ -121,31 +104,19 @@ export default {
   methods: {
     // 获取总数
     GETtotal() {
-      this.loading = true;
-      getCompanyFieldNumberVo()
-        .then((res) => {
-          this.totalList = res.data;
-          this.loading = false;
-        })
-        .catch((err) => {
-          console.error(err, "err");
-          this.loading = false;
-        });
+      getCompanyFieldNumberVo().then((res) => {
+        this.totalList = res.data;
+      });
     },
     // 获取企业数
     async GETtree() {
-      this.loading = true;
-      try {
-        const res = await getSysOrganizationAuthTreeByRoleId();
-        const treedata = res.data;
-        const processedData = this.processTreeData(treedata);
-        this.parentOpt = processedData;
-        this.defaultdata = res.data[0];
-        this.loading = false;
-      } catch (err) {
-        this.loading = false;
-      }
+      const res = await getSysOrganizationAuthTreeByRoleId();
+      const treedata = res.data;
+      const processedData = this.processTreeData(treedata);
+      this.parentOpt = processedData;
+      this.defaultdata = res.data[0];
     },
+
     //过滤数据
     processTreeData(treeData) {
       const processedData = [];
@@ -163,9 +134,10 @@ export default {
         processNode(root);
         processedData.push(root);
       });
-
       return processedData;
     },
+
+
     parseCoordinates(input) {
       if (input && typeof input === "string") {
         return input.split(",").map(Number);
@@ -194,7 +166,7 @@ export default {
           console.log(element);
           if (
             this.parseCoordinates(element.longitudeAndLatitudeString).length >
-              0 &&
+            0 &&
             element.codeType === "field"
           ) {
             this.$refs.map.addMarker({

+ 1 - 0
src/views/ledger/enterprise.vue

@@ -346,6 +346,7 @@ export default {
           console.error(error, "error");
           this.loading = false;
         });
+    
     },
 
     // 重置

+ 5 - 0
src/views/ledger/windsite.vue

@@ -557,16 +557,21 @@ export default {
         pageSize: 10,
       };
       this.loading = true;
+
       WindFieldListPage(paramsData)
+
         .then((res) => {
           this.tableData = res.data.list;
           this.formInline.totalSize = res.data.totalSize;
           this.loading = false;
+    
         })
         .catch((error) => {
           this.loading = false;
           console.error(error);
+  
         });
+  
     },
     //分页数据切换
     handleCurrentChange(val) {

+ 2 - 2
vue.config.js

@@ -65,9 +65,9 @@ module.exports = {
     proxy: {
       "/api": {
         // target: "http://192.168.5.4:16200", // 石月
-        // target: "http://192.168.50.235:16200", //内网
+        target: "http://192.168.50.235:16200", //内网
         // target: "http://192.168.5.15:16200",
-        target: "http://106.120.102.238:16600", //外网
+        // target: "http://106.120.102.238:16600", //外网
         changeOrigin: true,
         pathRewrite: {
           "^/api": "", // 需要regit write重写的,

Some files were not shown because too many files changed in this diff