9 次代码提交 cb0d872ab3 ... 5c7d127d81

作者 SHA1 备注 提交日期
  DESKTOP-6LTVLN7\Liumouren 5c7d127d81 Merge branch 'onemap_zmg' of http://47.103.92.60:3003/skyversation/qp_onemap_ui into MicroFunction 3 周之前
  mork ec548c12cc Merge branch 'MicroFunction' into onemap_zmg 3 周之前
  mork 51aede066f 整个项目修改,适配政务网 3 周之前
  mork 4692d4afa8 数据管理中心跳转页面修改 3 周之前
  mork c38d9270c2 Merge branch 'onemap_zmg' 3 周之前
  mork 80d998737c 任务管理数据预览修改 3 周之前
  DESKTOP-6LTVLN7\Liumouren dd93fd9c19 Merge branch 'onemap_zmg' of http://47.103.92.60:3003/skyversation/qp_onemap_ui 3 周之前
  DESKTOP-6LTVLN7\Liumouren 3525c9de61 Merge branch 'MicroFunction' of http://47.103.92.60:3003/skyversation/qp_onemap_ui into onemap_zmg 3 周之前
  DESKTOP-6LTVLN7\Liumouren 151e068fd5 Merge branch 'onemap_zmg' of http://47.103.92.60:3003/skyversation/qp_onemap_ui 3 周之前

+ 75 - 23
public/static/config/config.js

