Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW

wulitaotao

2023-02-22 32ce11c659c4b4849cbcf90ff465e69ff477e361

Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW

 package.json

@@ -9,6 +9,7 @@
    "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
  },
  "dependencies": {
    "@terraformer/wkt": "^2.1.2",
    "@turf/turf": "^6.5.0",
    "animate.css": "^4.1.1",
    "aws-sdk": "^2.963.0",

 src/api/api.js

@@ -74,6 +74,11 @@
  //请求地址
  return request.get('/meta/selectVerByDirid', { params: params });
}
//元数据=>根据父ID分页查询并返回记录数
export function meta_selectPageAndCountByPid(params) {
  //请求地址
  return request.get('/meta/selectPageAndCountByPid', { params: params });
}


//组织机构根据id查询
@@ -588,6 +593,14 @@
}


//数据上传=根据父ID分页查询并返回记录数
export function dataUpload_selectPageAndCountByPid(params) {
  return request.get('/dataUpload/selectPageAndCountByPid', { params: params });
}




//数据上传=删除数据
export function dataUpload_deleteMetas(params) {
  return request.get('/dataUpload/deleteMetas', { params: params });
@@ -820,9 +833,20 @@
  return request.get('/dataCount/selectCountOperates', { params: params });
}




//数据统计=>查询服务调用量统计
export function dataCount_selectCountServices(params) {
  return request.get('/dataCount/selectCountServices', { params: params });
}
//数据统计=>查询数据量统计
export function dataCount_selectCountSizes(params) {
  return request.get('/dataCount/selectCountSizes', { params: params });
}
//数据统计=>下载报告
export function dataCount_downloadReport(params) {
  return request.get('/dataCount/downloadReport', { params: params });
}
 
 


//请求站场点内容

 src/api/screen.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
import request from "@/utils/request"

// ä¸€å¼ å›¾æ•°æ®æŽ¥å£ 

// æ•°æ®ç”³è¯·
export function countDataApply(params) {
  return request.get("/oneMap/countDataApply", { params: params })
}
// æ•°æ®å­˜å‚¨ç»Ÿè®¡
export function countDataStorage(params) {
  return request.get("/oneMap/countDataStorage", { params: params })
}
// è®¿é—®æ¬¡æ•°
export function countDataVisit(params) {
  return request.get("/oneMap/countDataVisit", { params: params })
}
// æ–‡ä»¶æ ¼å¼ç»´åº¦-文件个数
export function countFileFormat(params) {
  return request.get("/oneMap/countFileFormat", { params: params })
}
// é¡¹ç›®ç±»åˆ«
export function countProjectCategory(params) {
  return request.get("/oneMap/countProjectCategory", { params: params })
}
// é¡¹ç›®å·¥ç¨‹å±•ç¤º
export function countProjectDisplay(params) {
  return request.get("/oneMap/countProjectDisplay", { params: params })
}
// é¡¹ç›®ä½ç½®åˆ†å¸ƒ
export function countProjectLocation(params) {
  return request.get("/oneMap/countProjectLocation", { params: params })
}
// é¡¹ç›®å·¥ç¨‹å·¡è§†
export function countProjectTour(params) {
  return request.get("/oneMap/countProjectTour", { params: params })
}
// é¡¹ç›®æ•°é‡ç»Ÿè®¡-——省维度
export function countProvinceDimension(params) {
  return request.get("/oneMap/countProvinceDimension", { params: params })
}

// å›½å®¶ç»´åº¦-数量统计
export function countCountryDimension(params) {
  return request.get("/oneMap/countCountryDimension", { params: params })
}

 src/assets/css/config.css

@@ -396,15 +396,15 @@

/* // é€šè§†åˆ†æžã€è§†åŸŸåˆ†æž é¢„ç•™ */
.Black_theme .twoMenu_imge412 {
    background: url("../../assets/img/synthesis/矩形 14 æ‹·è´ 7.png") no-repeat center;
    background: url("../../assets/img/synthesis/images/通视分析.png") no-repeat center;
}

.Black_theme .twoMenu_imge413 {
    background: url("../../assets/img/synthesis/矩形 14 æ‹·è´ 7.png") no-repeat center;
    background: url("../../assets/img/synthesis/images/视域分析.png") no-repeat center;
}

.Black_theme .twoMenu_imge414 {
    background: url("../../assets/img/synthesis/矩形 14 æ‹·è´ 7.png") no-repeat center;
    background: url("../../assets/img/synthesis/images/3d视域分析.png") no-repeat center;
}



 src/assets/css/configure.css

@@ -228,15 +228,15 @@

/* // é€šè§†åˆ†æžã€è§†åŸŸåˆ†æž é¢„ç•™ */
.twoMenu_imge412 {
    background: url("../../assets/img/synthesis/矩形 14 æ‹·è´ 7.png") no-repeat center;
    background: url("../../assets/img/synthesis/images/3白底_159.png") no-repeat center;
}

.twoMenu_imge413 {
    background: url("../../assets/img/synthesis/矩形 14 æ‹·è´ 7.png") no-repeat center;
    background: url("../../assets/img/synthesis/images/3白底_164.png") no-repeat center;
}

