代码更新

surprise

2024-05-09 e897fc3d35f8e5dfa56d5f0c80a655ccf99202cf

代码更新

 src/assets/lang/zh.js

@@ -943,7 +943,7 @@
      valueexamine: "请选择目录节点所需的检查项",
      valuedirectory: "请选择所属目录",
      valuedescription: "请输入描述信息",
      valuesuffix: "请输入目录节点可存储数据类型后缀，如：.zip,.doc,.xls,.dwg,.pdf",
      valuesuffix: "请输入目录节点可存储数据类型后缀，如：.zip,.doc,.xls, ,.pdf",
      label: '请添加要查询的条件',
      queryContent: '请输入查询内容',
      geographicPosition: '请在地图上添加地理位置',

 src/components/chart/BaseBarChart.vue

@@ -1,5 +1,6 @@
<template>
  <div class="barchar" ref="chart"></div>
  <div class="barchar"
       ref="chart"></div>
</template>

<script>
@@ -125,7 +126,17 @@
        xAxisData.push(name)
        yAxisData.push(value)
      })
      console.log("管道数量", countVal)

      var obj=[];
      for(var i in xAxisData) {
        if(xAxisData[i]) {
          obj.push(xAxisData[i])
        } else {
          obj.push("其他")
        }
      }

      xAxisData=obj

      if (typeof count === "number") {
        this.$bus.$emit("changeCount", count)

 src/components/chart/BaseLineChart.vue

@@ -1,5 +1,6 @@
<template>
  <div class="linechar" ref="chart"></div>
  <div class="linechar"
       ref="chart"></div>
</template>

<script>
@@ -88,6 +89,16 @@
      //   }
      // })

      var obj=[];
      for(var i in xAxis) {
        if(xAxis[i]) {
          obj.push(xAxis[i])
        } else {
          obj.push("其他")
        }
      }

      xAxis=obj
      let option = {
        tooltip: {
          trigger: "axis",

 src/components/navMenu.vue

@@ -1,40 +1,28 @@
<template>
  <div
    class="NavBox"
    @click.stop
  >
  <div class="NavBox"
       @click.stop>
    <div class="topBox">
      <div class="topTitle"></div>
      <div class="topMenu">
        <div class="menuContent">
          <div
            class="contentDiv"
          <div class="contentDiv"
            @click="setMenuMove(index, item)"
            v-for="(item, index) in listMenu"
          >
               v-for="(item, index) in listMenu">
            <div style="display: flex;align-items: center">
              <div class="ImgMenu">
                <div
                  class="menuImage"
                  :class="changeSelectStyle == index ? item.checkClass : item.css"
                ></div>
                <div class="menuImage"
                     :class="changeSelectStyle == index ? item.checkClass : item.css"></div>
              </div>
              <div
                class="menulabel"
                :class="{ changeStyle: changeSelectStyle == index }"
              >
              <div class="menulabel"
                   :class="{ changeStyle: changeSelectStyle == index }">
                <span v-show="language"> {{ item.cnName }}</span> <span v-show="!language"> {{ item.enName }}</span>
              </div>
            </div>
            <div
              class="secondMenuDiv   subpage_Div"
              v-show="index == showFlag ? true :false"
            >
              <div
                v-for="res in item.children"
            <div class="secondMenuDiv   subpage_Div"
                 v-show="index == showFlag ? true :false">
              <div v-for="res in item.children"
                @click="setLiClick(res,index)"
                :class="{ changeLiStyle: changeliSelect == res.cnName }"
              >
                   :class="{ changeLiStyle: changeliSelect == res.cnName }">
                <span v-show="language"> {{ res.cnName }}</span> <span v-show="!language"> {{ res.enName }}</span>
              </div>
            </div>
@@ -43,25 +31,19 @@
      </div>
      <div class="topUser">
        <div class="userLanguage">
          <div
            class="userImage theme"
            @click="themeChange"
          ></div>
          <div
            class="userImage user2"
            @click="switchLang"
          ></div>
          <div class="userImage theme"
               @click="themeChange"></div>
          <div class="userImage user2"
               @click="switchLang"></div>

        </div>
        <div class="userName">
          <div class="userImage user1"></div>
          <div class="userText">
            <span>{{ this.$store.state.uname }}</span>
            <el-link
              @click="logOut"
            <el-link @click="logOut"
              :underline="false"
              class="elLink"
            >{{ $t('common.logout') }}</el-link>
                     class="elLink">{{ $t('common.logout') }}</el-link>
          </div>
        </div>
      </div>
@@ -77,7 +59,7 @@
import { queryMenuTree, getPerms } from '../api/api';
import colorChange from '../views/maintenance/colorChange.vue';
import { containsCoordinate } from 'ol/extent';
import Vue from 'vue';
import Vue,{ nextTick } from 'vue';
import $ from 'jquery'
export default {
  name: 'navMenu',
@@ -228,6 +210,10 @@
        }
        if (item.url == "Thematic") {
          this.signInsertOpLog("综合展示", item.cnName)
          this.$nextTick(function() {
            location.reload();
          })

        }

        this.changeSelectStyle = index;

 src/views/Thematic/index.vue

@@ -1,21 +1,20 @@
<template>
  <div class="themaic">
    <mapsdk></mapsdk>
    <top class="title" ref="title"></top>
    <left
      class="mapleft"
    <top class="title"
         ref="title"></top>
    <left class="mapleft"
      :style="{ width: leftWidth, left: leftWidth == '22%' ? '-19px' : '0' }"
      ref="mapleft"
    ></left>
          ref="mapleft"></left>

    <project-tree class="project-tree" v-show="ProjectreeDisplay"></project-tree>
    <project-tree class="project-tree"
                  v-show="ProjectreeDisplay"></project-tree>

    <right
      class="mapright"
    <right class="mapright"
      :style="{ width: rightWidth }"
      ref="mapright"
    ></right>
    <bottom class="mapbottom" ref="mapbottom"></bottom>
           ref="mapright"></right>
    <bottom class="mapbottom"
            ref="mapbottom"></bottom>
  </div>
</template>

@@ -38,7 +37,9 @@
      ProjectreeDisplay: false,
    }
  },
  mounted() {},
  mounted () {

  },
  created() {
    this.$bus.$on("changeTree", key => {
      this.ProjectreeDisplay = key

 src/views/Tools/AddOnlineMap.vue

@@ -1,26 +1,47 @@
<template>
  <Popup ref="pop" :title="title" @close="close(true)" width="400px" @yes="addData" @cancel="close(false)">
  <Popup ref="pop"
         :title="title"
         @close="close(true)"
         width="400px"
         @yes="addData"
         @cancel="close(false)">

    <div id="archTopBox" class="archTopBox">
    <div id="archTopBox"
         class="archTopBox">

      <div class="boxCard" v-for="(item, index) in mapList">
      <div class="boxCard"
           v-for="(item, index) in mapList">
        <el-card class="box-card">
          <div slot="header" class="clearfix">
          <div slot="header"
               class="clearfix">
            <span style="font-size:14px">{{ item.name }}</span>
            <div style="float: right; padding: 3px 0">
              <i v-show="!item.isShow" style="margin-left:10px" class="el-icon-arrow-up" :title="$t('archiveObj.fold')"
              <i v-show="!item.isShow"
                 style="margin-left:10px"
                 class="el-icon-arrow-up"
                 :title="$t('archiveObj.fold')"
                @click="setCardChange(item)"></i>
              <i v-show="item.isShow" style="margin-left:10px" class="el-icon-arrow-down"
                :title="$t('archiveObj.develop')" @click="setCardChange(item)"></i>
              <i v-show="item.isShow"
                 style="margin-left:10px"
                 class="el-icon-arrow-down"
                 :title="$t('archiveObj.develop')"
                 @click="setCardChange(item)"></i>
            </div>
          </div>
          <div :id="item.id" style="margin:5px 1px" v-show="!item.isShow">
          <div :id="item.id"
               style="margin:5px 1px"
               v-show="!item.isShow">
            <div style="margin:10px;width:380px">
              <div class="map" v-for="(map, mapIndex) in item.list" @click="addImageLayer(map, item)">
                <img style="width: 60px; height: 60px" :src="map.image"></img>
                <div> <el-link :underline="false">
              <div class="map"
                   v-for="(map, mapIndex) in item.list"
                   @click="addImageLayer(map, item)">
                <img style="width: 60px; height: 60px"
                     :src="map.image"></img>
                <div>
                  <el-link :underline="false">
                    {{ map.name }}
                  </el-link></div>
                  </el-link>
                </div>
              </div>
            </div>
          </div>
@@ -140,6 +161,7 @@
       
      } else if (mapCollection.sourceType === "localmap") {
        var ulr = map.urls;
        console.log(iisHost)
        ulr = ulr.replace("{host}", iisHost)

        window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(

 src/views/Tools/layer.js

@@ -69,22 +69,22 @@
        {
            name: "地图",
            image: require("../../assets/img/imageLayer/gdmap_map.jpg"),
            urls: "http://{host}/LFData/2d/tiles/vec/{z}/{x}/{y}.png",
            urls: "{host}/LFData/2d/tiles/vec/{z}/{x}/{y}.png",
        },
        {
            name: "影像",
            image: require("../../assets/img/imageLayer/gdmap_image.jpg"),
            urls: "http://{host}/LFData/2d/tiles/img/{z}/{x}/{y}.png",
            urls: "{host}/LFData/2d/tiles/img/{z}/{x}/{y}.png",
        },
        {
            name: "地形",
            image: require("../../assets/img/imageLayer/dixing.png"),
            urls: "http://{host}/LFData/2d/tiles/ter/{z}/{x}/{y}.png",
            urls: "{host}/LFData/2d/tiles/ter/{z}/{x}/{y}.png",
        },
        {
            name: "1:20万区域地质图",
            image: require("../../assets/img/imageLayer/25dizhi.png"),
            urls: "http://{host}/LFData/2d/tiles/20w_qydz/{z}/{x}/{y}.png",
            urls: "{host}/LFData/2d/tiles/20w_qydz/{z}/{x}/{y}.png",
        },
    ],
}