Selaa lähdekoodia

Merge branch 'master' of http://39.105.126.192:3000/DR3_web/zjyzt_gis_master_web_ui.git

# Conflicts:
#	src/views/Home.vue
#	src/views/SecondaryDevelopment.vue
wan.dequan 3 vuotta sitten
vanhempi
commit
331d4b32d7

+ 62 - 0
public/static/config/ComprehensiveDisplayData.json

@@ -0,0 +1,62 @@
+{
+    "NewscenterAreas": [
+      {
+        "imageUrl": "http://zfcxjst.hebei.gov.cn/dtlsj/202205/W020220518322335295754.jpg",
+        "jumpUrl": "http://zfcxjst.hebei.gov.cn/dtlsj/202205/t20220517_316299.html",
+        "alt": "于文学在石家庄市督导检查自建房安全隐患排查整治工作"
+      },
+      {
+        "imageUrl": "http://zfcxjst.hebei.gov.cn/dtlsj/202205/W020220520541128729525.jpg",
+        "jumpUrl": "http://zfcxjst.hebei.gov.cn/dtlsj/202205/t20220520_316317.html",
+        "alt": "周仲明到河北省住房和城乡建设厅专题调研"
+      },
+      {
+        "imageUrl": "http://zfcxjst.hebei.gov.cn/sylbt/202205/W020220517418513508357.jpg",
+        "jumpUrl": "http://zfcxjst.hebei.gov.cn/sylbt/202205/t20220517_316294.html",
+        "alt": "河北省住房和城乡建设厅举办“奋进新征程 建功新时代”青年干部交流会"
+      },
+      {
+        "imageUrl": "http://zfcxjst.hebei.gov.cn/sylbt/202205/W020220527577333537379.jpg",
+        "jumpUrl": "http://zfcxjst.hebei.gov.cn/sylbt/202205/t20220527_316375.html",
+        "alt": "河北省住房和城乡建设厅举办扣好廉洁从政“第一粒扣子”青年干部主题演讲比赛"
+      },
+      {
+        "imageUrl": "http://zfcxjst.hebei.gov.cn/sylbt/202205/W020220523637616449653.jpg",
+        "jumpUrl": "http://zfcxjst.hebei.gov.cn/sylbt/202205/t20220523_316327.html",
+        "alt": "河北省住房和城乡建设厅召开党组扩大会议"
+      }
+    ],
+    "NewscenterData": {
+      "NewscenterTitle": "河北省住房和城乡建设厅举办扣好廉洁从政“第一粒扣子”青年干部主题演讲比赛",
+      "NewscenterUrl": "http://zfcxjst.hebei.gov.cn/sylbt/202205/t20220527_316375.html",
+      "NewscenterContent":
+        "为教育引导青年干部坚定理想信念,牢记初心使命,正确对待权力,时刻自重自省,严守纪法规矩,按照省直机关纪检监察工作安排,5月26日,河北省住房和城乡建设厅举办扣好廉洁从政“第一粒扣子”青年干部演讲比赛。厅党组成员、总规划师吴铁,党组成员、副厅长赵春旺,二级巡视员翟佳麟及总经济师李景会到场观看比赛并为获奖人员颁奖。",
+      "NewscenterTitles": [
+        {
+          "title": "河北省住房和城乡建设厅举办扣好廉洁从政“第一粒扣子”青年干部主题演讲比赛",
+          "url": "http://zfcxjst.hebei.gov.cn/xinwenzhongxin/gongzuodongtai/202205/t20220527_316375.html"
+        },
+        {
+          "title": "163个项目列入2022年河北省建设科技研究项目指导性计划",
+          "url": "http://zfcxjst.hebei.gov.cn/xinwenzhongxin/gongzuodongtai/202205/t20220524_316332.html"
+        },
+        {
+          "title": "河北省住房和城乡建设厅举办扣好廉洁从政“第一粒扣子”青年干部主题演讲比赛",
+          "url": "http://zfcxjst.hebei.gov.cn/xinwenzhongxin/gongzuodongtai/202205/t20220527_316375.html"
+        },
+        {
+          "title": "163个项目列入2022年河北省建设科技研究项目指导性计划",
+          "url": "http://zfcxjst.hebei.gov.cn/xinwenzhongxin/gongzuodongtai/202205/t20220524_316332.html"
+        },
+        {
+          "title": "河北省住房和城乡建设厅举办扣好廉洁从政“第一粒扣子”青年干部主题演讲比赛",
+          "url": "http://zfcxjst.hebei.gov.cn/xinwenzhongxin/gongzuodongtai/202205/t20220527_316375.html"
+        },
+        {
+          "title": "163个项目列入2022年河北省建设科技研究项目指导性计划",
+          "url": "http://zfcxjst.hebei.gov.cn/xinwenzhongxin/gongzuodongtai/202205/t20220524_316332.html"
+        }
+      ]
+    },
+    "PlatformIsIntroducedContent": "<p>“河北省住房和城乡建设厅”网站由河北省住房和城乡建设厅主办,河北省住房和城乡建设厅信息中心承办。本法律声明阐述之条款和条件适用于所有登陆“河北省住房和城乡建设厅”网站的用户,以及其他网站或单位与该网站的法律关系。</p><p>河北省住房和城乡建设厅是“河北省住房和城乡建设厅”网站的所有者。“河北省住房和城乡建设厅”网站上刊载的所有内容,包括文字、图片、声音、图表、色彩的组合,版面设计,专题专栏目录与名称、内容分类等的版权均属河北省住房和城乡建设厅所有,受《中华人民共和国著作权法》及其它相关法律的保护。</p><p>他人将“河北省住房和城乡建设厅”网站提供的内容与服务用于商业、盈利、广告性目的时,需征得河北省住房和城乡建设厅或相关权利人许可,注明作者及文章出处,并依法向权利人支付报酬。</p><p>使用者将“河北省住房和城乡建设厅”网站提供的内容与服务用于非商业用途时,应遵守著作权法以及其他相关法律的规定,不得侵犯“河北省住房和城乡建设厅”网站及相关权利人的权益。</p><p>凡作者或权利人声明不得转载的文章或图片,任何单位及个人不得转载。</p><p>未经河北省住房和城乡建设厅授权,任何人不得建立该网站的镜像。</p>"
+  }