.twoMenu_imge414 {
    background: url("../../assets/img/synthesis/矩形 14 æ‹·è´ 7.png") no-repeat center;
    background: url("../../assets/img/synthesis/images/3白底_162.png") no-repeat center;
}



 src/assets/img/synthesis/images/1.png

 src/assets/img/synthesis/images/2.png

 src/assets/img/synthesis/images/3dÊÓÓò·ÖÎö.png

 src/assets/img/synthesis/images/z_03.png

 src/assets/img/synthesis/images/ÎÄ×Ö±ê×¢.png

 src/assets/img/synthesis/images/ÊÓÓò·ÖÎö.png

 src/assets/img/synthesis/images/ͨÊÓ·ÖÎö.png

 src/assets/img/synthesis/images/¸ß³Ì²âÁ¿.png

 src/assets/lang/en.js

@@ -59,6 +59,12 @@
    dataRetrieval: 'data retrieval',
    dataDownload: 'Data download',
    projectManage: 'project management',
    dataStatistics:'data Statistics',
    dataStaticObj:{
      type1:'Primary module',
      type2:'Secondary module',
      type3:'Statistical data',
    },
    projectObj: {
      projname: 'Project Name',
      projtype: 'Project Type',

 src/assets/lang/zh.js

@@ -58,6 +58,12 @@
    dataRetrieval: '数据检索',
    dataDownload: '数据下载',
    projectManage: '项目管理',
    dataStatistics:'数据统计',
    dataStaticObj:{
      type1:'一级模块',
      type2:'二级模块',
      type3:'统计数据',
    },
    projectObj: {
      projname: '项目名称',
      projtype: '项目类型',

 src/components/Screen/bottom.vue

@@ -20,19 +20,22 @@
            <span slot="reference">{{ item.menuName }}</span>
            <div class="popover-content">
              <div class="popover-content__header">项目信息</div>
              <div class="popover-content__list">

              <div class="popover-content__search">
                <el-input
                  v-if="item.children.length > 4"
                  size="mini"
                  placeholder="请输入内容"
                  v-model="searchName"
                  @change="handleSearchChange(item)"
                >
                  <el-button slot="append" icon="el-icon-search"></el-button>
                </el-input>
              </div>
              <div class="popover-content__list">
                <div
                  class="popover-content__list__item"
                  v-for="child in item.children"
                  :key="child.id"
                  v-for="(child, i) in currMenuList"
                  :key="child.id + i"
                  :class="currProject == child.name ? 'active' : ''"
                  @click="handlePopoverClick(child)"
                  :title="child.name"
@@ -55,6 +58,13 @@
</template>
<script>
import PipeLine from "@/assets/json/pipeline.json"
import {
  countProjectTour,
  countProjectDisplay,
  countProjectLocation,
} from "@/api/screen.js"
import { wktToGeoJSON } from "@terraformer/wkt"

export default {
  data() {
    return {
@@ -146,6 +156,22 @@
      ],
    }
  },
  computed: {
    currMenuList() {
      const menu = this.menuList.find(item => item.menuName == this.currMenu)
      const filterChildren = []
      const value = this.searchName
      menu.children.forEach(item => {
        if (item.name && item.name.includes(value)) {
          filterChildren.push(item)
        }
      })
      return filterChildren
    },
  },
  created() {
    this.getCountProjectDisplay()
  },
  methods: {
    ChangeBaseLayer() {
      if (this.YXState) {
@@ -170,14 +196,25 @@
      const currMenu = this.currMenu
      switch (currMenu) {
        case "工程巡视":
          this.showPathLine()
          this.showPathLine(child)
          break

        case "工程展示":
          this.DisplayCurrentProject(child)
          break
        default:
          break
      }
    },
    showPathLine(res) {
    async showPathLine(params) {
      const line = wktToGeoJSON(params.wkt)
      const position = line.coordinates[0]
      const result = []
      position.forEach(pos => {
        pos.push(50)
        result.push(...pos)
      })
      //
      console.log("line", position)
      // è¥¿æ°”东输二线西段干线
      // console.log("PipeLine", PipeLine)
      const features = PipeLine.features
@@ -185,16 +222,16 @@
      //   const name = item.properties.pipename
      //   const rawArr = item.geometry.coordinates
      // })
      const pipeline = features.find(
        item => item.properties.pipename == "西气东输一线"
      )
      const name = pipeline.properties.pipename
      const rawArr = pipeline.geometry.coordinates[0]
      const result = []
      rawArr.forEach(pos => {
        pos.push(50)
        result.push(...pos)
      })
      // const pipeline = features.find(
      //   item => item.properties.pipename == "西气东输一线"
      // )
      // const name = pipeline.properties.pipename
      // const rawArr = pipeline.geometry.coordinates[0]
      // const result = []
      // rawArr.forEach(pos => {
      //   pos.push(50)
      //   result.push(...pos)
      // })
      // console.log("result", result);
      // sgworld.Command.execute(2, 3, "", data => {
      //   data.showPoint = false
@@ -217,6 +254,7 @@
      //     },
      //   })
      // })

      window.sgworld.Creator.getFlyData(result, data => {
        data.showPoint = false
        data.showLine = true
@@ -243,23 +281,64 @@
    },

    //项目展示
    DisplayCurrentProject(parm) {
      console.log(parm)
    DisplayCurrentProject(params) {
      console.log(params)

      //打开或者加载图层

      //飞到指定位置
      const point = wktToGeoJSON(params.wkt)
      const position = point.coordinates

      Viewer.camera.flyTo({
        destination: Cesium.Cartesian3.fromDegrees(...position, 7000),
      })
    },

    //工程漫游飞行
    FlyCurrentProject(parm) {
      console.log(parm)
    FlyCurrentProject(prams) {
      console.log(prams)
      //打开或者加载图层

      //开始飞行
    },
    filterNode(value, data) {
      if (!value) return true
      return children.name.indexOf(value) !== -1
    filterChildList(menuName) {
      const menuList = this.menuList
      const searchName = this.searchName

      // console.log(menuList.find(item => item.menuName == menuName));
      const menu = menuList.find(item => item.menuName == menuName)
      return menu.children
      // return menu.children.filter(item => item.name.indexOf(searchName) > -1)
    },
    handleSearchChange(currMenu) {},
    async getCountProjectDisplay() {
      const res = await countProjectLocation()
      if (res.code === 200) {
        const menu = this.menuList.find(item => item.menuName == "工程展示")
        menu.children = res.result.map(item => {
          return {
            name: item.projname,
            id: item.projname,
            wkt: item.st_astext,
          }
        })
        console.log(menu.children.length)
      }
    },
    async getCountProjectTour() {
      const res = await countProjectTour()
      if (res.code === 200) {
        const menu = this.menuList.find(item => item.menuName == "工程巡视")
        menu.children = res.result.map(item => {
          return {
            name: item.projname,
            id: item.projname,
            wkt: item.wkt,
          }
        })
        console.log(menu.children.length)
      }
    },
  },
}
@@ -371,39 +450,46 @@
        height: 8px;
      }
    }
    .el-input {
      width: 119px;
      height: 21.5px;
      background: rgba(0, 48, 111, 0.2);
      border: 0.25px solid #2a80a9;
      &__inner {
    &__search {
      margin-top: 8px;
      width: 145px;
      text-align: center;
      .el-input {
        width: 125px;
        height: 21px;
        background: rgba(0, 48, 111, 0.2);
        border-radius: inherit;
        border: 0.25px solid #2a80a9;
      }
      .el-input-group__append {
        width: 32px;
        border: none;
        border-radius: inherit;
        height: 20px;
        padding: 0;
        text-align: center;
        background: #3a93c7;
        color: #fff;
        &__inner {
          background: rgba(0, 48, 111, 0.2);
          border-radius: inherit;
          border: 0.25px solid #2a80a9;
          padding: 0 5px;
          color: #fff;
        }
        .el-input-group__append {
          width: 32px;
          border: none;
          border-radius: inherit;
          height: 20px;
          padding: 0;
          text-align: center;
          background: #3a93c7;
          color: #fff;
        }
      }
    }

    &__list {
      margin-top: 10px;
      display: flex;
      flex-direction: column;
      // justify-content: space-evenly;
      align-items: center;
      width: 145px;
      height: 180px;
      height: 155px;
      overflow-x: hidden;

      &__item {
        margin-top: 10px;
        margin-top: 8px;
        color: #fff;
        width: 130px;
        height: 30px;

 src/views/AuthorizationManagement/roleMenuAuthorization.vue

@@ -148,7 +148,7 @@
        <el-divider class="divider" />
        <el-table
          :data="menuTableData"
          stripe
        
          style="width: 100%"
          height="calc(100% - 124px)"
          @selection-change="handleSelectionChange"

 src/views/AuthorizationManagement/roleResAuthorization.vue

@@ -125,7 +125,7 @@

        <el-table
          :data="usertableData"
          stripe
  
          style="width: 100%"
           height="calc(100% - 124px)"
          @selection-change="handleSelectionChange"

 src/views/Synthesis/LeftMenu.vue

@@ -804,7 +804,6 @@
            this.entityaLayers.push(line)
            break;
          case 'label':
            debugger
            const label = Viewer.entities.add({
              position: Cesium.Cartesian3.fromDegrees(wkt.coordinates[0], wkt.coordinates[1]),
              label: {

 src/views/Thematic/index.vue

@@ -36,8 +36,7 @@
        } else {
          this.leftWidth = "20%"
        }
      }
      debugger;
      };
      if (parm == "leftView" || parm == "leftTree") { this.leftWidth = "20%" }



 src/views/Tools/LayerTree.vue

@@ -490,14 +490,21 @@
        if (res.url != null && res.url != undefined) {
          url = res.url
        }
        var width = $("#mapdiv").width() +5 ;
        var height = $("#mapdiv").height()+5  ;
     
        var imageryLayers = window.Viewer.scene.imageryLayers;
        let layerWMS = new Cesium.WebMapServiceImageryProvider({
          url: url,
          layers: res.resource,
          parameters: {
            transparent: true,
            format: 'image/png',
        transparent: true,
                format: "image/png",
                srs: "EPSG:4490",
                styles: "",
          },
          tileWidth: width,
            tileHeight: height
        });
        layerWMS.name = res.label;
        //透明度

 src/views/datamanage/dataStatistics.vue

@@ -1,11 +1,13 @@
<template>
  <div class="dataStatistics">
    <My-bread :list="[
    <My-bread
      :list="[
        `${$t('dataManage.dataManage')}`,
        `${$t('dataManage.projectManage')}`,
      ]"></My-bread>
        `${$t('dataManage.dataStatistics')}`,
      ]"
    ></My-bread>
    <el-divider />
    <div class="contentBox ">
    <div class="contentBox">
      <div class="content_Left subpage_Div">
        <el-tree
          :data="treeData"
@@ -27,12 +29,13 @@
            icon="el-icon-pie-chart"
            @click="setCountFlagChange(2)"
          ></el-button>
          <el-button
            icon="el-icon-download"
            @click="setCountFlagChange(3)"
          ></el-button>
          <el-divider />
        </div>
        <div
          class="contentTable"
           v-show="setCountFlag"
        >
        <div class="contentTable" v-show="setCountFlag">
          <el-table
            :data="tableData"
            style="width: 100%"
@@ -40,17 +43,20 @@
          >
            <el-table-column
              prop="m1"
              label="一级模块"
              align="center"
              :label="$t('dataManage.dataStaticObj.type1')"
            >
            </el-table-column>
            <el-table-column
              prop="m2"
              label="二级模块"
              align="center"
              :label="$t('dataManage.dataStaticObj.type2')"
            >
            </el-table-column>
            <el-table-column
              prop="count"
              label="统计数量"
              align="center"
              :label="$t('dataManage.dataStaticObj.type3')"
            >
            </el-table-column>
          </el-table>
@@ -67,157 +73,156 @@
            </el-pagination>
          </div> -->
        </div>
        <div
      
          class="contentTable"
          v-show="!setCountFlag"
        >
      <div id="countEchart" style = "width:100%;height:100%; ">

      </div>
        
        
        
        <div id="contentEchart" class="contentTable" v-show="!setCountFlag">
          <div id="chart_11"></div>
        </div>

      </div>

    </div>
    <el-dialog
      title="模板"
      :visible.sync="showDownLoadFlag"
      width="50%"
      :before-close="handleClose"
    >
      <div style="height: 50vh">
        <el-table
          ref="singleTable"
          :data="modelData"
          height="calc(100% - 10px)"
          style="width: 100%"
        >
          <el-table-column
            type="index"
            :label="$t('common.index')"
            align="center"
            width="70"
          >
          </el-table-column>
          <el-table-column
            align="center"
            property="fname"
            :label="$t('common.fileNme')"
          >
          </el-table-column>
          <el-table-column
            property="type"
            :label="$t('common.format')"
            align="center"
            :formatter="showFormat"
          >
          </el-table-column>
          <el-table-column width="120" :label="$t('common.operate')">
            <template slot-scope="scope">
              <el-button @click="setDownLoadRow(scope.row)" size="small">
                {{ $t("common.download") }}
              </el-button>
            </template>
          </el-table-column>
        </el-table>
      </div>
    </el-dialog>
    <iframe
      id="Iframe1"
      src=""
      style="display: none; border: 0; padding: 0; height: 0; width: 0"
    ></iframe>
  </div>
</template>

<script>
import * as echarts from 'echarts';
import $ from "jquery";
import * as echarts from "echarts";
import MyBread from "../../components/MyBread.vue";
import { dataCount_selectByPageAndCount, dataCount_selectCountOperates } from '../../api/api.js'
import { getToken } from "@/utils/auth";
import {
  dataCount_selectByPageAndCount,
  dataCount_selectCountOperates,
  dataCount_selectCountServices,
  dataCount_selectCountSizes,
  dataCount_downloadReport,
} from "../../api/api.js";
export default {
  name: "DataStatistics",
  components: { MyBread },
  data() {
    return {
      treeData: [{
        id: 1,
        label: '服务调用量统计',
        value: 'countServices',
        children: []
      }, {
        id: 2,
        label: '数据量统计',
        value: 'countSizes',
        children: []
      }, {
        id: 3,
        label: '用户流量统计',
        value: 'countOperates',
        children: []
      }],
      treeData: [
        {
          id: 1,
          label: "服务调用量统计",
          value: "countServices",
          children: [],
        },
        {
          id: 2,
          label: "数据量统计",
          value: "countSizes",
          children: [],
        },
        {
          id: 3,
          label: "用户流量统计",
          value: "countOperates",
          children: [],
        },
      ],

      defaultProps: {
        children: 'children',
        label: 'label'
        children: "children",
        label: "label",
      },
      listData: {
        pageIndex: 1,
        pageSize: 10,
        code: '',
        name: '',
        code: "",
        name: "",
        count: 0,
      },
      tableData: [],
      modelData: [],
      queryData: null,
      setCountFlag: true,

    }
      option: null,
      showDownLoadFlag: false,
    };
  },
  mounted() {
    this.setStartDataCount();
  },
  methods: {
    //Echart图表显示
    showCountEchart(){
  
      var chartDom = document.getElementById('countEchart');
var myChart = echarts.init(chartDom);
var option;
      var dataAxis=[];
      var data=[];
      var yMax =0;
      let dataShadow = [];
      for(var i  in this.tableData){
        if( this.tableData[i].count >yMax){
          yMax=  this.tableData[i].count
        }
        data.push(this.tableData[i].count)
      }
      yMax = yMax+100;
for (let i = 0; i < data.length; i++) {
  dataShadow.push(yMax);
}
option = {
 
  xAxis: {
    data: dataAxis,
    axisLabel: {
      color: '#000000'
    },
 
    axisLine: {
      show: true
    },
    z: 10
  },
  yAxis: {
    axisLine: {
      show: false
    },
    axisTick: {
      show: false
    },
    axisLabel: {
      color: '#999'
    }
  },
  dataZoom: [
    {
      type: 'inside'
    }
  ],
  series: [
    {
      type: 'bar',
      showBackground: true,
      itemStyle: {
        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
          { offset: 0, color: '#83bff6' },
          { offset: 0.5, color: '#188df0' },
          { offset: 1, color: '#188df0' }
        ])
      },
      emphasis: {
        itemStyle: {
          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
            { offset: 0, color: '#2378f7' },
            { offset: 0.7, color: '#2378f7' },
            { offset: 1, color: '#83bff6' }
          ])
        }
      },
      data: data
    }
  ]
};
// Enable data zoom when user click bar.
const zoomSize = 6;
myChart.on('click', function (params) {
  
  myChart.dispatchAction({
    type: 'dataZoom',
    startValue: dataAxis[Math.max(params.dataIndex - zoomSize / 2, 0)],
    endValue:
      dataAxis[Math.min(params.dataIndex + zoomSize / 2, data.length - 1)]
  });
});
    setDownLoadRow(rows) {
      var url =
        BASE_URL +
        "/dataCount/downloadReport?token=" +
        getToken() +
        "&id=" +
        rows.id;

      $("#Iframe1").attr("src", url).click();
    },
    showFormat(row, column, cellValue, index) {
      if (cellValue) {
        switch (cellValue) {
          case "1":
            return "World";
            break;
          case "2":
            return "Excel";
            break;
        }
      }
      return " ";
    },
    handleClose() {
      this.$confirm("确认关闭？")
        .then((_) => {
          this.closeDownLoadFlag();
          done();
        })
        .catch((_) => {});
    },
    closeDownLoadFlag() {
      this.showDownLoadFlag = false;
    },
    //统计切换
    setCountFlagChange(res) {
@@ -228,14 +233,167 @@
        case 2:
          this.setCountFlag = false;
          this.showCountEchart();
            break;
          break;
        case 3:
          this.showDownLoadFlag = true;
          this.getQueryDownloadData();
          break;
      }
    },
    async getQueryDownloadData() {
      this.listData = {
        pageIndex: 1,
        pageSize: 10,
        code: this.queryData.value,
        name: "",
        count: 0,
      };
      const data = await dataCount_selectByPageAndCount(this.listData);
      if (data.code != 200) {
        return;
      }

      this.modelData = data.result;
      this.listData.count = data.count;
    },
    //Echart图表显示
    showCountEchart() {
      var dom = document.getElementById("chart_11");
      if (this.option != null) {
        dom.removeAttribute("_echarts_instance_"); // ç§»é™¤å®¹å™¨ä¸Šçš„ _echarts_instance
      }
      var resizeMainContainer = function () {
        dom.style.width = window.innerWidth * 0.65 + "px";
        dom.style.height = window.innerHeight * 0.6 + "px";
      };
      //设置div容器高宽
      resizeMainContainer();
      var myChart = echarts.init(dom, null, {
        renderer: "canvas",
        useDirtyRect: false,
      });

      var app = {};
      let dataAxis = [];

      let data = [];
      let yMax = 0;
      for (var i in this.tableData) {
        if (this.tableData[i].count > yMax) {
          yMax = this.tableData[i].count;
        }

        data.push(this.tableData[i].count);
        var m1 = this.tableData[i].m1;
        if (this.tableData[i].m2 != null) {
          m1 += "_" + this.tableData[i].m2;
        }
        dataAxis.push(m1);
      }

      yMax = yMax + 10;
      let dataShadow = [];
      for (let i = 0; i < data.length; i++) {
        dataShadow.push(yMax);
      }
      this.option = {
        grid: {
          left: "5%",
          right: "5%",
          bottom: "5%",
          top: "10px",
        },
        tooltip: {
          //提示框组件
          trigger: "axis", //坐标轴触发，主要在柱状图，折线图等会使用类目轴的图表中使用
          axisPointer: { animation: false },
          axisPointer: {
            // åæ ‡è½´æŒ‡ç¤ºå™¨ï¼Œåæ ‡è½´è§¦å‘有效
            type: "line", // é»˜è®¤ä¸ºç›´çº¿ï¼Œå¯é€‰ä¸ºï¼š'line' | 'shadow'
          },

          formatter: " {b} : <br/>统计量 :  {c}",
        },
        xAxis: {
          data: dataAxis,
          axisLabel: {
            inside: false,
            color: "#999",
          },
          axisTick: {
            show: false,
          },
          axisLine: {
            show: false,
          },
          z: 10,
        },
        yAxis: {
          axisLine: {
            show: false,
          },
          axisTick: {
            show: false,
          },
          axisLabel: {
            color: "#999",
          },
        },
        dataZoom: [
          {
            type: "inside",
          },
        ],
        series: [
          {
            type: "bar",
            showBackground: true,
            itemStyle: {
              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                { offset: 0, color: "#83bff6" },
                { offset: 0.5, color: "#188df0" },
                { offset: 1, color: "#188df0" },
              ]),
            },
            emphasis: {
              itemStyle: {
                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                  { offset: 0, color: "#2378f7" },
                  { offset: 0.7, color: "#2378f7" },
                  { offset: 1, color: "#83bff6" },
                ]),
              },
            },
            data: data,
          },
        ],
      };
      // Enable data zoom when user click bar.
      const zoomSize = 6;
      myChart.on("click", function (params) {
        console.log(dataAxis[Math.max(params.dataIndex - zoomSize / 2, 0)]);
        myChart.dispatchAction({
          type: "dataZoom",
          startValue: dataAxis[Math.max(params.dataIndex - zoomSize / 2, 0)],
          endValue:
            dataAxis[
              Math.min(params.dataIndex + zoomSize / 2, data.length - 1)
            ],
        });
      });

      if (this.option && typeof this.option === "object") {
        myChart.setOption(this.option);
      }

      window.addEventListener("resize", myChart.resize);
    },

    //系统初始化
    setStartDataCount() {
      this.queryData = this.treeData[0];
      this.$nextTick(() => {
        this.$refs.tree.setCurrentKey(this.queryData.id) // é»˜è®¤é€‰ä¸­èŠ‚点第一个
        this.$refs.tree.setCurrentKey(this.queryData.id); // é»˜è®¤é€‰ä¸­èŠ‚点第一个
      });
      this.listData.code = this.queryData.value;
      this.setQueryCountData();
@@ -251,17 +409,28 @@
    },
    //查询统计信息
    async setQueryCountData() {
      const data = await dataCount_selectCountOperates();
      var data;
      if (this.queryData.value == "countServices") {
        data = await dataCount_selectCountServices();
      } else if (this.queryData.value == "countSizes") {
        data = await dataCount_selectCountSizes();
      } else if (this.queryData.value == "countOperates") {
        data = await dataCount_selectCountOperates();
      }
      if (data.code != 200) {
        return
        return;
      }

      if (this.queryData.value == "countSizes") {
        for (var i in data.result) {
          data.result[i].count = data.result[i].sizes;
        }
      }
      this.tableData = data.result;
      this.listData.count = data.count

      // this.listData.count = data.count;
    },

  }
}
  },
};
</script>

