管道基础大数据平台系统开发-【前端】-新系統界面
Surpriseplus
2023-06-13 2aba5be94bcbb03bb5ec13d121fe945c2f8dce38
发布管理,数据统计
已添加1个文件
已修改8个文件
已删除1个文件
662 ■■■■ 文件已修改
public/config/config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/工程项目-目录管理模V20230413.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
public/工程项目-目录管理模V20230613.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
src/api/api.js 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/lang/en.js 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/lang/zh.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/preview_map.vue 358 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/datamanage/dataStatistics.vue 257 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/datamanage/uploadmanage.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/config/config.js
@@ -59,7 +59,7 @@
    ns: 'bs',
  },
]
var dirTemplateFile = '工程项目-目录管理模V20230413.xlsx'
var dirTemplateFile = '工程项目-目录管理模V20230613.xlsx'
var gaoDeBaseUrl = [{
  url: 'http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
  label: '高德矢量',
public/¹¤³ÌÏîÄ¿-Ŀ¼¹ÜÀíÄ£V20230413.xlsx
Binary files differ
public/¹¤³ÌÏîÄ¿-Ŀ¼¹ÜÀíÄ£V20230613.xlsx
Binary files differ
src/api/api.js
@@ -906,6 +906,17 @@
export function dataCount_selectCountSizes(params) {
  return request.get('/dataCount/selectCountSizes', { params: params });
}
//数据统计=>按文件类型统计
export function dataCount_countSizesByType(params) {
  return request.get('/dataCount/countSizesByType', { params: params });
}
//数据统计=>按项目统计数据
export function dataCount_countSizesByPrj(params) {
  return request.get('/dataCount/countSizesByPrj', { params: params });
}
//数据统计=>下载报告
export function dataCount_downloadReport(params) {
  return request.get('/dataCount/downloadReport', { params: params });
src/assets/lang/en.js
@@ -101,9 +101,18 @@
    },
    dataStaticObj: {
      type1: 'Primary module',
      type2: 'Secondary module',
      type3: 'Statistical data',
      // type1: 'Primary module',
      // type2: 'Secondary module',
      // type3: 'Statistical data',
      type1: 'service name',
      type2: 'visits',
      type3: 'Unit Name',
      type4: 'Data volume',
      type5: 'menu name',
      type7: 'visits',
      type8: 'Number of statistics',
    },
    projectObj: {
      projname: 'Project Name',
src/assets/lang/zh.js
@@ -104,7 +104,8 @@
      type3: '单位名称',
      type4: '数据量',
      type5: '菜单名称',
      type7: '访问次数'
      type7: '访问次数',
      type8: '统计条数',
    },
    projectObj: {
      projname: '项目名称',
src/components/preview_map.vue
@@ -1,139 +1,215 @@
<template>
  <div id="mapdiv"
       class="previewBox">
    <div v-if="modelLayer"
         class="modelLayer box_divm">
  <div
    id="mapdiv"
    class="previewBox"
  >
    <div
      v-if="modelLayer"
      class="modelLayer box_divm"
    >
      <div class="modelBox">
        <div style="float:right"
        <div
          style="float:right"
             :title="$t('synthesis.undergroundMode')"
             @click="setUndergroundMode">
          @click="setUndergroundMode"
        >
          <i class="el-icon-sunrise "></i>
        </div>
      </div>
      <div class="modelBox">
        <el-tree :data="treeData"
        <el-tree
          :data="treeData"
                 show-checkbox
                 node-key="id"
                 ref="tree"
                 :default-expanded-keys="[1]"
                 :props="defaultProps"
                 @node-click="handleNodeClick"
                 @check="handleCheckChange">
          @check="handleCheckChange"
        >
        </el-tree>
      </div>
    </div>
    <div v-if="editModelFlag"
         class="modelLayer box_divm">
      <el-form ref="form"
    <div
      v-if="editModelFlag"
      class="modelLayer box_divm"
    >
      <el-form
        ref="form"
               :model="modelForm"
               label-width="80px">
        label-width="80px"
      >
        <el-form-item>
          <el-button size="small"
                     @click="locateTo">定位</el-button>
          <el-button size="small"
                     @click="showTileset">显隐</el-button>
          <el-button size="small"
                     @click="underground">地下</el-button>
          <el-button v-if="$store.state.previewLayer.type  != '3dml'"
          <el-button
                     size="small"
                     @click="pickupCoords">拾取</el-button>
          <el-button v-if="$store.state.previewLayer.type  != '3dml'"
            @click="locateTo"
          >定位</el-button>
          <el-button
                     size="small"
                     @click="reload">
            @click="showTileset"
          >显隐</el-button>
          <el-button
            size="small"
            @click="underground"
          >地下</el-button>
          <el-button
            v-if="$store.state.previewLayer.type  != '3dml' &&
            $store.state.previewLayer.type  !='cpt'"
            size="
            small"
            @click="pickupCoords"
          >拾取</el-button>
          <el-button
            v-if="$store.state.previewLayer.type  != '3dml'  &&
            $store.state.previewLayer.type  !='cpt'"
            size="
            small"
            @click="reload"
          >
            é‡è½½
          </el-button>
          <el-button v-if="modelForm.modelid == null && $store.state.previewLayer.type  != '3dml'"
          <el-button
            v-if="modelForm.modelid == null && $store.state.previewLayer.type  != '3dml'&&
            $store.state.previewLayer.type  !='cpt'"
                     size="small"
                     @click="getModeKeyId">模型主键</el-button>
          <el-button v-if="$store.state.previewLayer.type  != '3dml'"
            @click="getModeKeyId"
          >模型主键</el-button>
          <el-button
            v-if="$store.state.previewLayer.type  != '3dml'&&
            $store.state.previewLayer.type  !='cpt'"
                     size="small"
                     @click="resave">保存</el-button>
            @click="resave"
          >保存</el-button>
        </el-form-item>
        <el-form-item label="经度:"
                      v-if="$store.state.previewLayer.type  != '3dml'">
          <el-input size="small"
        <el-form-item
          label="经度:"
          v-if="$store.state.previewLayer.type  != '3dml'&&
            $store.state.previewLayer.type  !='cpt'"
        >
          <el-input
            size="small"
                    v-model="modelForm.lon"
                    @input="update"></el-input>
          <el-slider v-model="modelForm.lon"
            @input="update"
          ></el-input>
          <el-slider
            v-model="modelForm.lon"
                     @input="update"
                     :min="73"
                     :step="0.001"
                     :max="135"></el-slider>
            :max="135"
          ></el-slider>
        </el-form-item>
        <el-form-item label="纬度:"
                      v-if="$store.state.previewLayer.type  != '3dml'">
          <el-input size="small"
        <el-form-item
          label="纬度:"
          v-if="$store.state.previewLayer.type  != '3dml'&&
            $store.state.previewLayer.type  !='cpt'"
        >
          <el-input
            size="small"
                    v-model="modelForm.lat"
                    @input="update"></el-input>
          <el-slider v-model="modelForm.lat"
            @input="update"
          ></el-input>
          <el-slider
            v-model="modelForm.lat"
                     @input="update"
                     :min="3"
                     :step="0.001"
                     :max="54"></el-slider>
            :max="54"
          ></el-slider>
        </el-form-item>
        <el-form-item label="高度:"
                      v-if="$store.state.previewLayer.type  != '3dml'">
          <el-input size="small"
        <el-form-item
          label="高度:"
          v-if="$store.state.previewLayer.type  != '3dml'&&
            $store.state.previewLayer.type  !='cpt'"
        >
          <el-input
            size="small"
                    v-model="modelForm.height"
                    @input="update"></el-input>
          <el-slider v-model="modelForm.height"
            @input="update"
          ></el-input>
          <el-slider
            v-model="modelForm.height"
                     :min="-800"
                     :step="1"
                     @input="update"
                     :max="8800"></el-slider>
            :max="8800"
          ></el-slider>
        </el-form-item>
        <el-form-item label="角度:"
                      v-if="$store.state.previewLayer.type  != '3dml'">
          <el-input size="small"
        <el-form-item
          label="角度:"
          v-if="$store.state.previewLayer.type  != '3dml'&&
            $store.state.previewLayer.type  !='cpt'"
        >
          <el-input
            size="small"
                    v-model="modelForm.yaw"
                    @input="update"></el-input>
          <el-slider v-model="modelForm.yaw"
            @input="update"
          ></el-input>
          <el-slider
            v-model="modelForm.yaw"
                     :min="0"
                     @input="update"
                     :step="0.1"
                     :max="360"></el-slider>
            :max="360"
          ></el-slider>
        </el-form-item>
        <el-form-item label="透明度:">
          <el-input size="small"
          <el-input
            size="small"
                    v-model="modelForm.alpha"
                    @input="update"></el-input>
          <el-slider v-model="modelForm.alpha"
            @input="update"
          ></el-input>
          <el-slider
            v-model="modelForm.alpha"
                     @input="update"
                     :min="0"
                     :step="0.01"
                     :max="1"></el-slider>
            :max="1"
          ></el-slider>
        </el-form-item>
      </el-form>
    </div>
    <el-dialog :title="formInline.title"
    <el-dialog
      :title="formInline.title"
               :visible.sync="dialogVisible"
               :modal="false"
               :modal-append-to-body="false"
               :close-on-click-modal="false"
               :before-close="handleClose"
               width="30%">
      width="30%"
    >
      <div style="height:63vh">
        <el-tabs v-model="activeName"
                 @tab-click="handleClick">
          <el-tab-pane label="属性"
                       name="first">
            <el-form ref="form"
        <el-tabs
          v-model="activeName"
          @tab-click="handleClick"
        >
          <el-tab-pane
            label="属性"
            name="first"
          >
            <el-form
              ref="form"
                     :model="formInline"
                     label-width="80px">
              label-width="80px"
            >
              <el-form-item :label="$t('common.name')">
                <el-input v-model="formInline.name"></el-input>
              </el-form-item>
              <el-form-item :label="$t('common.type')">
                <el-select v-model="formInline.type"
                           style="width:100%">
                  <el-option v-for="item in options"
                <el-select
                  v-model="formInline.type"
                  style="width:100%"
                >
                  <el-option
                    v-for="item in options"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value">
                    :value="item.value"
                  >
                  </el-option>
                </el-select>
@@ -144,78 +220,110 @@
              </el-form-item>
              <el-form-item>
                <el-button v-show="isShowModel"
                <el-button
                  v-show="isShowModel"
                           type="success"
                           plain
                           size="small"
                           @click="InsertData">{{$t('common.increase')}}</el-button>
                <el-button v-show="!isShowModel"
                  @click="InsertData"
                >{{$t('common.increase')}}</el-button>
                <el-button
                  v-show="!isShowModel"
                           type="info"
                           plain
                           size="small"
                           @click="EditData">{{$t('common.update')}}</el-button>
                  @click="EditData"
                >{{$t('common.update')}}</el-button>
              </el-form-item>
            </el-form>
          </el-tab-pane>
          <el-tab-pane label="附件"
                       name="second">
            <el-form :model="fromfile"
                     class="demo-form-inline">
          <el-tab-pane
            label="附件"
            name="second"
          >
            <el-form
              :model="fromfile"
              class="demo-form-inline"
            >
              <el-form-item>
                <el-input v-model="fromfile.file"
                <el-input
                  v-model="fromfile.file"
                          style="width: 300px; margin-right: 20px"
                          :placeholder="$t('common.choose')"
                          disabled></el-input>
                <input name="file1"
                  disabled
                ></el-input>
                <input
                  name="file1"
                       type="file"
                       id="insertFile"
                       multiple="multiple"
                       style="display: none"
                       @change="insertFile( )" />
                <el-link @click="getInsertFile( )"
                         :underline="false"><i class="el-icon-folder-opened"></i></el-link>
                  @change="insertFile( )"
                />
                <el-link
                  @click="getInsertFile( )"
                  :underline="false"
                ><i class="el-icon-folder-opened"></i></el-link>
              </el-form-item>
              <el-form-item>
                <el-row>
                  <el-col :span="3">
                    <el-link class="elLink"
                    <el-link
                      class="elLink"
                             :underline="false"
                             @click="setAttachInsert">{{$t('common.append')}}</el-link>
                      @click="setAttachInsert"
                    >{{$t('common.append')}}</el-link>
                  </el-col>
                  <el-col :span="3">
                    <el-link class="elLink"
                    <el-link
                      class="elLink"
                             :underline="false"
                             @click="setAttachDel">{{$t('common.delete')}}</el-link>
                      @click="setAttachDel"
                    >{{$t('common.delete')}}</el-link>
                  </el-col>
                </el-row>
              </el-form-item>
            </el-form>
            <el-table :data="tableData"
            <el-table
              :data="tableData"
                      ref="filterTable"
                      height="calc(100% - 130px)"
                      border
                      style="width: 100%"
                      @selection-change="handleAttatchChange">
              <el-table-column type="selection"
                               width="70" />
              <el-table-column width="60"
              @selection-change="handleAttatchChange"
            >
              <el-table-column
                type="selection"
                width="70"
              />
              <el-table-column
                width="60"
                               type="index"
                               :label="$t('common.index')" />
              <el-table-column prop="name"
                               :label="$t('common.name')" />
                :label="$t('common.index')"
              />
              <el-table-column
                prop="name"
                :label="$t('common.name')"
              />
              <el-table-column prop="sizes"
              <el-table-column
                prop="sizes"
                               :label="$t('common.size')"
                               :formatter="statSizeChange" />
              <el-table-column align="center"
                :formatter="statSizeChange"
              />
              <el-table-column
                align="center"
                               :label="$t('common.operate')"
                               min-width="100">
                min-width="100"
              >
                <template slot-scope="scope">
                  <el-link v-if="matchState(scope, /[]/)"
                  <el-link
                    v-if="matchState(scope, /[]/)"
                           @click="setAttatchDetail(scope.$index, scope.row)"
                           class="elLink">{{ $t('common.see') }}</el-link>
                    class="elLink"
                  >{{ $t('common.see') }}</el-link>
                </template>
              </el-table-column>
@@ -238,48 +346,66 @@
        <map-sdk v-if='showMapVisible'></map-sdk>
      </div>
    </el-dialog> -->
    <el-dialog title="预览"
    <el-dialog
      title="预览"
               :append-to-body="false"
               :visible.sync="dialog.dialogVisible"
               width="70%"
               :close-on-click-modal="false">
      <div v-if="dialog.isPdf"
           class="pdfClass">
        <iframe :src="dialog.src"
      :close-on-click-modal="false"
    >
      <div
        v-if="dialog.isPdf"
        class="pdfClass"
      >
        <iframe
          :src="dialog.src"
                type="application/x-google-chrome-pdf"
                width="100%"
                height="100%">
          height="100%"
        >
        </iframe>
      </div>
      <div v-if="dialog.isJpg"
           class="pdfClass">
      <div
        v-if="dialog.isJpg"
        class="pdfClass"
      >
        <el-image style="width:100%; height:100%"
        <el-image
          style="width:100%; height:100%"
                  :src="dialog.src"
                  :preview-src-list="[dialog.src]">
          :preview-src-list="[dialog.src]"
        >
        </el-image>
      </div>
    </el-dialog>
    <div v-show="modelKeyFlag"
    <div
      v-show="modelKeyFlag"
         class="modelLayer box_divm"
         v-drag>
      <el-form ref="form"
      v-drag
    >
      <el-form
        ref="form"
               :model="modelForm"
               label-width="80px">
        label-width="80px"
      >
        <el-form-item label="主键ID">
          <el-select v-model="modelLayerId">
            <el-option v-for="item in optionKey"
            <el-option
              v-for="item in optionKey"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value">
              :value="item.value"
            >
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item>
          <el-button type="primary"
          <el-button
            type="primary"
                     size="small"
                     @click="setSureKeyModelKey">{{$t('common.confirm')}}</el-button>
            @click="setSureKeyModelKey"
          >{{$t('common.confirm')}}</el-button>
        </el-form-item>
      </el-form>
    </div>
src/router/index.js
@@ -55,7 +55,7 @@
import systemController from '@/views/maintenance/systemController.vue';//系统管理
import empowerController from '@/views/maintenance/empowerController.vue';//授权管理
import opexController from '@/views/maintenance/opexController.vue';//运维监控
import dataCount from '@/views/datamanage/dataStatistics.vue'; //数据统计
//包二
import WareInspection from '@/views/PackageTwo/WareInspection.vue'; //数据质检-入库质检
import QualityInspection from '@/views/PackageTwo/index.vue'; //数据质检-入库质检
@@ -206,7 +206,15 @@
          requireAuth: true, // æ ‡è¯†è¯¥è·¯ç”±æ˜¯å¦éœ€è¦ç™»å½•
        },
      },
      {
        path: '/dataCount',
        name: 'dataCount',
        component: dataCount,
        meta: {
          title: '数据统计',
          requireAuth: true, // æ ‡è¯†è¯¥è·¯ç”±æ˜¯å¦éœ€è¦ç™»å½•
        },
      },
      {
        path: '/Archive',
        name: 'Archive',
src/views/datamanage/dataStatistics.vue
@@ -1,5 +1,5 @@
<template>
  <div class="dataStatistics">
  <div class="box_div dataStatistics">
    <My-bread :list="[
        `${$t('dataManage.dataManage')}`,
        `${$t('dataManage.dataStatistics')}`,
@@ -25,28 +25,66 @@
        style="border: 1px solid #dcdfe6;"
      >
        <div
          class="iquery subpage_Div"
          class=" subpage_Div iquery"
          style="padding-bottom: 14px"
        >
          <div>
            <el-form
              :inline="true"
              :model="tjlxData"
              class="demo-form-inline"
            >
              <el-form-item
                label="统计类型"
                v-show="!setCountFlag && tjlxData.flag"
              >
                <el-select
                  v-model="tjlxData.region"
                  size="small"
                  @change="setTjlxDataChange"
                >
                  <el-option
                    label="数据存储量"
                    value="sjccl"
                  >
                  </el-option>
                  <el-option
                    label="数据条数"
                    value="sjts"
                  >
                  </el-option>
                </el-select>
              </el-form-item>
              <el-form-item>
            <el-button
              icon="el-icon-c-scale-to-original"
              size="small"
              type="warning"
              @click="setCountFlagChange(1)"
            >{{ $t("shuJuGuanLi.butten.Report") }}</el-button>
              </el-form-item>
              <el-form-item>
            <el-button
              icon="el-icon-pie-chart"
              size="small"
              type="primary"
              @click="setCountFlagChange(2)"
            >{{ $t("shuJuGuanLi.butten.Histogram") }}</el-button>
              </el-form-item>
              <el-form-item>
            <el-button
              icon="el-icon-download"
              size="small"
              type="success"
              @click="setCountFlagChange(3)"
            >{{ $t("shuJuGuanLi.butten.Download") }}</el-button>
              </el-form-item>
            </el-form>
          </div>
        </div>
        <div class="dividing-line"></div>
@@ -86,14 +124,21 @@
            </el-table-column>
            <el-table-column
              v-if="queryData.value == 'countSizes'"
              prop="count"
              prop="sizes"
              key="4"
              align="center"
              :label="$t('dataManage.dataStaticObj.type4')"
              :formatter="formatterColumn"
            >
            </el-table-column>
            <el-table-column
              v-if="queryData.value == 'countSizes'"
              prop="count"
              key="4"
              align="center"
              :label="$t('dataManage.dataStaticObj.type8')"
            >
            </el-table-column>
            <el-table-column
              v-if="queryData.value == 'countOperates'"
              prop="m1"
@@ -110,27 +155,59 @@
              :label="$t('dataManage.dataStaticObj.type7')"
            >
            </el-table-column>
            <!-- <el-table-column
              v-if="queryData.value == 'countOperates'"
              prop="m2"
            <el-table-column
              v-if="queryData.value == 'countSizesByType'"
              prop="m1"
              key="3"
              align="center"
              :label="$t('dataManage.dataStaticObj.type6')"
              :label="$t('common.fileType')"
            >
            </el-table-column> -->
            </el-table-column>
            <el-table-column
              v-if="queryData.value == 'countSizesByType'"
              prop="sizes"
              key="4"
              align="center"
              :label="$t('dataManage.dataStaticObj.type4')"
              :formatter="formatterColumn"
            >
            </el-table-column>
            <el-table-column
              v-if="queryData.value == 'countSizesByType'"
              prop="count"
              key="4"
              align="center"
              :label="$t('dataManage.dataStaticObj.type8')"
            >
            </el-table-column>
            <el-table-column
              v-if="queryData.value == 'countSizesByPrj'"
              prop="m1"
              key="3"
              align="center"
              :label="$t('dataManage.projectObj.projname')"
            >
            </el-table-column>
            <el-table-column
              v-if="queryData.value == 'countSizesByPrj'"
              prop="sizes"
              key="4"
              align="center"
              :label="$t('dataManage.dataStaticObj.type4')"
              :formatter="formatterColumn"
            >
            </el-table-column>
            <el-table-column
              v-if="queryData.value == 'countSizesByPrj'"
              prop="count"
              key="4"
              align="center"
              :label="$t('dataManage.dataStaticObj.type8')"
            >
            </el-table-column>
          </el-table>
          <!-- <div class="pagination_box">
            <el-pagination
              @size-change="handleSizeChange"
              @current-change="handleCurrentChange"
              :current-page="listData.pageIndex"
              :page-sizes="[10, 20, 50, 100]"
              :page-size="listData.pageSize"
              layout="total, sizes, prev, pager, next, jumper"
              :total="listData.count"
            >
            </el-pagination>
          </div> -->
        </div>
        <div
          id="contentEchart subpage_Div"
@@ -209,6 +286,8 @@
  dataCount_selectCountServices,
  dataCount_selectCountSizes,
  dataCount_downloadReport,
  dataCount_countSizesByType,
  dataCount_countSizesByPrj
} from "../../api/api.js";
export default {
  name: "DataStatistics",
@@ -217,15 +296,19 @@
    return {
      treeData: [
        {
          id: 1,
          label: "服务调用量统计",
          value: "countServices",
          id: 5,
          label: "项目统计数据",
          value: "countSizesByPrj",
          children: [],
        },
        {
        }, {
          id: 2,
          label: "数据量统计",
          label: "单位数据统计",
          value: "countSizes",
          children: [],
        }, {
          id: 4,
          label: "数据格式统计",
          value: "countSizesByType",
          children: [],
        },
        {
@@ -233,9 +316,18 @@
          label: "用户流量统计",
          value: "countOperates",
          children: [],
        }, {
          id: 1,
          label: "服务调用量统计",
          value: "countServices",
          children: [],
        },
      ],
      ],
      tjlxData: {
        region: 'sjccl',
        flag: false,
      },
      defaultProps: {
        children: "children",
        label: "label",
@@ -250,17 +342,22 @@
      tableData: [],
      modelData: [],
      queryData: null,
      setCountFlag: true,
      setCountFlag: false,
      option: null,
      showDownLoadFlag: false,
    };
  },
  mounted() {
    this.setStartDataCount();
  },
  methods: {
    setTjlxDataChange() {
      this.showCountEchart()
    },
    formatterColumn(row, column, cellValue, index) {
      return row.count + "MB";
      return (row.sizes / 1024).toFixed(6) + "GB"
    },
    setDownLoadRow(rows) {
      var url =
@@ -336,8 +433,8 @@
        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";
        dom.style.width = window.innerWidth * 0.75 + "px";
        dom.style.height = window.innerHeight * 0.75 + "px";
      };
      //设置div容器高宽
      resizeMainContainer();
@@ -348,24 +445,41 @@
      var app = {};
      let dataAxis = [];
      let yMax = 0;
      this.option = {}
      let data = [];
      let yMax = 0;
      window.sjName = this.queryData.value
      window.sjType = this.tjlxData.region
      if (sjName == 'countServices' || sjName == 'countOperates') {
      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);
        }
        debugger
      } else {
        for (var i in this.tableData) {
          if (this.tableData[i].count > yMax) {
            yMax = this.tableData[i].count;
          }
          if (sjType == 'sjts') {
            data.push(this.tableData[i].count);
          } else if (sjType == 'sjccl') {
            data.push((this.tableData[i].sizes / 1024).toFixed(6));
          }
          var m1 = this.tableData[i].m1;
          dataAxis.push(m1);
        }
      }
      yMax = yMax + 10;
      let dataShadow = [];
      for (let i = 0; i < data.length; i++) {
        dataShadow.push(yMax);
      }