@@ -1,3 +1,5 @@
+// var serverPath = "http://121.43.55.7"; // 互
+var serverPath = "http://10.235.245.174"; // 政
 let systemConfig = {
   /* 通用全局变量 */
   defaultAccount: {
@@ -6,41 +8,51 @@ let systemConfig = {
   adminRoleId: "1", //默认管理员角色id,Oauth中配置“系统管理员”角色
   /*
     * 模型id如下
-      1667(应用中心模型id)
-      1690(用户登录模型id)
-      1677(微功能服务模型id)
-      1673(任务模型id)
+      1667(应用中心模型id)            1780 政务网  1667 互联网
+      1690(用户登录模型id)            1777 政务网  1690 互联网
+      1677(微功能服务模型id)          1787 政务网  1677 互联网
+      1673(任务模型id)                1785 政务网  1673 互联网
+      1780(用户反馈模型id)            2154 政务网  1780 互联网
     * 栏目id如下
-      1657(应用中心栏目id(示范应用))
-      1659(应用中心栏目id)
-      1666(门户都示范栏目id)
-      1676(用户登录栏目id)
-      1665(微功能服务栏目id)
-      1651(微功能搜索服务栏目id)
-      1662(任务栏目id)
+      1657(应用中心栏目id(示范应用))  2429 政务网  1657 互联网
+      1659(应用中心栏目id)            2428 政务网  1659 互联网
+      1666(门户示范栏目id)            2426 政务网  1666 互联网
+      1676(用户登录栏目id)            2425 政务网  1676 互联网
+      1665(微功能服务栏目id)          2430 政务网  1665 互联网
+      1651(微功能搜索服务栏目id)       2432 政务网  1651 互联网
+      1662(任务栏目id)                2431 政务网  1662 互联网
+      1736(用户反馈栏目id)            2840 政务网  1736 互联网
     *
   */
-  modelIds: [1667, 1690, 1677, 1673],
-  columnIds: [1657, 1659, 1666, 1676, 1665, 1651, 1662],
+ // 互联网环境
+  // modelIds: [1667, 1690, 1677, 1673,1780],
+  // columnIds: [1657, 1659, 1666, 1676, 1665, 1651, 1662,1736],
+  // 政务网环境
+  modelIds: [1780, 1777, 1787, 1785,2154],
+  columnIds: [2429, 2428, 2426, 2425, 2430, 2432, 2431, 2840],
 
-  iframeUrl: "http://10.235.245.174:2024/",
+  preCountDmsId: 2436,  // 政务网 2436  互联网 1652
 
-  // baseServicerPath: "/oneMap",
-  baseServicerPath: "http://121.43.55.7:13901/qpyzt",
   // oauth和DMS环境
-  backServerPath: "http://121.43.55.7",
+  backServerPath: serverPath,   // 运行管理中使用
+
+  iframeUrl: serverPath + ":2024/?token=1",
+
+  // baseServicerPath: "/oneMap",
+  baseServicerPath: serverPath + ":1201/qpyzt",  // 政 1201   互 13901
+
   // oauth地址
-  oauthServiceUrlOrigin: "http://121.43.55.7:10086/",
+  oauthServiceUrlOrigin: serverPath + ":8888/",  // App里使用  互 10086  政 8888
   // oauth地址
   // oauthServiceUrl: "/proxy_oauth",
-  oauthServiceUrl: "http://121.43.55.7:10086/oauth/",
+  oauthServiceUrl: serverPath + ":8888/oauth/",  // App里使用  互 10086  政 8888
   // oauth前端地址
-  oauthWebUrlPort: "2100",
+  oauthWebUrlPort: "2100",  // 运行管理中使用    无需动
   // dms前端地址
-  dmsWebUrlPort: "2101",
+  dmsWebUrlPort: "2101",  // 运行管理中使用   无需动
   // dms地址
   // dmsDataProxy: "/proxy_dms",
-  dmsDataProxy: "http://121.43.55.7:10081/dms/",
+  dmsDataProxy: serverPath + ":10081/dms/",  //无需动
   // 引擎基础js
   scriptMain: "/static/plugins/skyscenery/SkyScenery.js",
   // GEOSERVER_URL_WMS: "http://121.43.55.7:8889/geoserver/kdyjs/wms",
@@ -54,26 +66,47 @@ let systemConfig = {
     ],
   },
   sksjgl: {
+    list: [
+      {
+        label: "测绘地理预处理",
+        type: "1",
+        url: "http://47.103.92.60:1202/",
+      },
+      {
+        label: "矢量产品定制",
+        type: "2",
+        url: "http://47.103.92.60:1203/#/sliceMana",
+      },
+      {
+        label: "栅格数据产品定制",
+        type: "3",
+        url: "http://47.103.92.60:1204/",
+      },
+    ],
     funcList: {
       sjzljc: [
         {
           label: "矢量数据重复项检查工具",
           url: "http://47.103.92.60:1202/",
+          type: "1",
           image: "./static/images/sksjgl/sjzljc/矢量数据重复项检查工具.png",
         },
         {
           label: "矢量数据逻辑一致性检查工具",
           url: "http://47.103.92.60:1202/",
+          type: "1",
           image: "./static/images/sksjgl/sjzljc/矢量数据逻辑一致性检查工具.png",
         },
         {
           label: "矢量数据语义一致性检查工具",
           url: "http://47.103.92.60:1202/",
+          type: "1",
           image: "./static/images/sksjgl/sjzljc/矢量数据语义一致性检查工具.png",
         },
         {
           label: "影像数据一致性检查工具",
           url: "http://47.103.92.60:1202/",
+          type: "1",
           image: "./static/images/sksjgl/sjzljc/影像数据一致性检查工具.png",
         },
       ],
@@ -81,56 +114,67 @@ let systemConfig = {
         {
           label: "矢量数据格式转换工具",
           url: "http://47.103.92.60:1202/",
+          type: "1",
           image: "./static/images/sksjgl/sksjjg/矢量数据格式转换工具.png",
         },
         {
           label: "矢量数据投影转换工具",
           url: "http://47.103.92.60:1202/",
+          type: "1",
           image: "./static/images/sksjgl/sksjjg/矢量数据投影转换工具.png",
         },
         {
           label: "矢量数据坐标系统转换工具",
           url: "http://47.103.92.60:1202/",
+          type: "1",
           image: "./static/images/sksjgl/sksjjg/矢量数据坐标系统转换工具.png",
         },
         {
           label: "矢量瓦片定制",
           url: "http://47.103.92.60:1203/#/sliceMana",
+          type: "2",
           image: "./static/images/sksjgl/sksjjg/矢量瓦片定制.png",
         },
         {
           label: "地图样式符号管理",
           url: "http://47.103.92.60:1203/#/iconMana/icon",
+          type: "2",
           image: "./static/images/sksjgl/sksjjg/地图样式符号管理.png",
         },
         {
           label: "地图字体管理",
           url: "http://47.103.92.60:1203/#/fontsets",
+          type: "2",
           image: "./static/images/sksjgl/sksjjg/地图字体管理.png",
         },
         {
           label: "栅格数据格式转换工具",
           url: "http://47.103.92.60:1202/",
+          type: "1",
           image: "./static/images/sksjgl/sksjjg/栅格数据格式转换工具.png",
         },
         {
           label: "栅格数据坐标系统转换工具",
           url: "http://47.103.92.60:1202/",
+          type: "1",
           image: "./static/images/sksjgl/sksjjg/栅格数据坐标系统转换工具.png",
         },
         {
           label: "栅格数据投影转换工具",
           url: "http://47.103.92.60:1202/",
+          type: "1",
           image: "./static/images/sksjgl/sksjjg/栅格数据投影转换工具.png",
         },
         {
           label: "栅格数据裁切工具",
           url: "http://47.103.92.60:1202/",
+          type: "1",
           image: "./static/images/sksjgl/sksjjg/栅格数据裁切工具.png",
         },
         {
           label: "正射影像数据瓦片定制",
           url: "http://47.103.92.60:1204/",
+          type: "3",
           image: "./static/images/sksjgl/sksjjg/正射影像数据瓦片定制.png",
         },
       ],
@@ -138,21 +182,25 @@ let systemConfig = {
         {
           label: "矢量瓦片集管理",
           url: "http://47.103.92.60:1203/#/tileMana",
+          type: "2",
           image: "./static/images/sksjgl/sksjgl/矢量瓦片集管理.png",
         },
         {
           label: "栅格定制任务管理",
           url: "http://47.103.92.60:1204/",
+          type: "3",
           image: "./static/images/sksjgl/sksjgl/栅格定制任务管理.png",
         },
         {
           label: "栅格瓦片产品管理",
           url: "http://47.103.92.60:1204/",
+          type: "3",
           image: "./static/images/sksjgl/sksjgl/栅格瓦片产品管理.png",
         },
         {
           label: "栅格瓦片服务管理",
           url: "http://47.103.92.60:1204/",
+          type: "3",
           image: "./static/images/sksjgl/sksjgl/栅格瓦片服务管理.png",
         },
       ],
@@ -161,18 +209,21 @@ let systemConfig = {
           label: "栅格服务发布",
           // url: "http://10.235.245.174:2024/?token=1",
           url:"http://10.235.245.174:2033/?mapType=geosceneTile&serverType=y01_air_newest&epsg=sh2000",
+          type: "0",
           image: "./static/images/sksjgl/sksjfb/栅格服务发布.png",
         },
         {
           label: "矢量服务发布",
           // url: "http://10.235.245.174:2024/?token=1",
           url:"http://10.235.245.174:2033/?mapType=wms&serverType=village_dwelling_data_wms&epsg=wgs84&layers=qp_element:village_dwelling_data",
+          type: "0",
           image: "./static/images/sksjgl/sksjfb/矢量服务发布.png",
         },
         {
           label: "动态地图服务发布",
           // url: "http://10.235.245.174:2024/?token=1",
           url:"http://10.235.245.174:2033/?mapType=cartodb&serverType=cartodb&cartodbID=23cac72a_696c_11ee_9f3e_0242ac110004",
+          type: "0",
           image: "./static/images/sksjgl/sksjfb/动态地图服务发布.png",
         },
       ],
@@ -182,7 +233,8 @@ let systemConfig = {
   wgn: {
     // 微功能演示页面底图地址
     layerUrl:
-      "https://szlszxdt.qpservice.org.cn/internal_map/?servertype=shmap_blue_web&proxyToken=",
+      // "https://szlszxdt.qpservice.org.cn/internal_map/?servertype=shmap_blue_web&proxyToken=",
+      "http://10.235.245.174:10011/proxy?servertype=j02_basemap_dark&token=",
   },
   yygl: {},
   yxgl: {},

+ 1 - 1
src/api/count.js

@@ -9,7 +9,7 @@ const multiSearch = dmsPath + "/content/multipleFormsOfJointInvestigation";
 const oauthCountUser = oauthPath + "/user/countUser";
 const oauthCountPermission = oauthPath + "/permission/countPermission";
 
-const preCountDmsId = 1652;
+const preCountDmsId = systemConfig.preCountDmsId;
 
 const locationParsePath = [
   "/proxy/geoCoordinate",

+ 180 - 0
src/components/AppVue/UserFeek.vue

@@ -0,0 +1,180 @@
+<template>
+
+  <div class="user-feek-icon" @click="toggleUserFeekVisible">
+    <el-icon style="vertical-align: middle" title="用户反馈" :size="20" class="btn_color">
+      <Message />
+    </el-icon>
+  </div>
+  <el-dialog v-model="userFeekVisible" width="500">
+    <div style="text-align: center; font-size: 30px; margin-top: 40px">用户反馈</div>
+    <div style="margin: 60px">
+      <el-form :model="toUserFeek" :rules="userFeekRules" ref="toUserFeekForm" :label-width="100">
+        <el-form-item label="用户:" v-if="false">
+          <el-input v-model="toUserFeek.username" autocomplete="off" disabled />
+        </el-form-item>
+        <el-form-item label="标题:" prop="title">
+          <el-input
+            type="text"
+            v-model="toUserFeek.title"
+            autocomplete="off"
+            placeholder="请输入标题"
+          />
+        </el-form-item>
+        <el-form-item label="部门:" prop="department">
+          <el-input
+            type="text"
+            v-model="toUserFeek.department"
+            autocomplete="off"
+            placeholder="请输入部门"
+          />
+        </el-form-item>
+        <el-form-item label="反馈类型:" prop="type">
+           <el-select v-model="toUserFeek.type" placeholder="请选择反馈类型" style="width: 240px">
+              <el-option
+                v-for="item in typeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+        </el-form-item>
+        <el-form-item label="联系电话:" prop="contact">
+          <el-input
+            type="text"
+            v-model="toUserFeek.contact"
+            autocomplete="off"
+            placeholder="请输入联系电话"
+          />
+        </el-form-item>
+        <el-form-item label="内容:" prop="content">
+          <el-input
+            type="textarea"
+            v-model="toUserFeek.content"
+            autocomplete="off"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+      </el-form>
+      <div style="width: 100%; text-align: center; margin: 50px 0">
+        <el-button type="primary" style="width: 80%" @click="updUserPwd">提交</el-button>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import api from "@/api/content";
+export default {
+  name: "UserFeek",
+  data() {
+    return {
+      modelId: systemConfig.modelIds[4], // 用户反馈模型id
+      columnId: systemConfig.columnIds[7], // 用户反馈栏目id
+      userFeekVisible: false,
+      typeOptions: [
+        {
+          value: "1",
+          label: "建议反馈",
+        },
+        {
+          value: "2",
+          label: "问题反馈",
+        },
+        {
+          value: "3",
+          label: "其他反馈",
+        },
+      ],
+      toUserFeek: {
+        id: this.$store.state.userInfo.id,
+        username: this.$store.state.userInfo.username,
+        department: "",
+        title: "",
+        type: "1",
+        contact: "",
+        content: "",
+      },
+      userFeekRules: {
+        title: [{ required: true, message: "请输入标题", trigger: "blur" }],
+        // content: [{ required: true, message: "请输入内容", trigger: "blur" }],
+      },
+    };
+  },
+  props: {
+    close: Function,
+    showFlag: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  mounted() {},
+  methods: {
+    toggleUserFeekVisible(){
+      this.userFeekVisible = !this.userFeekVisible;
+    },
+    updUserPwd() {
+      let that = this;
+      let app = this;
+      app.$refs["toUserFeekForm"].validate((valid) => {
+        if (valid) {
+          let params = {
+            content: JSON.stringify(that.toUserFeek),
+            columnId: that.columnId,
+            modelId: that.modelId
+          };
+           // content: {"title":"tt","content":"ttt","c_fkxx":"ttt"}
+          // columnId: 1736
+          // modelId: 1780
+
+          api.addContent(params).then((res) => {
+            if (res.code == 200) {
+              that.$message({
+                type: "success",
+                message: "提交成功",
+              });
+              that.userFeekVisible = false;
+            } else {
+              that.$message({
+                type: "error",
+                message: res.message,
+              });
+              that.userFeekVisible = false;
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+  .user-feek-icon {
+    position: fixed;
+    right: 10px;
+    top: 120px;
+    width: 50px;
+    height: 50px;
+    line-height: 50px;
+    z-index: 9999;
+    // border: 1px solid #409eff;
+    // border-radius: 50px;
+    cursor: pointer;
+    text-align: center;
+    // &:hover {
+    //   background-color: #083d6e71;
+    // }
+  }
+  .btn_color {
+    color: #fff;
+    background: #1a2a6075;
+    border: 1px solid #409eff;
+    padding: 10px;
+    border-radius: 20px;
+    &:hover {
+      background: #29558f;
+      color: rgb(0, 247, 255);
+    }
+  }
+</style>

+ 389 - 71
src/components/filePreview/viewPreview.vue

@@ -36,6 +36,7 @@
 import { ElMessage } from "element-plus";
 import VueOfficeExcel from "@vue-office/excel";
 import "@vue-office/excel/lib/index.css";
+import { ElLoading } from "element-plus";
 import { toRaw } from "vue";
 export default {
   name: "",
@@ -52,9 +53,10 @@ export default {
       nowPoint: null,
       nowPointInfo: null,
       excelUrl: "",
-      loading: false,
+      loading: null,
       error: "",
       isShow: 1,
+      drawnEntities: [],
     };
   },
   created() {},
@@ -65,6 +67,11 @@ export default {
     if (url) {
       let arr = url.split(".");
       let type = arr[arr.length - 1];
+      this.loading = ElLoading.service({
+        lock: true,
+        text: 'Loading',
+        background: 'rgba(0, 0, 0, 0.7)',
+      });
       if (type == "json" || type == "geojson") {
         let param = { url: url };
         this.isShow = 1;
@@ -93,19 +100,19 @@ export default {
     loadExcel() {
       if (!this.excelUrl) {
         // this.error = '请输入Excel文件在线地址'
+        this.loading.close();
         return;
       }
-      this.loading = true;
       this.error = "";
       // 加载Excel文件,实际加载由VueOfficeExcel组件处理
       setTimeout(() => {
-        this.loading = false;
+        this.loading.close();
       }, 1000);
     },
     onError(err) {
       ElMessage.error("Excel文件加载失败:", err);
       // this.error = 'Excel文件加载失败,请检查文件地址是否正确'
-      this.loading = false;
+      this.loading.close();
     },
     creatMap() {
       window.viewer = new SkyScenery.Viewer("skysceneryContainer", {
@@ -169,85 +176,384 @@ export default {
     },
     dwanMap() {
       let that = this;
-      if (that.geometryArr.length > 0) {
-        that.geometryArr.map(function (info) {
-          viewer.entities.remove(info);
+      // if (that.geometryArr.length > 0) {
+      //   that.geometryArr.map(function (info) {
+      //     viewer.entities.remove(info);
+      //   });
+      // }
+      // that.geometryArr = that.dataJson.features.map(function (info) {
+      //   console.log("dataJson======"+JSON.stringify(info));
+      //   if (info.geometry.type == "Point") {
+      //     return that.addPoint(info);
+      //   } else if (info.geometry.type == "LineString") {
+      //     return that.addLine(info);
+      //   } else {
+      //     return that.addPolygon(info);
+      //   }
+      // });
+      that.addToMap(that.dataJson);
+      this.flyToGeojson(that.dataJson);
+      that.pointTCHandle();
+    },
+
+    // 飞行定位到geojson范围
+    flyToGeojson(geojson) {
+      if (!viewer || !geojson) {
+        return;
+      }
+      const points = this.collectGeojsonCoordinates(geojson);
+      if (!points.length) {
+        return;
+      }
+      if (points.length === 1) {
+        viewer.camera.flyTo({
+          destination: SkyScenery.Cartesian3.fromDegrees(points[0][0], points[0][1], 1200),
+          duration: 1.1,
+          orientation: {
+            heading: viewer.camera.heading,
+            pitch: SkyScenery.Math.toRadians(-65),
+            roll: 0,
+          },
         });
+        viewer.scene.requestRender();
+        return;
       }
-      that.geometryArr = that.dataJson.features.map(function (info) {
-        if (info.geometry.type == "Point") {
-          return that.addPoint(info);
-        } else if (info.geometry.type == "LineString") {
-          return that.addLine(info);
-        } else {
-          return that.addPolygon(info);
-        }
+      let minLon = Infinity;
+      let maxLon = -Infinity;
+      let minLat = Infinity;
+      let maxLat = -Infinity;
+      points.forEach((point) => {
+        minLon = Math.min(minLon, point[0]);
+        maxLon = Math.max(maxLon, point[0]);
+        minLat = Math.min(minLat, point[1]);
+        maxLat = Math.max(maxLat, point[1]);
       });
-      that.pointTCHandle();
+      const lonPad = Math.max((maxLon - minLon) * 0.25, 0.0008);
+      const latPad = Math.max((maxLat - minLat) * 0.25, 0.0008);
+      viewer.camera.flyTo({
+        destination: SkyScenery.Rectangle.fromDegrees(
+          minLon - lonPad,
+          minLat - latPad,
+          maxLon + lonPad,
+          maxLat + latPad
+        ),
+        duration: 1.1,
+      });
+      viewer.scene.requestRender();
+    },
+    collectGeojsonCoordinates(geojson) {
+      let that = this;
+      if (!geojson) {
+        return [];
+      }
+      if (geojson.features && Array.isArray(geojson.features)) {
+        return geojson.features.flatMap((feature) =>
+          that.collectGeometryCoordinates(feature.geometry)
+        );
+      }
+      if (geojson.geometry) {
+        return that.collectGeometryCoordinates(geojson.geometry);
+      }
+      return [];
     },
-    addPolygon(param) {
-      let arr = [];
-      param.geometry.coordinates.forEach((element) => {
-        element.forEach((e) => {
-          arr.push(e[0]);
-          arr.push(e[1]);
+    collectGeometryCoordinates(geometry) {
+      if (!geometry || !geometry.coordinates) {
+        return [];
+      }
+      const { type, coordinates } = geometry;
+      const points = [];
+      if (type === "Point") {
+        points.push([coordinates[0], coordinates[1]]);
+      } else if (type === "LineString") {
+        coordinates.forEach((coord) => points.push([coord[0], coord[1]]));
+      } else if (type === "Polygon") {
+        coordinates.forEach((ring) => {
+          ring.forEach((coord) => points.push([coord[0], coord[1]]));
+        });
+      } else if (type === "MultiPolygon") {
+        coordinates.forEach((polygon) => {
+          polygon.forEach((ring) => {
+            ring.forEach((coord) => points.push([coord[0], coord[1]]));
+          });
         });
+      }
+      return points;
+    },
+    // 将geojson添加到地图中
+    addToMap(geojson) {
+      this.drawnEntities.forEach((entity) => {
+        viewer.entities.remove(entity);
       });
-      return viewer.entities.add(
-        new SkyScenery.Entity({
-          name: " polygon",
-          polygon: {
-            hierarchy: {
-              positions: SkyScenery.Cartesian3.fromDegreesArray(arr),
-            },
-            heightReference: SkyScenery.HeightReference.CLAMP_TO_GROUND,
-            material: SkyScenery.Color.CYAN.withAlpha(0.5),
-          },
-          info: {
-            coor: [arr[0], arr[1]],
-            properties: param.properties,
-          },
-        })
-      );
+      const source = "sourceId";
+      if (geojson.features) {
+        const features = geojson.features;
+        // 2. 遍历features,根据type添加到地图中
+        // console.log("features", features);
+        features.forEach((feature, featureIndex) => {
+          const { type, coordinates } = feature.geometry;
+          const featureProperties = feature.properties || {};
+          const featureRefInfo = {
+            source,
+            featureIndex,
+          };
+          switch (type) {
+            case "Point":
+              // 点
+              this.addPoint(coordinates, featureProperties, featureRefInfo);
+              break;
+            case "LineString":
+              // 线
+              this.addLine(coordinates, featureProperties, featureRefInfo);
+              break;
+            case "Polygon":
+            case "MultiPolygon":
+              // 面
+              this.addPolygon(coordinates, featureProperties, featureRefInfo);
+              break;
+            default:
+              break;
+          }
+        });
+      }
+      setTimeout(() => {
+        viewer.scene.requestRender();
+        this.loading.close();
+      });
+    },
+    // 添加点到地图中
+    addPoint(coordinates, featureProperties = null, featureRefInfo = null) {
+      // 1. 解析点的坐标
+      console.log("addPoint coordinates", coordinates);
+      // 2. 创建点实体
+      const pointEntity = viewer.entities.add({
+        name: "point",
+        position:
+          coordinates.length > 2
+            ? SkyScenery.Cartesian3.fromDegrees(coordinates[0], coordinates[1], coordinates[2])
+            : SkyScenery.Cartesian3.fromDegrees(coordinates[0], coordinates[1]),
+        point: {
+          show: true,
+          color: SkyScenery.Color.RED,
+          pixelSize: 10,
+          outlineColor: SkyScenery.Color.WHITE,
+          outlineWidth: 2,
+        }
+      });
+      pointEntity.__featureProperties = featureProperties;
+      pointEntity.__featureRef = featureRefInfo;
+      // 3. 将点实体添加到drawnEntities中
+      this.drawnEntities.push(pointEntity);
     },
-    addLine(param) {
-      return viewer.entities.add({
+    // 添加线到地图中
+    addLine(coordinates, featureProperties = null, featureRefInfo = null) {
+      // 1. 解析线的坐标
+      console.log("addLine coordinates", coordinates);
+      // 2. 处理坐标格式:如果是二维数组则取第一个元素,否则直接使用
+      const lineCoordinates =
+        Array.isArray(coordinates[0]) && Array.isArray(coordinates[0][0])
+          ? coordinates[0]
+          : coordinates;
+
+      // 3. 检测坐标是否包含Z值
+      const hasZValues = lineCoordinates.some(
+        (coord) => coord.length > 2 && typeof coord[2] === "number"
+      );
+
+      // 4. 根据是否有Z值选择合适的坐标转换方法
+      let positions;
+      if (hasZValues) {
+        // 包含Z值,使用带高度的坐标转换方法
+        const flatCoordinatesWithHeights = [];
+        lineCoordinates.forEach((coord) => {
+          flatCoordinatesWithHeights.push(coord[0], coord[1], coord[2] || 0);
+        });
+        positions = SkyScenery.Cartesian3.fromDegreesArrayHeights(flatCoordinatesWithHeights);
+      } else {
+        // 不包含Z值,使用普通坐标转换方法
+        const flatCoordinates = [];
+        lineCoordinates.forEach((coord) => {
+          flatCoordinates.push(coord[0], coord[1]);
+        });
+        positions = SkyScenery.Cartesian3.fromDegreesArray(flatCoordinates);
+      }
+
+      // 5. 创建线实体
+      const lineEntity = viewer.entities.add({
         name: "line",
         polyline: {
-          //经纬度数组转世界坐标,带高度的话是fromDegreesArrayHeights
-          positions: SkyScenery.Cartesian3.fromDegreesArray(param.geometry.coordinates),
-          width: 2,
-          material: SkyScenery.Color.CYAN,
+          show: true,
+          positions: positions,
+          material: SkyScenery.Color.BLUE.withAlpha(0.8),
+          width: 3,
           info: {
-            properties: param.properties,
+            properties: featureProperties,
           },
         },
+
       });
+      lineEntity.__featureProperties = featureProperties;
+      lineEntity.__featureRef = featureRefInfo;
+
+      // 6. 将线实体添加到drawnEntities中
+      this.drawnEntities.push(lineEntity);
     },
-    addPoint(param) {
-      let that = this;
-      return viewer.entities.add(
-        new SkyScenery.Entity({
-          name: "point",
-          position: SkyScenery.Cartesian3.fromDegrees(
-            param.geometry.coordinates[0],
-            param.geometry.coordinates[1]
-          ),
-          type: "point",
-          info: {
-            coor: [param.geometry.coordinates[0], param.geometry.coordinates[1]],
-            properties: param.properties,
-          },
-          billboard: {
-            image: that.pointImg,
-            disableDepthTestDistance: Number.POSITIVE_INFINITY,
-            scale: 0.3,
-            horizontalOrigin: SkyScenery.HorizontalOrigin.CENTER,
-            verticalOrigin: SkyScenery.VerticalOrigin.BOTTOM,
-          },
-        })
+    // 添加面到地图中
+    addPolygon(coordinates, featureProperties = null, featureRefInfo = null) {
+      // 检测是否为MultiPolygon类型(MultiPolygon的坐标是三维数组)
+      if (
+        Array.isArray(coordinates[0]) &&
+        Array.isArray(coordinates[0][0]) &&
+        Array.isArray(coordinates[0][0][0])
+      ) {
+        console.log("MultiPolygon coordinates", coordinates);
+        // 是MultiPolygon类型,遍历每个Polygon
+        coordinates.forEach((polygonCoordinates) => {
+          this.renderSinglePolygon(polygonCoordinates, featureProperties, featureRefInfo);
+        });
+      } else {
+        // 是单个Polygon类型
+        this.renderSinglePolygon(coordinates, featureProperties, featureRefInfo);
+      }
+    },
+    // 渲染单个Polygon
+    renderSinglePolygon(coordinates, featureProperties = null, featureRefInfo = null) {
+      // 1. 处理坐标格式:确保获取外部环坐标
+      const outerRingCoordinates =
+        Array.isArray(coordinates[0]) && Array.isArray(coordinates[0][0])
+          ? coordinates[0]
+          : coordinates;
+
+      // 2. 检测坐标是否包含Z值
+      const hasZValues = outerRingCoordinates.some(
+        (coord) => coord.length > 2 && typeof coord[2] === "number"
       );
+
+      // 3. 根据是否有Z值选择合适的坐标转换方法
+      let positions;
+      let baseHeight = 0;
+      let extrudedHeight = 0; // 默认挤压高度
+
+      if (hasZValues) {
+        // 包含Z值,使用带高度的坐标转换方法
+        const flatCoordinatesWithHeights = [];
+        let minZ = Infinity;
+        let maxZ = -Infinity;
+
+        // 计算Z值的范围
+        outerRingCoordinates.forEach((coord) => {
+          const z = coord[2] || 0;
+          minZ = Math.min(minZ, z);
+          maxZ = Math.max(maxZ, z);
+          flatCoordinatesWithHeights.push(coord[0], coord[1], minZ); // 使用最小Z值作为基础高度
+        });
+
+        positions = SkyScenery.Cartesian3.fromDegreesArrayHeights(flatCoordinatesWithHeights);
+        baseHeight = minZ;
+        extrudedHeight = maxZ;
+      } else {
+        // 不包含Z值,使用普通坐标转换方法
+        const flatCoordinates = [];
+        outerRingCoordinates.forEach((coord) => {
+          flatCoordinates.push(coord[0], coord[1]);
+        });
+        positions = SkyScenery.Cartesian3.fromDegreesArray(flatCoordinates);
+      }
+
+      // 4. 创建面实体
+      const polygonEntity = viewer.entities.add({
+        name: "polygon",
+        polygon: {
+          hierarchy: {
+            positions: positions,
+          },
+          height: baseHeight, // 多边形底部高度
+          extrudedHeight: extrudedHeight, // 多边形顶部高度,实现3D挤压效果
+          heightReference: hasZValues
+            ? SkyScenery.HeightReference.NONE
+            : SkyScenery.HeightReference.CLAMP_TO_GROUND,
+          material: SkyScenery.Color.GREEN.withAlpha(0.5),
+          outline: true,
+          outlineColor: SkyScenery.Color.WHITE,
+          outlineWidth: 2,
+          // 设置侧面材质
+          extrudedMaterial: SkyScenery.Color.GREEN.withAlpha(0.8),
+        },
+        info: {
+          properties: featureProperties,
+        },
+      });
+      polygonEntity.__featureProperties = featureProperties;
+      polygonEntity.__featureRef = featureRefInfo;
+
+      // 5. 将面实体添加到drawnEntities中
+      this.drawnEntities.push(polygonEntity);
     },
+
+
+
+    // addPolygon(param) {
+    //   let arr = [];
+    //   param.geometry.coordinates.forEach((element) => {
+    //     element.forEach((e) => {
+    //       arr.push(e[0]);
+    //       arr.push(e[1]);
+    //     });
+    //   });
+    //   return viewer.entities.add(
+    //     new SkyScenery.Entity({
+    //       name: " polygon",
+    //       polygon: {
+    //         hierarchy: {
+    //           positions: SkyScenery.Cartesian3.fromDegreesArray(arr),
+    //         },
+    //         heightReference: SkyScenery.HeightReference.CLAMP_TO_GROUND,
+    //         material: SkyScenery.Color.CYAN.withAlpha(0.5),
+    //       },
+    //       info: {
+    //         coor: [arr[0], arr[1]],
+    //         properties: param.properties,
+    //       },
+    //     })
+    //   );
+    // },
+    // addLine(param) {
+    //   return viewer.entities.add({
+    //     name: "line",
+    //     polyline: {
+    //       //经纬度数组转世界坐标,带高度的话是fromDegreesArrayHeights
+    //       positions: SkyScenery.Cartesian3.fromDegreesArray(param.geometry.coordinates),
+    //       width: 2,
+    //       material: SkyScenery.Color.CYAN,
+    //       info: {
+    //         properties: param.properties,
+    //       },
+    //     },
+    //   });
+    // },
+    // addPoint(param) {
+    //   let that = this;
+    //   return viewer.entities.add(
+    //     new SkyScenery.Entity({
+    //       name: "point",
+    //       position: SkyScenery.Cartesian3.fromDegrees(
+    //         param.geometry.coordinates[0],
+    //         param.geometry.coordinates[1]
+    //       ),
+    //       type: "point",
+    //       info: {
+    //         coor: [param.geometry.coordinates[0], param.geometry.coordinates[1]],
+    //         properties: param.properties,
+    //       },
+    //       billboard: {
+    //         image: that.pointImg,
+    //         disableDepthTestDistance: Number.POSITIVE_INFINITY,
+    //         scale: 0.3,
+    //         horizontalOrigin: SkyScenery.HorizontalOrigin.CENTER,
+    //         verticalOrigin: SkyScenery.VerticalOrigin.BOTTOM,
+    //       },
+    //     })
+    //   );
+    // },
     // 点击事件绑定
     pointTCHandle() {
       let that = this;
@@ -270,13 +576,21 @@ export default {
           if (SkyScenery.defined(pickedObject) && SkyScenery.defined(pickedObject.id)) {
             const entity = pickedObject.id;
             that.infoDialogShow = true;
-            that.nowPoint = entity.info;
+            // that.nowPoint = entity.info;
+            // that.nowPointInfo = Object.keys(that.nowPoint.properties).map((key) => ({
+            //   key,
+            //   value: that.nowPoint.properties[key],
+            // }));
+            // that.nowPoint["type"] = "info";
+            // let xy = that.lonlatConvertToScreenXY(entity.info.coor)
+            let info = {properties: entity.__featureProperties};
+            that.nowPoint = info;
             that.nowPointInfo = Object.keys(that.nowPoint.properties).map((key) => ({
               key,
               value: that.nowPoint.properties[key],
             }));
             that.nowPoint["type"] = "info";
-            // let xy = that.lonlatConvertToScreenXY(entity.info.coor)
+
             let xy = that.lonlatConvertToScreenXY(center);
             document.querySelector(".infoDialog").style.top = xy.y - 230 + "px";
             document.querySelector(".infoDialog").style.left = xy.x - 100 + "px";
@@ -349,6 +663,10 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+#skysceneryContainer{
+  width: 100%;
+  height: 100%;
+}
 .container {
   width: 100%;
   height: 100%;
@@ -373,7 +691,7 @@ export default {
   top: 0px;
   left: 0px;
   max-width: 500px;
-  height: 200px;
+  max-height: 500px;
   // background: #01346f99;
   background: #ffffff;
   border-radius: 10px;
@@ -392,7 +710,7 @@ export default {
   }
 
   .content {
-    height: 160px;
+    max-height: 500px;
     // color: #ffffff;
     color: #000000;
     margin: 30px 0px 10px 20px;

+ 1 - 1
src/components/yxgl/table.vue

@@ -12,7 +12,7 @@
       border
     >
       <!-- 添加序号列 -->
-      <el-table-column type="index" label="" width="100" align="center" />
+      <el-table-column type="index" label="序号" width="100" align="center" />
       <el-table-column prop="path_comment" label="服务名称" />
       <el-table-column prop="type" label="类别" width="600" />
       <el-table-column prop="count" label="调用次数" width="280" />

+ 1 - 0
src/main.js

@@ -37,6 +37,7 @@ initApp.config.globalProperties.$getDmsTypes = (cName, index) => {
 };
 // 添加自定义方法,得到用户类型【1:游客;2:普通用户;3:管理员】
 const getUserType = () => {
+  // console.log("=====userInfo==="+JSON.stringify(store.state.userInfo));
   if (store.state.userInfo && store.state.userInfo.id != null) {
     // 得到用户id
     let userId = store.state.userInfo.id;

+ 7 - 0
src/router/index.js

@@ -160,6 +160,13 @@ const routes = [
       return import("../views/wgn/sksj/index.vue");
     },
   },
+  {
+    path: "/sksjglyl",
+    name: "sksjglyl",
+    component: function () {
+      return import("../views/Sksjglyl.vue");
+    },
+  },
   // 文件预览功能
   {
     path: "/fileView",

+ 1 - 0
src/utils/encrypt‌.js

@@ -27,6 +27,7 @@ function login(username, password) {
 export default function encrypt(loginObj) {
   return new Promise((resolve, reject) => {
     if (loginObj == undefined) {
+      // console.log("=======默认登录========"+JSON.stringify(loginObj));
       login(systemConfig.defaultAccount.username, AesEncryptUtil.getPassword())
         .then(function (result) {
           sessionStorage.setItem("sessionUserInfo", "");

+ 21 - 21
src/views/HomePage.vue

@@ -9,7 +9,7 @@
             <el-step title="统建应用" @click="goAnchor('tjyy')" :icon="Edit"/>
             <el-step title="应用支撑" @click="goAnchor('yyzc')" :icon="Edit"/>
           </el-steps>
-          
+
         </div>
       </el-affix>
     </div> -->
@@ -44,7 +44,7 @@
           <div class="part1-1-1">
             <span class="text">调用总数</span>
             <div class="number-container">
-              
+
                <digitalScrollersComp :val="totalCallNumber" /> -->
         <!-- <span v-for="(num, index) in totalCall" :key="index">
                 <span v-if="num.indexOf(',') > -1">
@@ -340,7 +340,7 @@
               <div :class="activeUseCase == 'decisionHelping' ? 'blue' : ''">特色场景</div>
             </div>
           </template></el-tab-pane>
-      </el-tabs> 
+      </el-tabs>
       <div class="warp-row">
         <div v-for="useCaseItem in useCase[activeUseCase]" :key="useCaseItem.title" class="use-case"
           :style="`background-image: url(${useCaseItem.picture});cursor: pointer;`" @click="handleTabsOpenPage(useCaseItem)">
@@ -865,8 +865,8 @@ export default {
       this.totalCall.forEach((item, index) => {
         itemNumber += item;
       });
-      // this.totalCallNumber = itemNumber;
-      this.totalCallNumber = "18,659,623";
+      this.totalCallNumber = itemNumber;
+      // this.totalCallNumber = "18,659,623";
     },
     async initChart1() {
       const nowDate = new Date();
@@ -1239,18 +1239,18 @@ export default {
       start = new Date(moment(start).format("YYYY-MM-DD 00:00:00"));
       end = new Date(moment(end).format("YYYY-MM-DD 23:59:59"));
       let data = (await totalCount(start, end))[0];
-      // this.lastDayCall = data == null ? 0 : data.count
-      this.lastDayCall = 239566;
+      this.lastDayCall = data == null ? 0 : data.count
+      // this.lastDayCall = 239566;
     },
     async pullMultiTimeRangeCall() {
-      // this.weekCall = await this.pullTotalCountByDays(7)
-      // this.monthCall = await this.pullTotalCountByDays(30)
-      // this.seasonCall = await this.pullTotalCountByDays(91)
-      // this.yearCall = await this.pullTotalCountByDays(365)
-      this.weekCall = 1186695;
-      this.monthCall = 4328556;
-      this.seasonCall = 6635991;
-      this.yearCall = 16596630;
+      this.weekCall = await this.pullTotalCountByDays(7)
+      this.monthCall = await this.pullTotalCountByDays(30)
+      this.seasonCall = await this.pullTotalCountByDays(91)
+      this.yearCall = await this.pullTotalCountByDays(365)
+      // this.weekCall = 1186695;
+      // this.monthCall = 4328556;
+      // this.seasonCall = 6635991;
+      // this.yearCall = 16596630;
     },
     async pullTotalCountByDays(days) {
       const nowDate = new Date();
@@ -1264,13 +1264,13 @@ export default {
     },
     async pullUserCount() {
       let data = await countUserData();
-      // this.appNum = data.application;
-      // this.unitNum = data.unit;
-      // this.userNum = data.username;
+      this.appNum = data.application;
+      this.unitNum = data.unit;
+      this.userNum = data.username;
 
-      this.appNum = 37;
-      this.unitNum = 18;
-      this.userNum = 46;
+      // this.appNum = 37;
+      // this.unitNum = 18;
+      // this.userNum = 46;
     },
     chartMluUpdateData(names, values) {
       chartMultiLevelUse.setOption({

+ 3 - 0
src/views/Root.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="main">
     <Header />
+    <UserFeek />
+    <!-- <Footer></Footer> -->
     <el-scrollbar ref="pagescrollbar" class="el-scrollbar">
       <router-view />
     </el-scrollbar>
@@ -32,6 +34,7 @@ export default {
   components: {
     Header: defineAsyncComponent(() => import("@/components/AppVue/Header.vue")),
     Footer: defineAsyncComponent(() => import("@/components/AppVue/Footer.vue")),
+    UserFeek: defineAsyncComponent(() => import("@/components/AppVue/UserFeek.vue")),
   },
   watch: {
     $route(to, from) {

+ 18 - 15
src/views/Sksjgl.vue

@@ -1,18 +1,5 @@
 <template>
   <div class="sksjgl container">
-    <!-- <div class="server_title">
-      <el-image
-        style="width: 50%; height: calc(100vh - 120px)"
-        src="static/images/sksjgl/sksjgl_title.png"
-        fit="cover"
-      />
-      <div class="server_title_text">
-        <div class="server_title_text_title">时空数据管理</div>
-        <div class="server_title_text_content">
-          二维数据服务是围绕二维地理信息数据展开的综合服务体系。它涵盖以像元阵列形式存储的栅格服务,广泛应用于影像地图展示、地形分析等;通过将地图切割成小图片进行快速加载的瓦片服务,提升地图浏览流畅度;能够精确表达地理要素几何形状和属性的矢量时空数据服务,记录地理对象随时间的变化;以及包含特定主题数据集合的专题库服务,如交通专题库、土地利用专题库等,满足不同行业对特定地理信息的深度挖掘与分析需求,为城市规划、资源管理、环境监测等领域提供有力的数据支撑。
-        </div>
-      </div>
-    </div> -->
 
     <!-- 顶部横幅区域 -->
     <div class="banner">
@@ -66,7 +53,8 @@
       <!-- 流程内容 -->
       <div class="process-content">
         <div class="process-content-item" v-for="(item, index) in nowFuncContent" :key="index">
-          <a :href="item.url" target="_blank" rel="noopener noreferrer">
+          <!-- <a :href="item.url" target="_blank" rel="noopener noreferrer"> -->
+          <a href="javascript:;" @click="goDetail(item)">
             <div
               class="pictrue"
               :style="{
@@ -138,6 +126,21 @@ export default {
     this.searchServerList();
   },
   methods: {
+    // 跳转详情页
+    goDetail(item) {
+      // console.log("========"+item);
+      if (item.type == "0") {
+        window.open(item.url, '_blank')
+      }else{
+        let routerPath = {
+          path: "/Sksjglyl", // 预览页面
+          query: { activePanel: item.type },
+        };
+        const routeData = this.$router.resolve(routerPath);
+        window.open(routeData.href, '_blank')
+      }
+
+    },
     changePanel(active) {
       this.activePanel = active;
       this.nowFuncContent = this.funcList[this.activePanel];
@@ -145,7 +148,7 @@ export default {
     // 搜索微功能服务
     searchServerList() {
       let requestParams = {
-        columnId: 1651,
+        columnId: systemConfig.columnIds[5],
         states: 0,
         pageSize: 999,
         page: 0,

+ 141 - 0
src/views/Sksjglyl.vue

@@ -0,0 +1,141 @@
+<template>
+  <div class="container">
+    <div id="header">
+      <div class="logo">
+        <img
+          src="/static/images/logo.png"
+          style="width: 24px; height: 24px; vertical-align: middle"
+          alt=""
+        />
+        青浦区“一张图”区级节点
+      </div>
+    </div>
+    <div style="z-index: 999;right: 20px; position: absolute;line-height: 44px;">
+      <span v-for="item in funcList" :key="item.label" :class="{'tab-item_active': item.type == activeName , 'tab-item': item.type != activeName}"  @click="handleClick(item)">{{item.label}}</span>
+      <!-- <el-tabs
+        v-model="activeName"
+        type="border-card"
+        class="demo-tabs"
+        @tab-click="handleClick"
+      >
+        <el-tab-pane v-for="item in funcList" :key="item.label" :label="item.label" :name="item.label">
+        </el-tab-pane>
+      </el-tabs> -->
+    </div>
+    <div style="height: 44px;"></div>
+
+    <!-- 复用的iframe:根据激活标签动态改src -->
+    <div class="win-iframe-container">
+      <iframe
+        :src="iframeSrc"
+        width="100%"
+        height="100%"
+        frameborder="0"
+        allowfullscreen
+      ></iframe>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      activeName: "",
+      funcList: systemConfig.sksjgl.list,
+      nowFuncContent: [],
+      iframeSrc: "",
+    };
+  },
+  mounted() {
+    this.dmsDataProxy = systemConfig.dmsDataProxy;
+    this.activeName = this.$route.query.activePanel ? this.$route.query.activePanel : "";
+    this.changePanel(this.activeName);
+  },
+  methods: {
+    changePanel(active) {
+      console.log("========"+active);
+      this.activeName = parseInt(active);
+      this.nowFuncContent = this.funcList[this.activeName - 1];
+      this.iframeSrc = this.nowFuncContent.url;
+    },
+    handleClick(tab) {
+      console.log("========"+tab);
+      this.iframeSrc = this.funcList.find(item => item.label == tab.label).url;
+      this.activeName = tab.type;
+    },
+    handleClick2(tab, event) {
+      let label = tab.props.label;
+      this.iframeSrc = this.funcList.find(item => item.label == label).url;
+    }
+  },
+};
+</script>
+<style>
+   .el-tabs--border-card>.el-tabs__content {
+      padding: 0;
+      display: none;
+   }
+</style>
+<style lang="less" scoped>
+.container {
+  width: 100%;
+  height: 100%;
+  margin: 0 auto;
+  padding: 0;
+}
+.win-iframe {
+  width: 100%;
+  height: 100%;
+}
+.win-iframe-container {
+  width: 100%;
+  height: 100%;
+}
+.tab-item {
+  display: inline-block;
+  padding: 0 10px;
+  cursor: pointer;
+  color: #ffffff;
+  &:hover {
+    color: #409eff;
+  }
+}
+.tab-item_active {
+  display: inline-block;
+  padding: 0 10px;
+  cursor: pointer;
+  color: #409eff;
+}
+
+#header::after {
+  content: "";
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 1px; /* 边框厚度 */
+  background-image: linear-gradient(to right, #071b3c, #71a5d4, #071b3c);
+}
+#header {
+  width: 100vw;
+  height: 44px;
+  background: linear-gradient(180deg, #2c2f74, #494d98);
+  color: #ffffff;
+  margin: 0 auto;
+  position: absolute;
+  background: #002153;
+  z-index: 999;
+  .logo {
+    display: inline-block;
+    height: 44px;
+    // width: 200px;
+    // padding: 0 20px;
+    padding: 0 20px 0px 20px;
+    text-align: center;
+    line-height: 44px;
+    font-size: 18px;
+    font-weight: bold;
+  }
+}
+</style>

+ 1 - 1
src/views/Yxgl.vue

@@ -47,7 +47,7 @@
       >
         <el-backtop target=".viewBox" :right="20" :bottom="70" />
         <StatisticalAnalysis v-if="menuActive == 'StatisticalAnalysis'" />
-        <iframe v-else :src="iframeUrl" frameborder="0"></iframe>
+        <iframe v-else :src="iframeUrl" frameborder="0" sandbox="allow-same-origin allow-scripts"></iframe>
       </div>
     </div>
   </el-affix>

+ 4 - 4
src/views/skmh/index.vue

@@ -124,7 +124,7 @@
                 end-placeholder="结束日期"
                 format="YYYY-MM-DD"
                  @change="changeTime"
-                
+
               />
             </div>
             <div class="button-row">
@@ -180,7 +180,7 @@
     </div> -->
 
     <!-- 功能演示 -->
-    <!-- <div class="demo-section">
+    <div class="demo-section">
       <div class="overview-header">
         <h2>功能演示</h2>
       </div>
@@ -195,7 +195,7 @@
           </div>
         </div>
       </div>
-    </div> -->
+    </div>
 
     <div>
       <el-dialog
@@ -305,7 +305,7 @@ export default {
     initData() {
       // this.getTimeRange();
       // this.getCountUserDataByAutoTime();
-      // this.getDmsDataList();
+      this.getDmsDataList();
       this.getDmsAppDataList();
     },
     getTimeRange() {

+ 2 - 2
src/views/wgn/Example.vue

@@ -63,9 +63,9 @@ export default {
 
       // 添加地图服务
       viewer.imageryLayers.addImageryProvider(
-        new SkyScenery.ArcGisMapServerImageryProvider({
+        new SkyScenery.CGCS2000ArcGisMapServerImageryProvider({
           url: systemConfig.wgn.layerUrl + SkySceneryConfig.token,
-          enablePickFeatures: false, // 禁用要素拾取功能以提高性能
+          // enablePickFeatures: false, // 禁用要素拾取功能以提高性能
         })
       );
 

+ 1 - 0
src/views/yygl/manage/index.vue

@@ -458,6 +458,7 @@ export default {
             phone: this.formatPhoneNumber(item.phone),
           }));
           this.applications = this.itemApplications;
+          console.log("========"+this.itemApplications);
         } else {
           this.total = 0;
           this.applications = [];