<style lang="less" scoped>
@@ -287,9 +456,9 @@
      padding: 1%;
      .contentTable {
        width: 100%;
        height: 88%;
        height: 84%;
      }
    }
  }
}
</style>
</style>

 src/views/datamanage/dataUpdata.vue

@@ -462,10 +462,19 @@
                ></el-table-column>
                <el-table-column
                  align="center"
                  prop="name"
    
                  :label="$t('common.name')"
                  width="100"
                />
          
                  width="120"
                 >
                      <template slot-scope="scope">
                                  <span v-if="scope.row.ismeta > 0 ">
                     <el-link  title="元数据查询" @click="setQueryMetaData(scope.row)"   target="_blank">{{ scope.row.name }}</el-link>
           
            </span>
            <span v-else>{{ scope.row.name }}</span>
                    </template>
                 </el-table-column>
                <el-table-column
                  align="center"
                  prop="dirName"
@@ -1056,6 +1065,117 @@
        >继续</el-button>
      </span>
    </el-dialog>
   <el-dialog
      :title="fromQueryMeta.title"
      :visible.sync="queryMetaFlag"
      width="70%" 
      
    >
    <div style="height:65vh;width:100%; ">
    <el-form :inline="true" :model="fromQueryMeta" class="demo-form-inline">
  <el-form-item  >
    <el-input size="small" v-model="fromQueryMeta.name" ></el-input>
  </el-form-item>
  
  <el-form-item>
    <el-button type="primary" size="small"  @click="setSearchMetaData()">查询</el-button>
      <el-button type="info" size="small"  @click="setRestMetaData()" >重置</el-button>
  </el-form-item>