+ 84 - 50
src/components/SecondaryDevelopment/GraphicsDrawingTool.vue

@@ -1,70 +1,104 @@
 <template>
-  <el-container :class="'content'">
-    <el-header>
-      <el-button type="primary" class="add-item" @click="handleDownload">
-        下载工具包
-      </el-button>
-    </el-header>
-    <el-main>
-      <iframe :src="src" frameborder="0"></iframe>
-    </el-main>
-  </el-container>
+  <div class="box">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>集成方式</span>
+      </div>
+      <div>
+        图形绘制工具通过iframe引入。
+      </div>
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>集成操作步骤</span>
+      </div>
+      <div>
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="图形绘制工具" name="second"
+            >1、在页面创建一个iframe标签,src对应的是draw工具包的index.html页面。 例:
+            <p class="code">{{ code3 }}</p></el-tab-pane
+          >
+        </el-tabs>
+      </div>
+    </el-card>
+    
+  </div>
 </template>
-
 <script>
-// 图形绘制工具
+// 图形绘制工具集成说明
 export default {
-  name: "Home",
+  name: "",
   components: {},
   data() {
     return {
-      src: "./static/package/draw/dist/index.html",
+      activeName: "second",
+      code1: `<iframe
+      src="./static/package/collectdata/dist/index.html"
+      frameborder="0"
+    ></iframe>`,
+      code2: `<iframe
+      src="./static/package/collectdata/dist/index.html?type=1"
+      frameborder="0"
+    ></iframe>
+    <iframe src="./static/package/collectdata/dist/index.html?type=2" frameborder="0"></iframe>`,
+      code3: `<iframe
+      src="./static/package/draw/dist/index.html"
+      frameborder="0"
+    ></iframe>`,
+      code4: `let map = new Map({ 
+        target: "map",
+        logo: false, 
+        controls: defaults({ attribution: false, zoom: false, rotate: false, }), 
+        view: view, 
+        }); 
+    globalVariable.map = map; `,
+      code5: `import measureTool from"@/utils/ol_plugins/measure"; 
+    this.measure = new measureTool(globalVariable.map);`,
+      code6: `this.measure.start("line");
+    this.measure.start("area");`
     };
   },
   created() {},
 
-  methods: {
-    handleDownload() {
-      let item = systemConfig.plugins[1];
-      const elink = document.createElement("a");
-      elink.href = item.src;
-      elink.setAttribute("download", item.name);
-      elink.style.display = "none";
-      document.body.appendChild(elink);
-      setTimeout(() => {
-        elink.click();
-        document.body.removeChild(elink);
-      }, 66);
-    },
-  },
+  methods: {},
 
   computed: {},
-  watch: {},
+  watch: {}
 };
 </script>
 
 <style lang="less" scoped>