@@ -385,7 +499,21 @@
            type: "line", // é»˜è®¤ä¸ºç›´çº¿ï¼Œå¯é€‰ä¸ºï¼š'line' | 'shadow'
          },
          formatter: " {b} : <br/>统计量 :  {c}",
          formatter: function (params) {
            var p_name = params[0].axisValue;
            var p_val;
            if (sjName == 'countServices' || sjName == 'countOperates') {
              p_val = p_name + '<br/>访问次数  ï¼š' + params[0].data + '次'
            } else {
              if (sjType == 'sjts') {
                p_val = p_name + '<br/>数据条数:' + params[0].data + '条'
              } else {
                p_val = p_name + '<br/>数据存储量:' + params[0].data + 'GB'
              }
            }
            return p_val;
          },
        },
        xAxis: {
          data: dataAxis,
@@ -402,6 +530,7 @@
          z: 10,
        },
        yAxis: {
          name: name,
          axisLine: {
            show: false,
          },
@@ -441,6 +570,9 @@
          },
        ],
      };
      // Enable data zoom when user click bar.
      const zoomSize = 6;
      myChart.on("click", function (params) {
@@ -470,18 +602,23 @@
      });
      this.listData.code = this.queryData.value;
      this.setQueryCountData();
    },
    //树点击事件
    handleNodeClick(data, node, prop) {
      this.setCountFlag = true;
      this.setCountFlag = false;
      this.queryData = data;
      this.listData.code = data.value;
      this.listData.pageIndex = 1;
      this.listData.pageSize = 10;
      this.setQueryCountData();
    },
    handleIsopenSelect() {
      this.$forceUpdate()
    },
    //查询统计信息
    async setQueryCountData() {
      this.tjlxData.region = 'sjccl';
      var data, val;
      if (this.queryData.value == "countServices") {
        data = await dataCount_selectCountServices();
@@ -490,16 +627,29 @@
        data = await dataCount_selectCountSizes();
      } else if (this.queryData.value == "countOperates") {
        data = await dataCount_selectCountOperates();
      } else if (this.queryData.value == "countSizesByType") {
        data = await dataCount_countSizesByType();
      } else if (this.queryData.value == "countSizesByPrj") {
        data = await dataCount_countSizesByPrj();
      }
      if (this.queryData.value == 'countServices' || this.queryData.value == 'countOperates') {
        this.tjlxData.flag = false;
        debugger
      } else {
        this.tjlxData.flag = true;
      }
      if (data.code != 200) {
        return;
      }
      if (this.queryData.value == "countSizes") {
        for (var i in data.result) {
          data.result[i].count = data.result[i].sizes;
        }
      }
      // if (this.queryData.value == "countSizes") {
      //   // for (var i in data.result) {
      //   //   data.result[i].count = data.result[i].sizes;
      //   // }
      // }
      if (this.queryData.value == "countOperates") {
        for (var i in data.result) {
@@ -511,6 +661,7 @@
      }
      this.tableData = data.result;
      this.showCountEchart();
      this.$nextTick(() => {
        this.$refs.table.doLayout();
      });
@@ -522,23 +673,26 @@
<style lang="less" scoped>
.dataStatistics {
  height: 98%;
  width: 98%;
  padding: 1%;
  width: calc(100% - 20px);
  height: calc(100% - 20px);
  padding: 10px;
  position: relative;
  overflow: hidden;
  .contentBox {
    padding-top: 10px;
    height: calc(98% - 63px);
    height: calc(100% - 50px);
    width: 100%;
    display: flex;
    justify-content: space-around;
    .content_Left {
      width: 18%;
      width: 15%;
      height: calc(95% - 2px);
      border-radius: 5px;
      padding: 1%;
    }
    .content_Right {
      width: 77%;
      width: 80%;
      height: calc(95% - 2px);
      border-radius: 5px;
      padding: 1%;
@@ -547,6 +701,7 @@
        border-radius: 5px;
        display: flex;
        justify-content: flex-end;
        padding: 0px !important;
      }
      .contentTable {
        width: 98%;
src/views/datamanage/uploadmanage.vue
@@ -889,12 +889,12 @@
        return
      }
      if (this.formInline.type == "DOM" || this.formInline.type == "DEM") {
        debugger
        this.insertLayer.name = this.multipleSelection[0].name.split('.')[0];
        this.insertLayer.number = this.multipleSelection.length
        this.insertLayer.noData = '0';
        this.insertDialogVisible = true;
      } if (this.formInline.type == "3DML" || this.formInline.type == "BIM") {
      } else if (this.formInline.type == "3DML" || this.formInline.type == "BIM") {
        var val = JSON.parse(JSON.stringify(this.multipleSelection))
        for (var i in val) {
          val[i].isModel = null