</el-form>
    <el-table
                ref="filterTable"
                :data="metaDataTable"
                style="width: 100%"
                height="calc(100% - 100px)"
                
              >
             
                <el-table-column
                  align="center"
                  type="index"
                  :label="$t('common.index')"
                  width="70px"
                ></el-table-column>
                <el-table-column
                  align="center"
       prop="name"
                  :label="$t('common.name')"
          
                  width="120"
                 >
                   
                   
                 </el-table-column>
                <el-table-column
                  align="center"
                  prop="dirName"
                  :label="$t('dataManage.dataUpObj.catalogue')"
                  width="300"
                />
                <el-table-column
                  align="center"
                  prop="depName"
                  :label="$t('dataManage.dataUpObj.company')"
                  width="200"
                />
                <el-table-column
                  align="center"
                  prop="verName"
                  :label="$t('dataManage.dataUpObj.versionNo')"
                />
                <el-table-column
                  align="center"
                  prop="type"
                  :label="$t('common.type')"
                />
                <el-table-column
                  align="center"
                  prop="sizes"
                  :label="$t('common.size')"
                  :formatter="changeSizeFile"
                />
                <el-table-column
                  align="center"
                  :label="$t('dataManage.dataUpObj.tableName')"
                >
                  <template slot-scope="scope">
                    <a
                      class="scopeRowColor"
                      @click="detail(scope.row)"
                    >{{ scope.row.tab }}</a>
                  </template>
                </el-table-column>
                <el-table-column
                  align="center"
                  prop="rows"
                  :label="$t('common.lineNuber')"
                />
                <el-table-column
                  align="center"
                  prop="desc"
                  :label="$t('dataManage.dataUpObj.describe')"
                />
               
               
              </el-table>
 <div
         
          class="pagination_box"
        >
          <el-pagination
            @size-change="handleMetaSizeChange"
            @current-change="handMetaCurrentChange"
            :current-page="listMetaData.pageIndex"
            :page-sizes="[10, 20, 50, 100]"
            :page-size="listMetaData.pageSize"
            layout="total, sizes, prev, pager, next, jumper"
            :total="listMetaData.count"
          >
          </el-pagination>
        </div>
    </div>
     
    </el-dialog>
    <input
      name="file1"
      :accept="'.zip'"