-.content {
-  width: calc(100% - 20px);
-  margin-left: 20px;
-  height: 100%;
-  .el-header {
-    background: #ffffff;
-    margin-bottom: 20px;
-    padding-top: 10px;
-  }
-
-  .el-main {
-    background: #ffffff;
-    overflow: hidden;
-    box-sizing: border-box;
-
-    position: relative;
-    border-radius: 5px;
-    padding: 0px 0px;
-    iframe {
-      width: 100%;
-      height: 100%;
+.box {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  align-content: center;
+  flex-wrap: wrap;
+  .box-card {
+    width: calc(50% - 15px);
+    height: calc(100vh - 400px);
+    font-size: 18px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    color: #4c4c4c;
+    line-height: 24px;
+    div:nth-child(1) {
+      font-weight: bold;
+    }
+    .clearfix span {
+      font-size: 20px;
+      font-family: Microsoft YaHei;
+      font-weight: bold;
+      color: #258df5;
+      line-height: 40px;
+    }
+    .code {
+      text-indent: 36px;
+      font-size: 18px;
+      font-family: Microsoft YaHei;
+      font-weight: 400;
+      color: #808080;
+      line-height: 32px;
     }
   }
 }

+ 91 - 57
src/components/SecondaryDevelopment/ManualDrawingTool.vue

@@ -1,72 +1,106 @@
 <template>
-  <el-container :class="'content'">
-    <el-header>
-      <el-button type="primary" class="add-item" @click="handleAddPoint"> 激活绘点 </el-button>
-      <el-button type="primary" class="add-item" @click="handleAddLine"> 激活绘线 </el-button>
-      <el-button type="primary" class="add-item" @click="handleDownload"> 下载工具包 </el-button>
-    </el-header>
-    <el-main>
-      <iframe :src="loadSrc" frameborder="0"></iframe>
-    </el-main>
-  </el-container>
+  <div class="box">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>集成方式</span>
+      </div>
+      <div>
+        手动落图工具通过iframe引入。
+      </div>
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>集成操作步骤</span>
+      </div>
+      <div>
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="手动落图工具" name="collectdata">
+            1、首先在页面创建一个iframe标签,src对应的是collectdata工具包的index.html页面。 例:
+            <p class="code">{{ code1 }}</p>
+            2、其次在页面中创建两个按钮【绘点、绘线】并创建点击事件,点击事件分别修改src参数type,type分别对应【1、2】。 例:
+            <p class="code">{{ code2 }}</p>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </el-card>
+    
+  </div>
 </template>
-
 <script>
-// 手动落图工具
+// 手动落图集成说明
 export default {
+  name: "",
+  components: {},
   data() {
     return {
-      loadSrc: "",
-      src: "./static/package/collectdata/dist/index.html"
+      activeName: "collectdata",
+      code1: `<iframe
+      src="./static/package/collectdata/dist/index.html"
+      frameborder="0"
+    ></iframe>`,
+      code2: `<iframe
+      src="./static/package/collectdata/dist/index.html?type=1"
+      frameborder="0"
+    ></iframe>
+    <iframe src="./static/package/collectdata/dist/index.html?type=2" frameborder="0"></iframe>`,
+      code3: `<iframe
+      src="./static/package/draw/dist/index.html"
+      frameborder="0"
+    ></iframe>`,
+      code4: `let map = new Map({ 
+        target: "map",
+        logo: false, 
+        controls: defaults({ attribution: false, zoom: false, rotate: false, }), 
+        view: view, 
+        }); 
+    globalVariable.map = map; `,
+      code5: `import measureTool from"@/utils/ol_plugins/measure"; 
+    this.measure = new measureTool(globalVariable.map);`,
+      code6: `this.measure.start("line");
+    this.measure.start("area");`
     };
   },
-  mounted() {
-    this.loadSrc = this.src;
-  },
-  methods: {
-    handleAddPoint() {
-      this.loadSrc = this.src + "?type=1";
-    },
-    handleAddLine() {
-      this.loadSrc = this.src + "?type=2";
-    },
-    handleDownload() {
-      let item = systemConfig.plugins[2];
-      const elink = document.createElement("a");
-      elink.href = item.src;
-      elink.setAttribute("download", item.name);
-      elink.style.display = "none";
-      document.body.appendChild(elink);
-      setTimeout(() => {
-        elink.click();
-        document.body.removeChild(elink);
-      }, 66);
-    }
-  }
+  created() {},
+
+  methods: {},
+
+  computed: {},
+  watch: {}
 };
 </script>
 
 <style lang="less" scoped>
-.content {
-  width: calc(100% - 20px);
-  margin-left: 20px;
-  .el-header {
-    background: #ffffff;
-    margin-bottom: 20px;
-    padding-top: 10px;
-  }
-
-  .el-main {
-    background: #ffffff;
-    overflow: hidden;
-    box-sizing: border-box;
-
-    position: relative;
-    border-radius: 5px;
-    padding: 0px 0px;
-    iframe {
-      width: 100%;
-      height: 100%;
+.box {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  align-content: center;
+  flex-wrap: wrap;
+  .box-card {
+    width: calc(50% - 15px);
+    height: calc(100vh - 400px);
+    font-size: 18px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    color: #4c4c4c;
+    line-height: 24px;
+    div:nth-child(1) {
+      font-weight: bold;
+    }
+    .clearfix span {
+      font-size: 20px;
+      font-family: Microsoft YaHei;
+      font-weight: bold;
+      color: #258df5;
+      line-height: 40px;
+    }
+    .code {
+      text-indent: 36px;
+      font-size: 18px;
+      font-family: Microsoft YaHei;
+      font-weight: 400;
+      color: #808080;
+      line-height: 32px;
     }
   }
 }

+ 91 - 74
src/components/SecondaryDevelopment/MeasureTool.vue

@@ -1,92 +1,109 @@
 <template>
-  <el-container :class="'content'">
-    <el-header>
-      <el-button type="primary" class="add-item" @click="handleDownload">
-        下载工具包
-      </el-button>
-    </el-header>
-    <el-main>
-      <Map ref="mainMap" />
-      <Tool></Tool>
-      <Footer :lat="lat" :lon="lon" :zoom="zoom"></Footer>
-    </el-main>
-  </el-container>
+  <div class="box">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>集成方式</span>
+      </div>
+      <div>
+        测量工具引入js包并操作方法实现。
+      </div>
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>集成操作步骤</span>
+      </div>
+      <div>
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="测量工具" name="measure">
+            1、首先在页面中新建map对象,并初始化globalVariable.map对象。 例:
+            <p class="code">{{ code4 }}</p>
+            2、其次引用measure工具包,并实例化对象。 例:
+            <p class="code">{{ code5 }}</p>
+            3、最后在页面中创建两个按钮【测距、测面】并创建点击事件,点击事件分别触发测距测面事件。 例:
+            <p class="code">{{ code6 }}</p>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </el-card>
+    
+  </div>
 </template>
-
 <script>
-// 测量工具
+// 测量工具集成说明
 export default {
-  name: "Home",
-  components: {
-    Map: () => import("../Utilities/MeasureTool/Map.vue"),
-    Tool: () => import("../Utilities/MeasureTool/Tool.vue"),
-    Footer: () => import("../Utilities/MeasureTool/Footer.vue")
-  },
+  name: "",
+  components: {},
   data() {
     return {
-      select: 1,
-      keyword: "",
-      lon: 0,
-      lat: 0,
-      zoom: 6
+      activeName: "measure",
+      code1: `<iframe
+      src="./static/package/collectdata/dist/index.html"
+      frameborder="0"
+    ></iframe>`,
+      code2: `<iframe
+      src="./static/package/collectdata/dist/index.html?type=1"
+      frameborder="0"
+    ></iframe>
+    <iframe src="./static/package/collectdata/dist/index.html?type=2" frameborder="0"></iframe>`,
+      code3: `<iframe
+      src="./static/package/draw/dist/index.html"
+      frameborder="0"
+    ></iframe>`,
+      code4: `let map = new Map({ 
+        target: "map",
+        logo: false, 
+        controls: defaults({ attribution: false, zoom: false, rotate: false, }), 
+        view: view, 
+        }); 
+    globalVariable.map = map; `,
+      code5: `import measureTool from"@/utils/ol_plugins/measure"; 
+    this.measure = new measureTool(globalVariable.map);`,
+      code6: `this.measure.start("line");
+    this.measure.start("area");`
     };
   },
   created() {},
 
-  mounted() {},
-  methods: {
-    handleDownload() {
-      let item = systemConfig.plugins[0];
-      const elink = document.createElement("a");
-      elink.href = item.src;
-      elink.setAttribute("download", item.name);
-      elink.style.display = "none";
-      document.body.appendChild(elink);
-      setTimeout(() => {
-        elink.click();
-        document.body.removeChild(elink);
-      }, 66);
-    }
-  },
+  methods: {},
 
-  computed: {
-    lonlat() {
-      return this.$store.state.mouseLocation;
-    },
-    zoomNum() {
-      return this.$store.state.nowZoom;
-    }
-  },
-  watch: {
-    lonlat(newVal) {
-      this.lon = newVal[0];
-      this.lat = newVal[1];
-    },
-    zoomNum(newVal) {
-      this.zoom = newVal;
-    }
-  }
+  computed: {},
+  watch: {}
 };
 </script>
 
 <style lang="less" scoped>
-.content {
-  width: calc(100% - 20px);
-  margin-left: 20px;
-  .el-header {
-    background: #ffffff;
-    margin-bottom: 20px;
-    padding-top: 10px;
-  }
-
-  .el-main {
-    background: #ffffff;
-    overflow: hidden;
-    box-sizing: border-box;
-
-    position: relative;
-    border-radius: 5px;
-    padding: 0px 0px;
+.box {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  align-content: center;
+  flex-wrap: wrap;
+  .box-card {
+    width: calc(50% - 15px);
+    height: calc(100vh - 400px);
+    font-size: 18px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    color: #4c4c4c;
+    line-height: 24px;
+    div:nth-child(1) {
+      font-weight: bold;
+    }
+    .clearfix span {
+      font-size: 20px;
+      font-family: Microsoft YaHei;
+      font-weight: bold;
+      color: #258df5;
+      line-height: 40px;
+    }
+    .code {
+      text-indent: 36px;
+      font-size: 18px;
+      font-family: Microsoft YaHei;
+      font-weight: 400;
+      color: #808080;
+      line-height: 32px;
+    }
   }
 }
 </style>

+ 25 - 88
src/views/ComprehensiveDisplay.vue

@@ -14,7 +14,7 @@
         <div class="Newscenter_main">
           <!-- 图片轮播区域 -->
           <el-carousel class="Newscenter_main_byArea" height="200px">
-            <el-carousel-item v-for="(item, index) in NewscenterAreas" :key="index">
+            <el-carousel-item v-for="(item, index) in data.NewscenterAreas" :key="index">
               <el-image style="cursor: pointer" :src="item.imageUrl" @click="Jump(item.jumpUrl)" :alt="item.alt"> </el-image>
               <div class="Newscenter_main_byArea_alt userSelect_None">
                 <el-tooltip class="item" effect="dark" :content="item.alt" :open-delay="1000">
@@ -26,38 +26,38 @@
           <!-- 新闻中心内容 -->
           <div class="Newscenter_main_content">
             <!-- 标题 -->
-            <el-tooltip class="item" effect="dark" :content="NewscenterData.NewscenterTitle" :open-delay="1000">
-              <div class="title" @click="Jump(NewscenterData.NewscenterUrl)">{{ NewscenterData.NewscenterTitle }}</div>
+            <el-tooltip class="item" effect="dark" :content="data.NewscenterData.NewscenterTitle" :open-delay="1000">
+              <div class="title" @click="Jump(data.NewscenterData.NewscenterUrl)">{{ data.NewscenterData.NewscenterTitle }}</div>
             </el-tooltip>
             <!-- 内容 -->
-            <el-tooltip class="item" effect="dark" :content="NewscenterData.NewscenterContent" :open-delay="1000">
+            <el-tooltip class="item" effect="dark" :content="data.NewscenterData.NewscenterContent" :open-delay="1000">
               <div class="content userSelect_None">
-                {{ NewscenterData.NewscenterContent }}
+                {{ data.NewscenterData.NewscenterContent }}
               </div>
             </el-tooltip>
             <!-- 小标题 -->
-            <div v-if="NewscenterData.NewscenterTitles.length > 0">
+            <div v-if="data.NewscenterData.NewscenterTitles.length > 0">
               <el-carousel height="70px" direction="vertical">
-                <el-carousel-item v-for="index in Math.ceil(NewscenterData.NewscenterTitles.length / 2)" :key="index">
+                <el-carousel-item v-for="index in Math.ceil(data.NewscenterData.NewscenterTitles.length / 2)" :key="index">
                   <el-tooltip
                     class="item"
                     effect="dark"
-                    :content="NewscenterData.NewscenterTitles[2 * index - 2].title"
+                    :content="data.NewscenterData.NewscenterTitles[2 * index - 2].title"
                     :open-delay="1000"
                   >
-                    <div class="titles" @click="Jump(NewscenterData.NewscenterTitles[2 * index - 2].url)">
-                      {{ NewscenterData.NewscenterTitles[2 * index - 2].title }}
+                    <div class="titles" @click="Jump(data.NewscenterData.NewscenterTitles[2 * index - 2].url)">
+                      {{ data.NewscenterData.NewscenterTitles[2 * index - 2].title }}
                     </div>
                   </el-tooltip>
-                  <div v-if="NewscenterData.NewscenterTitles[2 * index - 1]">
+                  <div v-if="data.NewscenterData.NewscenterTitles[2 * index - 1]">
                     <el-tooltip
                       class="item"
                       effect="dark"
-                      :content="NewscenterData.NewscenterTitles[2 * index - 1].title"
+                      :content="data.NewscenterData.NewscenterTitles[2 * index - 1].title"
                       :open-delay="1000"
                     >
-                      <div class="titles" @click="Jump(NewscenterData.NewscenterTitles[2 * index - 1].url)">
-                        {{ NewscenterData.NewscenterTitles[2 * index - 1].title }}
+                      <div class="titles" @click="Jump(data.NewscenterData.NewscenterTitles[2 * index - 1].url)">
+                        {{ data.NewscenterData.NewscenterTitles[2 * index - 1].title }}
                       </div>
                     </el-tooltip>
                   </div>
@@ -76,13 +76,11 @@
           <span class="clearfix_titleEn" type="text">Platform Introduction</span>
         </div>
         <!-- 平台介绍主题 -->
-        <div class="PlatformIsIntroduced_main" v-html="PlatformIsIntroducedContent"></div>
+        <div class="PlatformIsIntroduced_main" v-html="data.PlatformIsIntroducedContent"></div>
       </el-card>
     </div>
     <!-- 第二层:中国地理信息平台 -->
-    <el-card
-      class="ComprehensiveDisplayMain_ChinaGeographicInformationCenter"
-    >
+    <el-card class="ComprehensiveDisplayMain_ChinaGeographicInformationCenter">
       <!-- 平台介绍内容 -->
       <span class="ChinaGeographicInformationCenterTitle userSelect_None" @click="undefinedFunction()">中国地理信息平台</span>
     </el-card>
@@ -110,77 +108,16 @@ export default {
   data() {
     //   后续可调用后端接口动态显示
     return {
-      // 新闻中心轮播
-      NewscenterAreas: [
-        {
-          imageUrl: "http://zfcxjst.hebei.gov.cn/dtlsj/202205/W020220518322335295754.jpg",
-          jumpUrl: "http://zfcxjst.hebei.gov.cn/dtlsj/202205/t20220517_316299.html",
-          alt: "于文学在石家庄市督导检查自建房安全隐患排查整治工作"
-        },
-        {
-          imageUrl: "http://zfcxjst.hebei.gov.cn/dtlsj/202205/W020220520541128729525.jpg",
-          jumpUrl: "http://zfcxjst.hebei.gov.cn/dtlsj/202205/t20220520_316317.html",
-          alt: "周仲明到河北省住房和城乡建设厅专题调研"
-        },
-        {
-          imageUrl: "http://zfcxjst.hebei.gov.cn/sylbt/202205/W020220517418513508357.jpg",
-          jumpUrl: "http://zfcxjst.hebei.gov.cn/sylbt/202205/t20220517_316294.html",
-          alt: "河北省住房和城乡建设厅举办“奋进新征程 建功新时代”青年干部交流会"
-        },
-        {
-          imageUrl: "http://zfcxjst.hebei.gov.cn/sylbt/202205/W020220527577333537379.jpg",
-          jumpUrl: "http://zfcxjst.hebei.gov.cn/sylbt/202205/t20220527_316375.html",
-          alt: "河北省住房和城乡建设厅举办扣好廉洁从政“第一粒扣子”青年干部主题演讲比赛"
-        },
-        {
-          imageUrl: "http://zfcxjst.hebei.gov.cn/sylbt/202205/W020220523637616449653.jpg",
-          jumpUrl: "http://zfcxjst.hebei.gov.cn/sylbt/202205/t20220523_316327.html",
-          alt: "河北省住房和城乡建设厅召开党组扩大会议"
-        }
-      ],
-      // 新闻中心右侧
-      NewscenterData: {
-        NewscenterTitle: "河北省住房和城乡建设厅举办扣好廉洁从政“第一粒扣子”青年干部主题演讲比赛",
-        NewscenterUrl: "http://zfcxjst.hebei.gov.cn/sylbt/202205/t20220527_316375.html",
-        NewscenterContent:
-          "为教育引导青年干部坚定理想信念,牢记初心使命,正确对待权力,时刻自重自省,严守纪法规矩,按照省直机关纪检监察工作安排,5月26日,河北省住房和城乡建设厅举办扣好廉洁从政“第一粒扣子”青年干部演讲比赛。厅党组成员、总规划师吴铁,党组成员、副厅长赵春旺,二级巡视员翟佳麟及总经济师李景会到场观看比赛并为获奖人员颁奖。",
-        NewscenterTitles: [
-          {
-            title: "河北省住房和城乡建设厅举办扣好廉洁从政“第一粒扣子”青年干部主题演讲比赛",
-            url: "http://zfcxjst.hebei.gov.cn/xinwenzhongxin/gongzuodongtai/202205/t20220527_316375.html"
-          },
-          {
-            title: "163个项目列入2022年河北省建设科技研究项目指导性计划",
-            url: "http://zfcxjst.hebei.gov.cn/xinwenzhongxin/gongzuodongtai/202205/t20220524_316332.html"
-          },
-          {
-            title: "河北省住房和城乡建设厅举办扣好廉洁从政“第一粒扣子”青年干部主题演讲比赛",
-            url: "http://zfcxjst.hebei.gov.cn/xinwenzhongxin/gongzuodongtai/202205/t20220527_316375.html"
-          },
-          {
-            title: "163个项目列入2022年河北省建设科技研究项目指导性计划",
-            url: "http://zfcxjst.hebei.gov.cn/xinwenzhongxin/gongzuodongtai/202205/t20220524_316332.html"
-          },
-          {
-            title: "河北省住房和城乡建设厅举办扣好廉洁从政“第一粒扣子”青年干部主题演讲比赛",
-            url: "http://zfcxjst.hebei.gov.cn/xinwenzhongxin/gongzuodongtai/202205/t20220527_316375.html"
-          },
-          {
-            title: "163个项目列入2022年河北省建设科技研究项目指导性计划",
-            url: "http://zfcxjst.hebei.gov.cn/xinwenzhongxin/gongzuodongtai/202205/t20220524_316332.html"
-          }
-        ]
-      },
-      // 平台介绍,纯文本或者html文本都可以
-      PlatformIsIntroducedContent: `<p>“河北省住房和城乡建设厅”网站由河北省住房和城乡建设厅主办,河北省住房和城乡建设厅信息中心承办。本法律声明阐述之条款和条件适用于所有登陆“河北省住房和城乡建设厅”网站的用户,以及其他网站或单位与该网站的法律关系。</p><p>
-河北省住房和城乡建设厅是“河北省住房和城乡建设厅”网站的所有者。“河北省住房和城乡建设厅”网站上刊载的所有内容,包括文字、图片、声音、图表、色彩的组合,版面设计,专题专栏目录与名称、内容分类等的版权均属河北省住房和城乡建设厅所有,受《中华人民共和国著作权法》及其它相关法律的保护。</p><p>
-他人将“河北省住房和城乡建设厅”网站提供的内容与服务用于商业、盈利、广告性目的时,需征得河北省住房和城乡建设厅或相关权利人许可,注明作者及文章出处,并依法向权利人支付报酬。</p><p>
-使用者将“河北省住房和城乡建设厅”网站提供的内容与服务用于非商业用途时,应遵守著作权法以及其他相关法律的规定,不得侵犯“河北省住房和城乡建设厅”网站及相关权利人的权益。</p><p>
-凡作者或权利人声明不得转载的文章或图片,任何单位及个人不得转载。</p><p>
-未经河北省住房和城乡建设厅授权,任何人不得建立该网站的镜像。</p>`
+      data: {}
     };
   },
   computed: {},
+  created() {
+    let that = this;
+    $.getJSON("./static/config/ComprehensiveDisplayData.json", function (result) {
+      that.data = result;
+    });
+  },
   mounted() {},
   methods: {
     Jump(jumpUrl) {
@@ -288,8 +225,8 @@ export default {
             font-size: 18px;
             font-family: Microsoft YaHei;
             font-weight: 400;
-            text-shadow: 0 0 1px #4C4C4C;
-            color: #4C4C4C;
+            text-shadow: 0 0 1px #4c4c4c;
+            color: #4c4c4c;
             line-height: 24px;
             overflow: hidden;
             text-overflow: ellipsis;

+ 3 - 9
src/views/SecondaryDevelopment.vue

@@ -12,7 +12,6 @@
         <ManualDrawingTool v-if="showIndex == '1'"></ManualDrawingTool>
         <GraphicsDrawingTool v-if="showIndex == '2'"></GraphicsDrawingTool>
         <MeasureTool v-if="showIndex == '3'"></MeasureTool>
-        <IntegratedDescription v-if="showIndex == '4'"></IntegratedDescription>
       </el-main>
     </el-container>
   </div>
@@ -34,14 +33,9 @@ export default {
   },
   components: {
     Aside: () => import("@/components/Currency/Aside.vue"),
-    ManualDrawingTool: () =>
-      import("@/components/SecondaryDevelopment/ManualDrawingTool.vue"),
-    GraphicsDrawingTool: () =>
-      import("@/components/SecondaryDevelopment/GraphicsDrawingTool.vue"),
-    MeasureTool: () =>
-      import("@/components/SecondaryDevelopment/MeasureTool.vue"),
-    IntegratedDescription: () =>
-      import("@/components/SecondaryDevelopment/IntegratedDescription.vue"),
+    ManualDrawingTool: () => import("@/components/SecondaryDevelopment/ManualDrawingTool.vue"),
+    GraphicsDrawingTool: () => import("@/components/SecondaryDevelopment/GraphicsDrawingTool.vue"),
+    MeasureTool: () => import("@/components/SecondaryDevelopment/MeasureTool.vue"),
   },
   created() {
     let that = this;