@@ -1089,6 +1209,7 @@
  dataUpload_insertFiles,
  dataUpload_selectFields,
  dataUpload_selectDbData,
 dataUpload_selectPageAndCountByPid
} from "../../api/api";
export default {
  name: "dataUpdata",
@@ -1277,6 +1398,20 @@
      styleVar1: {
        height: "calc(100% - 109px)",
      },
      metaFileData:[],
      listMetaData:{
        metaid:0,
        name:'',
        pageIndex:1,
        pageSize:10,
        count:0,
      },
      queryMetaFlag:false,
      fromQueryMeta:{
        title:'',
        name:''
      },
      metaDataTable:[],
    };
  },

@@ -1300,6 +1435,54 @@
  },
  watch: {},
  methods: {
 setRestMetaData(){
 this.fromQueryMeta.name="";
       this.listMetaData.name =this.fromQueryMeta.name; 
          this.listMetaData.pageIndex = 1
             this.listMetaData.pageSize = 10
         
      this.startQueryMetaData();
    },
    setSearchMetaData(){
       this.listMetaData.name =this.fromQueryMeta.name; 
          this.listMetaData.pageIndex = 1
             this.listMetaData.pageSize = 10
         
      this.startQueryMetaData();
    },
    //元数据页面切换
    handleMetaSizeChange(val){
      this.listMetaData.pageIndex = 1;
     this.listMetaData.pageSize = val;
     this.startQueryMetaData();
    },
     //元数据页面切换
    handMetaCurrentChange(val){
      this.listMetaData.pageIndex = val;
      this.startQueryMetaData();
    },
  //元数据查询
 setQueryMetaData(row){
  this.fromQueryMeta.title = row.name
  this.listMetaData = {
        metaid:row.id,
        name:'',
        pageIndex:1,
        pageSize:10,
         count:0,
      }
this.startQueryMetaData();
this.queryMetaFlag=true;
},
async startQueryMetaData(){
const data = await dataUpload_selectPageAndCountByPid(this.listMetaData);
 if(data.code != 200){
  return;
 }
 this.metaDataTable= data.result;
 this.listMetaData.count = data.count;
},

    onResize() {
      this.timer && clearTimeout(this.timer);
      this.timer = setTimeout(() => {
@@ -1310,8 +1493,7 @@
      this.$nextTick(() => {
        const rect = this.$refs.container.getBoundingClientRect();
        const rect1 = this.$refs.container1.getBoundingClientRect();
         console.log(rect)
        console.log(rect1)
 
        this.tableHeight = `${rect.height + 40}px`;
        this.styleVar["height"] = `calc(100% - ${rect.height + 40}px)`;
        this.styleVar1["height"] = `calc(100% - ${rect1.height + 40}px)`;
@@ -1543,7 +1725,14 @@
          }
        }
      }

      for(var i in this.metaFileData){
        this.insertWareList.filter((res)=>{
          if(res.name == this.metaFileData[i]){
              res.isMeta = true;
          }
        })
      }
 
      this.loading = true;
      const res = await dataUpload_insertFiles(
        JSON.stringify(this.insertWareList)
@@ -1695,6 +1884,7 @@
          }
        }
      }
 
      var obj = {
        dirid: this.formInline.dirid,
        epsgCode: this.formInline.coordinateId,
@@ -2397,6 +2587,7 @@
        std.push(f.name);
      }
      this.formInline.metaData = std.toString();
      this.metaFileData= std;
    },

    //From表单初始化
@@ -2567,6 +2758,9 @@
      overflow: auto;
    }
  }
  /deeep/.el-loading-mask{
    z-index:9999
  }
}
.inquire {
  padding: 8px;

 src/views/datamanage/metadataManage.vue

@@ -200,7 +200,15 @@
            width="50"
          >
          </el-table-column>
          <el-table-column prop="name" :label="$t('dataManage.vmobj.name')" />
          <el-table-column  :label="$t('dataManage.vmobj.name')"  >      
            <template slot-scope="scope">
              <span v-if="scope.row.ismeta > 0 ">
                  <el-link  title="元数据查询" @click="setQueryMetaData(scope.row)"   target="_blank">{{ scope.row.name }}</el-link>
              </span>
              <span v-else>{{ scope.row.name }}</span>
            </template>
          </el-table-column>

          <el-table-column prop="type" :label="$t('dataManage.vmobj.format')" />
          <el-table-column
            prop="sizes"
@@ -538,7 +546,117 @@
        </el-form-item>
      </el-form>
    </div>
   <el-dialog
      :title="fromQueryMeta.title"
      :visible.sync="queryMetaFlag"
      width="70%" 
      
    >
    <div style="height:65vh;width:100%; ">
    <el-form :inline="true" :model="fromQueryMeta" class="demo-form-inline">
  <el-form-item  >
    <el-input size="small" v-model="fromQueryMeta.name" ></el-input>
  </el-form-item>
  
  <el-form-item>
    <el-button type="primary" size="small"  @click="setSearchMetaData()">查询</el-button>
      <el-button type="info" size="small"  @click="setRestMetaData()" >重置</el-button>
  </el-form-item>
</el-form>
    <el-table
                ref="filterTable"
                :data="metaDataTable"
                style="width: 100%"
                height="calc(100% - 100px)"
                
              >
             
                <el-table-column
                  align="center"
                  type="index"
                  :label="$t('common.index')"
                  width="70px"
                ></el-table-column>
                <el-table-column
                  align="center"
       prop="name"
                  :label="$t('common.name')"
          
                  width="120"
                 >
                   
                   
                 </el-table-column>
                <el-table-column
                  align="center"
                  prop="dirName"
                  :label="$t('dataManage.dataUpObj.catalogue')"
                  width="300"
                />
                <el-table-column
                  align="center"
                  prop="depName"
                  :label="$t('dataManage.dataUpObj.company')"
                  width="200"
                />
                <el-table-column
                  align="center"
                  prop="verName"
                  :label="$t('dataManage.dataUpObj.versionNo')"
                />
                <el-table-column
                  align="center"
                  prop="type"
                  :label="$t('common.type')"
                />
                <el-table-column
                  align="center"
                  prop="sizes"
                  :label="$t('common.size')"
                  :formatter="changeSizeFile"
                />
                <el-table-column
                  align="center"
                  :label="$t('dataManage.dataUpObj.tableName')"
                >
                  <template slot-scope="scope">
                    <a
                      class="scopeRowColor"
                      @click="detail(scope.row)"
                    >{{ scope.row.tab }}</a>
                  </template>
                </el-table-column>
                <el-table-column
                  align="center"
                  prop="rows"
                  :label="$t('common.lineNuber')"
                />
                <el-table-column
                  align="center"
                  prop="desc"
                  :label="$t('dataManage.dataUpObj.describe')"
                />
               
               
              </el-table>
 <div
         
          class="pagination_box"
        >
          <el-pagination
            @size-change="handleMetaSizeChange"
            @current-change="handMetaCurrentChange"
            :current-page="listMetaData.pageIndex"
            :page-sizes="[10, 20, 50, 100]"
            :page-size="listMetaData.pageSize"
            layout="total, sizes, prev, pager, next, jumper"
            :total="listMetaData.count"
          >
          </el-pagination>
        </div>
    </div>
     
    </el-dialog>
    <iframe
      id="downFrame"
      src=""
@@ -565,6 +683,7 @@
  meta_selectFields,
  meta_selectByPageForUpload,
  meta_selectVerByDirid,
  meta_selectPageAndCountByPid
} from "../../api/api";

import MyBread from "../../components/MyBread.vue";
@@ -673,6 +792,19 @@
      styleVar: {
        height: "calc(100% - 109px)",
      },
        listMetaData:{
        metaid:0,
        name:'',
        pageIndex:1,
        pageSize:10,
        count:0,
      },
      queryMetaFlag:false,
      fromQueryMeta:{
        title:'',
        name:''
      },
      metaDataTable:[],
    };
  },
  created() {
@@ -691,6 +823,67 @@
    this.calHeight();
  },
  methods: {
     //大小值改变
    changeSizeFile(row, column, cellValue, index) {
      if (cellValue >= 1024) {
        return parseFloat(cellValue / 1204).toFixed(3) + "GB";
      } else {
        return cellValue + "MB";
      }
    },
setRestMetaData(){
 this.fromQueryMeta.name="";
       this.listMetaData.name =this.fromQueryMeta.name; 
          this.listMetaData.pageIndex = 1
             this.listMetaData.pageSize = 10
         
      this.startQueryMetaData();
    },
    setSearchMetaData(){
       this.listMetaData.name =this.fromQueryMeta.name; 
          this.listMetaData.pageIndex = 1
             this.listMetaData.pageSize = 10
         
      this.startQueryMetaData();
    },
    //元数据页面切换
    handleMetaSizeChange(val){
      this.listMetaData.pageIndex = 1;
     this.listMetaData.pageSize = val;
     this.startQueryMetaData();
    },
     //元数据页面切换
    handMetaCurrentChange(val){
      this.listMetaData.pageIndex = val;
      this.startQueryMetaData();
    },
  //元数据查询
 setQueryMetaData(row){
  this.fromQueryMeta.title = row.name
  this.listMetaData = {
        metaid:row.id,
        name:'',
        pageIndex:1,
        pageSize:10,
         count:0,
      }
this.startQueryMetaData();
this.queryMetaFlag=true;
},
async startQueryMetaData(){
const data = await meta_selectPageAndCountByPid(this.listMetaData);
 if(data.code != 200){
  return;
 }
 this.metaDataTable= data.result;
 this.listMetaData.count = data.count;
},






    onResize() {
      this.timer && clearTimeout(this.timer);
      this.timer = setTimeout(() => {

 src/views/exportMap/index.vue

@@ -410,11 +410,9 @@
      //     }
      //   }
      // }
      debugger
      this.$refs.tree.setCheckedKeys(std)
    },
    showMapLayer(val) {
      debugger
      if (val == undefined) return;
      var layer2 = new Image({
        name: val.label,