1

Surpriseplus

2022-12-21 ec3342e1b34dd02f33dae9bed2db16a14ae8096d

1

 src/api/api.js

@@ -590,6 +590,10 @@
  return request.get('/dataLoader/selectDbData', { params: params });
}

export function dataQuerySelectByPage(params) {
  return request.get('/inquiry/selectByPage', { params: params });
}

// //数据入库=>查询文件
// export function dataLoader_selectDirAll(params) {
//   return request.get('/dataUpload/selectFiles?path=' + params);

 src/assets/lang/en.js

@@ -166,8 +166,8 @@
      index: 'Index',
      name: 'Name',
      type: 'Type',
      dirid: 'Directory ID',
      depid: 'Unit ID',
      dirid: 'Directory',
      depid: 'Unit',
      ver: 'Edition',
      status: 'State',
      precision: 'Accuracy',

 src/assets/lang/zh.js

@@ -165,8 +165,8 @@
      index: '序号',
      name: '名称',
      type: '类型',
      dirid: '目录ID',
      depid: '单位ID',
      dirid: '目录 ',
      depid: '单位 ',
      ver: '版本',
      status: '状态',
      precision: '精度',

 src/components/MapDiv.vue

@@ -13,7 +13,7 @@
    <div id="ds" v-show="isShowDs"></div>
    <!--openLayers显示界面-->
    <div
      v-if="isOlMapFlag"
      v-show="isOlMapFlag"
      id="map"
      class="olMap"
      :class="[isShowOlMap ? 'olMapTwo' : 'olMapOne']"

 src/components/MapView/mapMenuTop.vue

@@ -233,10 +233,19 @@
      //清空标绘
      sgworld.Creator.SimpleGraphic.edit(false, { editProp: false });
      sgworld.Creator.SimpleGraphic.clear();

      if (this.treeChange.length == 0) {
        this.$message.error('请选择要查询的数据');
        return;
      }
      if (this.menuTopFrom.queryType != 'inputFile') {
        sgworld.Creator.createSimpleGraphic(
          this.menuTopFrom.queryType,
          {},
          {
            color: '#00FF0060',
            outlineColor: '#0f0',
            outlineWidth: 5,
          },
          (entity) => {
            this.setTurfGeometry(entity);
          }
@@ -297,7 +306,6 @@
      if (type == 'polyline') {
        var line = turf.lineString(std, { name: 'polyline' });
        restVal = turf.buffer(line, 10, { units: 'miles' });
        console.log('line', restVal);
      } else if (type == 'rectangle') {
        var ste = this.setCartesianToEightFour(res[0]);
        std.push([ste.lng, ste.lat]);
@@ -325,6 +333,8 @@
        this.$store.state.mapPopBoxFlag = '1';
      }
      this.$bus.$emit('changeMapMenuTop', 'true');
      sgworld.Creator.SimpleGraphic.edit(false, { editProp: false });
      sgworld.Creator.SimpleGraphic.clear();
      //清空inputFile
      // var file = document.getElementById('getMenuTopFile');
      // file.outerHTML = file.outerHTML;

 src/components/MapView/mapSpacePop.vue

@@ -47,12 +47,17 @@
          ></el-input>
        </el-form-item>
        <el-form-item>
          <el-button plain @click="setSpaceTableLayer">查詢</el-button>
          <el-button plain @click="setSpaceTableLayer">查询</el-button>
          <el-button plain @click="restSpacePopLayer">重置</el-button>
        </el-form-item>
      </el-form>
      <div class="centTable">
        <el-table :data="tableData" height="220" style="width: 100%">
        <el-table
          :data="tableData"
          height="220px"
          ref="filterTable"
          style="width: 100%"
        >
          <el-table-column
            align="center"
            type="index"
@@ -308,6 +313,7 @@
        }
      }
      this.tableData = data.result;
      this.$refs.filterTable.doLayout();
    },
    async spaceLocation(index, row) {
      var param = {
@@ -367,7 +373,9 @@
  overflow: hidden;
  border: 1px solid gray;
  float: left;

  .centTable {
    height: 230px;
  }
  .rightTitle {
    padding: 5px;
    color: white;
@@ -378,7 +386,6 @@
      color: white;
    }
  }

  .bottomPage {
    position: absolute;
    bottom: 1%;
@@ -394,7 +401,6 @@
  }
  /deep/ .el-table {
    background-color: transparent;

    th,
    td {
      background-color: transparent;

 src/components/ProjectOl.vue

@@ -62,7 +62,7 @@
      var a1 = value.split(' ');
      console.log(a1);
      var a2 = transform(
        [parseFloat(a1[1]), parseFloat(a1[2])],
        [parseFloat(a1[0]), parseFloat(a1[1])],
        'EPSG:4326',
        'EPSG:3857'
      );
@@ -116,7 +116,7 @@
        var a1 = transform([extent[0], extent[1]], 'EPSG:3857', 'EPSG:4326');

        this.$store.state.projeOl =
          'POINT( ' + a1[0].toFixed(6) + ' ' + a1[1].toFixed(6) + ')';
          'POINT(' + a1[0].toFixed(6) + ' ' + a1[1].toFixed(6) + ')';
        this.mapol.removeInteraction(this.draw);
      });
    },

 src/components/mapsdk.vue

@@ -229,56 +229,7 @@
      selFrom: {},
      selectTree: null,

      menuList: [
        {
          id: 1,
          label: '一级 1',
          children: [
            {
              id: 4,
              label: '二级 1-1',
              children: [
                {
                  id: 9,
                  label: '三级 1-1-1',
                },
                {
                  id: 10,
                  label: '三级 1-1-2',
                },
              ],
            },
          ],
        },
        {
          id: 2,
          label: '一级 2',
          children: [
            {
              id: 5,
              label: '二级 2-1',
            },
            {
              id: 6,
              label: '二级 2-2',
            },
          ],
        },
        {
          id: 3,
          label: '一级 3',
          children: [
            {
              id: 7,
              label: '二级 3-1',
            },
            {
              id: 8,
              label: '二级 3-2',
            },
          ],
        },
      ],
      menuList: [],
      defaultProps: {
        children: 'children',
        label: 'label',
@@ -306,9 +257,9 @@
      sgworld.Navigate.jumpTo({
        //跳转视角
        destination: new Cesium.Cartesian3.fromDegrees(
          116.055913,
          39.937685,
          8000
          116.3911,
          39.9115,
          100000
        ),
      });
      Viewer.imageryLayers.addImageryProvider(
@@ -373,6 +324,7 @@
      };
      sgworld.Creator.sfsterrainprovider('mpt', option, '', true, '');
      window.elevationTool = new SmartEarth.ElevationTool(window.sgworld);
      elevationTool.setContourColor('#F1D487');
    },

    changeMenulayer() {

 src/components/navMenu.vue

@@ -94,7 +94,7 @@
      itemdetail: {},
      formLabelWidth: '70px',
      count: 5,
      changeSelectStyle: 5,
      changeSelectStyle: null,
      changeliSelect: null,
      changeSelectdiv: false,
      listMenu: [
@@ -215,8 +215,15 @@
          res[i].children = result.result.filter((value) => {
            return value.pid == res[i].id;
          });
          this.listMenu.push(res[i]);
          this.changeSelectStyle = this.listMenu.length - 1;
          var strartMneu = res[i].children[0];
          this.$store.commit('currentPerms', strartMneu.perms);
          this.changeliSelect = strartMneu.cnName;
          this.$bus.$emit('currentPerms', strartMneu.perms);
        } else {
          this.listMenu.push(res[i]);
        }
        this.listMenu.push(res[i]);
      }
    },
    treeData(source) {

 src/router/index.js

@@ -65,7 +65,7 @@
    path: '/',
    name: 'Home',
    component: Home,
    redirect: '/mochaitmo',
    redirect: '/Synthesis',
    children: [
      {
        path: '/mochaitmo',

 src/store/index.js

@@ -45,6 +45,7 @@
    //项目管理
    projeOl: null,
    download: false,
    showAllLayers: true,
  },
  mutations: {
    //获取权限合集

 src/views/Archive/index.vue

@@ -8,18 +8,18 @@
      </div>
      <div class="top_right">
        <el-form :inline="true" :model="formInline" class="demo-form-inline">
          <!-- <el-form-item>
          <el-form-item>
            <el-input
              v-model="formInline.user"
              suffix-icon="el-icon-search"
              :placeholder="$t('common.pleaseInput')"
            ></el-input>
          </el-form-item> -->
          <!-- <el-form-item>
          </el-form-item>
          <el-form-item>
            <el-button icon="el-icon-search" class="primaries">{{
              $t('common.iquery')
            }}</el-button>
          </el-form-item> -->
          </el-form-item>
          <el-form-item>
            <el-button @click="getSpaceMapVisibale" class="primaries">{{
              $t('synthesis.rangequery')
@@ -659,8 +659,6 @@
          this.closeMapDown();
        })
        .catch((_) => {});


    },
    closeMapDown(){
      this.dialogMapVisible =false;

 src/views/AuthorizationManagement/roleResAuthorization.vue

@@ -98,7 +98,7 @@
          "
        >
          <span>
            {{ $t('operatManage.UserRoleAuthorizationObj.userTable') }}</span
            {{ $t('operatManage.UserRoleAuthorizationObj.ResTable') }}</span
          >
          <div class="btn" style="margin-left: auto">
            <el-button

 src/views/Synthesis/LeftMenu.vue

@@ -437,28 +437,45 @@
      }
    },
    handleOpenClick() {
      // let that = this;
      sgworld.Creator.SimpleGraphic.edit(true, { editProp: true });
      let fileInput = document.querySelector('.file');
      fileInput.onchange = function (evt) {
        let files = evt.target.files;
        if (files.length > 0) {
          let file = evt.target.files[0];
          sgworld.Creator.addKmlLayer('kml数据', file, true);
          // let fileReader = new FileReader();
          // fileReader.readAsDataURL(file);
          // fileReader.onload = () => {
          //   sgworld.Viewer.dataSources
          //     .add(
          //       Cesium.KmlDataSource.load(fileReader.result, {
          //         camera: sgworld.Viewer.scene.camera,
          //         canvas: sgworld.Viewer.scene.canvas,
          //       })
          //     )
          //     .then((KmlDataSource) => {
          //       console.log(KmlDataSource);
          //       // let entities = kmlDataSource.entities;
          //     });
          // };
          let fileReader = new FileReader();
          fileReader.readAsDataURL(file);
          fileReader.onload = () => {
            var kmlOptions = {
              camera: sgworld.Viewer.scene.camera,
              canvas: sgworld.Viewer.scene.canvas,
              clampToGround: true,
            };
            var geocachePromise = Cesium.KmlDataSource.load(
              fileReader.result,
              kmlOptions
            );
            geocachePromise.then(function (dataSource) {
              var geocacheEntities = dataSource.entities.values;

              for (var i = 0; i < geocacheEntities.length; i++) {
                var entity = geocacheEntities[i];

                sgworld.Viewer.entities.add(entity);
              }
            });
            // sgworld.Viewer.dataSources
            //   .add(
            //     Cesium.KmlDataSource.load(fileReader.result, {
            //       camera: sgworld.Viewer.scene.camera,
            //       canvas: sgworld.Viewer.scene.canvas,
            //     })
            //   )
            //   .then((KmlDataSource) => {
            //     console.log(KmlDataSource);
            //     // let entities = kmlDataSource.entities;
            //   });
          };
        }
        // fileInput.value = null;
      };
@@ -957,6 +974,11 @@
    this.$bus.$on('setChangeTwoMenu', (res) => {
      this.menuChange(res);
    });
    this.$bus.$on('showLeftMenu', (res) => {
      this.$store.state.showAllLayers = true;
      this.setCoverage('a1');
      // this.$bus.$emit('setAllLayers', true);
    });
  },
};
</script>

 src/views/Synthesis/index.vue

@@ -120,7 +120,14 @@
      }
    },
    //初始化菜单授权
    getPermsMenu() {
    async getPermsMenu() {
      if (this.$store.state.currentPerms == '') {
        this.$store.state.currentPerms = '/comprehensive';
      }
      if (this.$store.state.permsEntity.length == 0) {
        const data = await getPerms();
        this.$store.state.permsEntity = data.result;
      }
      var val = this.$store.state.currentPerms;
      var permsEntity = this.$store.state.permsEntity;
      for (var i = 0; i < permsEntity.length; i++) {
@@ -159,6 +166,8 @@
    },
  },
  mounted() {
    this.getPermsMenu();
    this.$bus.$emit('showLeftMenu', true);
    this.$store.state.mapMenuBoolean = false;
    this.$store.state.mapMenuBoxFlag = null;
    this.$store.state.mapPopBoolean = false;
@@ -166,7 +175,7 @@
  },
  //初始化菜单授权
  created() {
    this.getPermsMenu();
    // this.getPermsMenu();
  },
};
</script>

 src/views/Thematic/index.vue

@@ -301,7 +301,11 @@
      //定位
      sgworld.Navigate.jumpTo({
        //跳转视角
        destination: new Cesium.Cartesian3.fromDegrees(105.02, 34.9, 8000000),
        destination: new Cesium.Cartesian3.fromDegrees(
          116.3911,
          39.9115,
          100000
        ),
      });

      MapViewer.imageryLayers.addImageryProvider(

 src/views/Tools/LayerTree.vue

@@ -94,6 +94,8 @@
</template>

<script>
import ImageWMS from 'ol/source/ImageWMS';
import Image from 'ol/layer/Image';
export default {
  name: 'tree',
  data() {
@@ -158,14 +160,12 @@
  },
  methods: {
    NodeBlur(Node, data) {
      console.log(Node, data);
      if (data.label.length === 0) {
        this.$message.error('菜单名不可为空！');
        return false;
      } else {
        if (data.isEdit) {
          this.$set(data, 'isEdit', false);
          console.log(data.isEdit);
        }
        this.$nextTick(() => {
          this.$refs['slotTreeInput' + data.id].$refs.input.focus();
@@ -297,36 +297,48 @@
    handleCheckChange(data, checked, indeterminate) {
      if (data.children != null) return;
      var std = [];
      if (checked == true) {
        for (var i = 0; i < window.Viewer.imageryLayers._layers.length; i++) {
          var val_id =
            window.Viewer.imageryLayers._layers[i].imageryProvider.name;
          if (val_id == data.label) {
            std.push(data.label);
          }
        }
        if (std.length == 0) {
          let layerWMS = new Cesium.WebMapServiceImageryProvider({
            url: geoServerURl,
            layers: data.resource,
            parameters: {
              transparent: true,
              format: 'image/png',
            },
          });
          layerWMS.name = data.label;
          window.Viewer.imageryLayers.addImageryProvider(layerWMS);
        }
      } else {
        for (var i = 0; i < window.Viewer.imageryLayers._layers.length; i++) {
          var val_id =
            window.Viewer.imageryLayers._layers[i].imageryProvider.name;
          if (val_id == data.label) {
            const img_layer = window.Viewer.imageryLayers._layers[i];
            window.Viewer.imageryLayers.remove(img_layer);
          }
      var layers_ol = window.map.getAllLayers();
      for (var i = 0; i < window.Viewer.imageryLayers._layers.length; i++) {
        var val_id =
          window.Viewer.imageryLayers._layers[i].imageryProvider.name;
        if (val_id == data.label) {
          const img_layer = window.Viewer.imageryLayers._layers[i];
          img_layer.show = checked;
        }
      }
      for (var i in layers_ol) {
        var layerOl = layers_ol[i];
        if (layerOl.values_.name == data.label) {
          layerOl.setVisible(checked); //显示图层
        }
      }
    },
    setAddLayers(res) {
      let layerWMS = new Cesium.WebMapServiceImageryProvider({
        url: geoServerURl,
        layers: res.resource,
        parameters: {
          transparent: true,
          format: 'image/png',
        },
      });
      layerWMS.name = res.label;
      window.Viewer.imageryLayers.addImageryProvider(layerWMS);

      var layer2 = new Image({
        name: res.label,
        source: new ImageWMS({
          crossOrigin: 'anonymous',
          url: geoServerURl,

          params: {
            FORMAT: 'image/png',
            VERSION: '1.1.1',
            LAYERS: res.resource,
          },
        }),
      });
      window.map.addLayer(layer2);
    },
  },
  watch: {
@@ -337,14 +349,26 @@
  mounted() {
    var std = [];
    var val = this.treeData[0].children;
    for (var i = 0; i < window.Viewer.imageryLayers._layers.length; i++) {
      var val_id = window.Viewer.imageryLayers._layers[i].imageryProvider.name;
    if (this.$store.state.showAllLayers == true) {
      for (var j = 0; j < val.length; j++) {
        if (val_id == val[j].label) {
          std.push(val[j].id);
        std.push(val[j].id);
        this.setAddLayers(val[j]);
      }

      this.$store.state.showAllLayers = false;
    } else {
      for (var i = 0; i < window.Viewer.imageryLayers._layers.length; i++) {
        var val_id = window.Viewer.imageryLayers._layers[i];
        if (val_id.show == true) {
          for (var j = 0; j < val.length; j++) {
            if (val_id.imageryProvider.name == val[j].label) {
              std.push(val[j].id);
            }
          }
        }
      }
    }

    this.$refs.tree.setCheckedKeys(std);
  },
};

 src/views/datamanage/dataLoader.vue

@@ -41,20 +41,32 @@
              </el-option>
              </el-select>
          </el-form-item>
          <el-form-item :label="$t('dataManage.dataUpObj.entryTime')">
            <el-date-picker
              v-model.trim="formInline.gather"
              :picker-options="pickerOptions"
              type="datetime"
              placeholder="请选择"
              value-format="yyyy-MM-dd HH:mm:ss"
            />
          </el-form-item>

          <el-form-item>
            <input id="uploadfile" @change= "handleFileChange" type="file"  name="file" multiple="multiple" accept=".xls,.xlsx,.mdb,.shp.zip,.gdb.zip"  style="display: none"></input>
            <el-button icon="el-icon-document-add" @click="fileSelect" class="primary">{{
            <!-- <el-button icon="el-icon-document-add" @click="fileSelect" class="primary">{{
              $t('common.file')
            }}</el-button>
            }}</el-button> -->

            <el-input v-model="formInline.fileName" disabled>
         <template slot="append">
             <el-button v-if="formInline.fileName == '未选择文件'"
              type="info"
                @click="fileSelect">
                   选择文件
             </el-button>
             <el-button
               v-else
                type="info"
                @click="clearFileSelect"
                >
                    重置
             </el-button>
         </template>
      </el-input>



          </el-form-item>
          <br />
          <el-form-item :label="$t('dataManage.dataUpObj.describe')">
@@ -155,6 +167,7 @@
 >
   <el-table-column
      type="selection"

      width="55">
    </el-table-column>
        <el-table-column
@@ -162,50 +175,50 @@
          type="index"
          :label="$t('common.index')"
          width="70px"
          fixed

        />
          <el-table-column
          align="center"
          prop="name"
          :label="$t('common.name')"
          fixed

        />
         <el-table-column
          align="center"
          prop="dirName"
          :label="$t('dataManage.dataUpObj.catalogue')"
          fixed


        />
         <el-table-column
          align="center"
          prop="depName"
          :label="$t('dataManage.dataUpObj.company')"
          fixed

        />
             <el-table-column
          align="center"
          prop="verName"
          :label="$t('dataManage.dataUpObj.versionNo')"
          fixed

        />
             <el-table-column
          align="center"
          prop="type"
          :label="$t('common.type')"
          fixed

        />
        <el-table-column
          align="center"
          prop="sizes"
          :label="$t('common.size')"
          fixed

          :formatter="changeSizeFile"
        />
         <el-table-column
          align="center"
          :label="$t('dataManage.dataUpObj.tableName')"
          fixed

        >
         <template slot-scope="scope">
      <a @click="detail(scope.row)"  >{{
@@ -236,8 +249,7 @@
          align="center"
          prop="createTime"
          :label="$t('dataManage.vmobj.createontime')"

              :formatter="changetimeFile"
          :formatter="changetimeFile"
        />
    </el-table>

@@ -264,7 +276,7 @@
   <el-dialog
  :title="$t('dataManage.datawarehousing')"
  :visible.sync="dialogWarehousing"
  width="50%"
  width="70%"
  :before-close="handleWareClose"
  >
  <div  class="dialogBox">
@@ -280,7 +292,7 @@
  </div>
  <div class="transFarBox">
 <ul>
      <li @click="singleElection2(item)" v-for="(item, i) in tableWareTwo"  :class="{ active: activeName2 == item.entity }">{{item.tabDesc}} (  {{item.tab}})</li>
      <li @click="singleElection2(item)" v-for="(item, i) in tableWareTwo"  :class="{ active: activeName2 == item.entity }">{{item.tabDesc}} ( {{item.ns}}.{{item.tab}})</li>
    </ul>
  </div>
   <div class="tarnsbtton">
@@ -289,7 +301,7 @@
   </div>
   <div class="transFarBox">
     <ul>
      <li @click="singleElection3(i)" v-for="(item, i) in tableWareThree"  :class="{ active: activeName3 ==( item.tab+i)}">{{item.tab}} ( {{item.tabDesc}}:{{item.entity}} )</li>
      <li @click="singleElection3(i)" v-for="(item, i) in tableWareThree"  :class="{ active: activeName3 ==( item.tab+i)}">{{item.tab}} ( {{item.tabDesc}}  {{item.ns}}.{{item.tabs}} )</li>
    </ul>
   </div>
  </div>
@@ -357,9 +369,9 @@
  dataLoader_selectMappers,
  dataLoader_SelectTabs,
  dataLoader_selectByPageForUpload,
dataLoader_deleteMetas,
dataLoader_selectFields,
dataLoader_selectDbData
  dataLoader_deleteMetas,
  dataLoader_selectFields,
  dataLoader_selectDbData
} from '../../api/api';
export default {
  name: 'dataUpdata',
@@ -368,11 +380,13 @@
  },
  data() {
    return {
          formWarehousing: {
          name:''

      formWarehousing: {
        name: '',

      },
waretableData:[],
      activeTabName:'first',
      waretableData: [],
      activeTabName: 'first',
      wareStatus: false,
      dialogWarehousing: false,
      btnStatus: 0,
@@ -380,6 +394,7 @@
      formInline: {
        verid: '',
        gather: '',
          fileName:'未选择文件'
      },
      tableWareOne: [],
      tableWareTwo: [],
@@ -393,7 +408,7 @@
      listData: {
        pageIndex: 1,
        pageSize: 10,
        name:''
        name: ''
      },
      pickerOptions: {
        disabledDate(time) {
@@ -416,16 +431,16 @@
      activeName2: '',
      activeName3: '',
      wareTableFlag: null,
      multipleDelete:[],
      dialogVisible:false,
      attributeData:[],
        listLoader:{
        id:null,
        pageSize:1,
        pageSize:10,
      multipleDelete: [],
      dialogVisible: false,
      attributeData: [],
      listLoader: {
        id: null,
        pageSize: 1,
        pageSize: 10,
      },
      count1:0,
      dbTableData:[],
      count1: 0,
      dbTableData: [],
    };
  },

@@ -468,51 +483,68 @@
  },

  methods: {
  async detail(res){
    async detail(res) {
      var val = res.tab.split(".");
      const data = await dataLoader_selectFields({
        ns:val[0],
        tab:val[1]
        ns: val[0],
        tab: val[1]
      })
      if(data.code != 200){
          this.$message.error('字段列表调用失败');
      if (data.code != 200) {
        this.$message.error('字段列表调用失败');
        return
      }
      var val_data= data.result;
      for(var i in val_data){
        if(val_data[i].alias.indexOf('ID') != -1){
         val_data[i].alias = val_data[i].alias.replace('ID','')
        }
      }
      this.dialogVisible = true;
      this.attributeData =data.result;
      this.listLoader={
        id:res.id,
        pageIndex:1,
        pageSize:10,
      this.attributeData = val_data;

      this.listLoader = {
        id: res.id,
        pageIndex: 1,
        pageSize: 10,
      }
      this.getDataLoaderSelectDbData();
    },
  async getDataLoaderSelectDbData (){
       const data1 = await dataLoader_selectDbData(this.listLoader);
     if(data1.code != 200){
          this.$message.error('字段列表调用失败');
    async getDataLoaderSelectDbData() {
      const data1 = await dataLoader_selectDbData(this.listLoader);
      if (data1.code != 200) {
        this.$message.error('字段列表调用失败');
        return
      }
 this.dbTableData =data1.result;
 this.count1 = data1.count;
      var val = data1.result;
      for(var i in val){
       val[i].createuser = val[i].createName;
       val[i].depid= val[i].depName;
       val[i].dirid= val[i].dirName;
       val[i].verid= val[i].verName;
       val[i].updateuser= val[i].updateName;
       if(val[i].createtime != null){
          val[i].createtime= this.changetimeLayer(val[i].createtime )
       }
       if(val[i].updatetime != null){
          val[i].updatetime= this.changetimeLayer(val[i].updatetime )
       }
      }
      this.dbTableData = data1.result;
      this.count1 = data1.count;
    },
       handleLoaderSizeChange(val){
      this.listLoader.pageIndex= 1;
      this.listLoader.pageSize =val;
            this.getDataLoaderSelectDbData();
    handleLoaderSizeChange(val) {
      this.listLoader.pageIndex = 1;
      this.listLoader.pageSize = val;
      this.getDataLoaderSelectDbData();
    },
handleLoaderCurrentChange(val){
  this.listLoader.pageIndex= val;
   this.getDataLoaderSelectDbData();
},
    handleLoaderCurrentChange(val) {
      this.listLoader.pageIndex = val;
      this.getDataLoaderSelectDbData();
    },



      changetimeFile(res){

//shijianchuo是整数，否则要parseInt转换
      var time = new Date(res.createTime);
      var y = time.getFullYear();
changetimeLayer(res){
      var time = new Date(res );
     var y = time.getFullYear();
      var m = time.getMonth() + 1;
      var d = time.getDate();
      var h = time.getHours();
@@ -531,75 +563,79 @@
        ':' +
        s
      );
},

    changetimeFile(res) {
     return this.changetimeLayer(res.createTime)
    },
      //格式化时间
    //格式化时间
    add0(m) {
      return m < 10 ? '0' + m : m;
    },
    setWarehouseSearch(){
    setWarehouseSearch() {

   this.listData={
              pageIndex:1,
              pageSize:10,
              name:this.formWarehousing.name,
            }
            this.getAllWareTable();
      this.listData = {
        pageIndex: 1,
        pageSize: 10,
        name: this.formWarehousing.name,
      }
      this.getAllWareTable();
    },
   async setWarehouseDel(){
var std = [];
          for (var i in this.multipleDelete) {
            std.push(this.multipleDelete[i].id);
          }
          const res = await dataLoader_deleteMetas({ids: std.toString() })
          if(res.code != 200){
            this.$message.error('删除失败');
          }else{
               this.$message({
    async setWarehouseDel() {
      var std = [];
      for (var i in this.multipleDelete) {
        std.push(this.multipleDelete[i].id);
      }
      const res = await dataLoader_deleteMetas({ ids: std.toString() })
      if (res.code != 200) {
        this.$message.error('删除失败');
      } else {
        this.$message({
          message: '删除成功',
          type: 'success'
        });
        this.listData.pageIndex=1;
        this.listData.pageIndex = 1;
        this.listData.pageSize = 10;
           this.getAllWareTable();
          }
        this.getAllWareTable();
      }
    },
    handleDelteChange(val){
    this.multipleDelete = val;
    handleDelteChange(val) {
      this.multipleDelete = val;
    },
    setWarehouseReset(){
     this.formWarehousing.name='';
   this.listData={
              pageIndex:1,
              pageSize:10,
              name:null,
            }
            this.getAllWareTable();
    setWarehouseReset() {
      this.formWarehousing.name = '';
      this.listData = {
        pageIndex: 1,
        pageSize: 10,
        name: null,
      }
      this.getAllWareTable();
    },
    handleTabClick(tab, event) {
        if(this.activeTabName =='second'){
            this.setWarehouseReset();
        }
      if (this.activeTabName == 'second') {
        this.setWarehouseReset();
      }
    },
    handleSizeChange(val){
      this.listData.pageIndex= 1;
      this.listData.pageSize =val;
          this.getAllWareTable();
    handleSizeChange(val) {
      this.listData.pageIndex = 1;
      this.listData.pageSize = val;
      this.getAllWareTable();
    },
handleCurrentChange(val){
  this.listData.pageIndex= val;
  this.getAllWareTable();
},
    handleCurrentChange(val) {
      this.listData.pageIndex = val;
      this.getAllWareTable();
    },
    //获取入库数据列表
   async getAllWareTable(){
    async getAllWareTable() {

      const res = await dataLoader_selectByPageForUpload(this.listData);
        if (res.code != 200) {
      if (res.code != 200) {
        this.$message.error('列表数据获取失败');
        return;
      }

      this.count = res.count;
 this.waretableData =res.result;
      this.waretableData = res.result;
    },
    //大小值改變
    changeSizeFile(row, column, cellValue, index) {
@@ -610,24 +646,24 @@
        return cellValue + "MB"
      }
    },
    setInsrtWareTableClose(){
  this.dialogWarehousing = false;
        this.setClearAttartch();
    setInsrtWareTableClose() {
      this.dialogWarehousing = false;
      this.setClearAttartch();
    },
   async setInsrtWareTable(){
    async setInsrtWareTable() {
      var obj = {
                  metaEntity: this.formInline,
                      fileEntities: this.tableData,
                  tabEntities: this.tableWareThree
                };
            const res = await dataLoader_InsertFiles(JSON.stringify(obj));
        metaEntity: this.formInline,
        fileEntities: this.tableData,
        tabEntities: this.tableWareThree
      };
      const res = await dataLoader_InsertFiles(JSON.stringify(obj));

             if (res.code != 200) {
      if (res.code != 200) {
        this.$message.error('数据入库失败');
        return;
      }else{
      } else {

         this.$message({
        this.$message({
          message: '数据入库成功',
          type: 'success'
        });
@@ -637,13 +673,13 @@
      }

    },
    setClearAttartch(){
       this.activeName = '';
    setClearAttartch() {
      this.activeName = '';
      this.activeName2 = '';
      this.activeName3 = '';
      this.tableWareThree =[];
      this.tableWareTwo=[];
      this.tableWareOne=[];
      this.tableWareThree = [];
      this.tableWareTwo = [];
      this.tableWareOne = [];
    },
    autoMatchWare() {
      var val1 = this.tableWareOne;
@@ -656,24 +692,27 @@
          if (val2[j].tab == stdTab) {
            std.push(val1[i].tab)
            val1[i].entity = val2[j].entity;
            val1[i].tabDesc= val2[j].tabDesc;
            val1[i].tabDesc = val2[j].tabDesc;
              val1[i].tabs=val2[j].tab;
               val1[i].ns=val2[j].ns;

            this.tableWareThree.push(val1[i]);
          }
        }
      }
 std.forEach(item => {
          this.tableWareOne = this.tableWareOne.filter(items => items.tab!== item);
        });
      std.forEach(item => {
        this.tableWareOne = this.tableWareOne.filter(items => items.tab !== item);
      });

    },
    setSplitWare(res) {
      if (res.indexOf(".shp") != -1) {
        return res.split(".shp").join("");
      }else if (res.indexOf(".mdb") != -1){
 return res.split(".mdb").join("");
      }else if (res.indexOf(".gdb") != -1){
 return res.split(".gdb").join("");
      }else{
      } else if (res.indexOf(".mdb") != -1) {
        return res.split(".mdb").join("");
      } else if (res.indexOf(".gdb") != -1) {
        return res.split(".gdb").join("");
      } else {
        return res;
      }
    },
@@ -689,35 +728,35 @@
      var res = this.wareTableFlag;
      var value1 = this.tableWareThree[res];
      value1.entity = null;
        value1.tabDesc= null;
        if(this.tableWareOne.indexOf(value1)!=-1 ){
      value1.tabDesc = null;
      if (this.tableWareOne.indexOf(value1) != -1) {

        }else{
            this.tableWareOne.push(value1);
      this.tableWareThree.splice(res, 1)
      this.activeName = '';
      this.activeName2 = '';
      this.activeName3 = '';
        }
      } else {
        this.tableWareOne.push(value1);
        this.tableWareThree.splice(res, 1)
        this.activeName = '';
        this.activeName2 = '';
        this.activeName3 = '';
      }

    },
    setWareTableChangeRight() {

      this.wareSelectOne.entity = this.wareSelectTwo.entity;
          this.wareSelectOne.tabDesc = this.wareSelectTwo.tabDesc;
  if(this.tableWareThree.indexOf(this.wareSelectOne) != -1){
      this.wareSelectOne.tabDesc = this.wareSelectTwo.tabDesc;
      if (this.tableWareThree.indexOf(this.wareSelectOne) != -1) {

  }else{
 this.tableWareThree.push(this.wareSelectOne)
      this.tableWareOne.forEach((value, index, array) => {
        if (value.tab == this.wareSelectOne.tab) {
          this.tableWareOne.splice(index, 1)
        }
      })
   this.activeName = '';
      this.activeName2 = '';
      this.activeName3 = '';
  }
      } else {
        this.tableWareThree.push(this.wareSelectOne)
        this.tableWareOne.forEach((value, index, array) => {
          if (value.tab == this.wareSelectOne.tab) {
            this.tableWareOne.splice(index, 1)
          }
        })
        this.activeName = '';
        this.activeName2 = '';
        this.activeName3 = '';
      }
    },
    singleElection(row) {
      this.wareSelectOne = row;
@@ -763,11 +802,11 @@
      const res = await dataUploadDeleteFiles(data);
      if (res.code != 200) {
        this.$message.error('删除失败');
           this.handlerLoading(false);
        this.handlerLoading(false);
        return;
      }
      this.getFileLength();
   this.handlerLoading(false);
      this.handlerLoading(false);



@@ -836,14 +875,15 @@

          this.getFileLength();

           this.$message({
          message: '数据上传成功',
          type: 'success'
        });

          this.$message({
            message: '数据上传成功',
            type: 'success'
          });
      this.clearFileSelect();
        },
        error: (rs) => {
          this.$message.error('数据上传失败');
           this.clearFileSelect();
        }
      });

@@ -895,9 +935,16 @@
    fileSelect() {
      $("#uploadfile").click();
    },
    handleFileChange() {
      var fs = document.getElementById("uploadfile");
    handleFileChange(event) {

      // var fs = document.getElementById("uploadfile");
      var f = event.currentTarget.files[0]
      this.formInline.fileName = f.name;

    },
    clearFileSelect(){
   this.formInline.fileName="未选择文件";
    document.getElementById("uploadfile").value = "";
    },
    //当前时间获取
    timeDefault() {
@@ -957,7 +1004,7 @@
    async getselectVerByDirid() {
      this.verOption = [];
      this.formInline.verid = "";
      const res = await dataLoader_selectVerByDirid({dirid:this.formInline.dirid});
      const res = await dataLoader_selectVerByDirid({ dirid: this.formInline.dirid });

      if (res.code != 200) {
        this.$message.error('版本列表获取失败');
@@ -1077,7 +1124,6 @@
          background-color: #216fe6;
        }
      }

    }
    .primary {
      background: #409eff;
@@ -1231,47 +1277,47 @@
      background-color: #216fe6;
    }
  }
   /deep/.el-tabs__active-bar {
  /deep/.el-tabs__active-bar {
    background: #409eff;
  }
    /deep/ .el-tabs__item {
  /deep/ .el-tabs__item {
    color: #409eff;
  }
     .pagination_box {
        margin-top: 20px;
        /deep/.el-input__inner {
          background-color: transparent !important;
          border: 1px solid;
          color: white;
        }
        /deep/.el-pagination__total {
          color: white;
        }
        /deep/.el-pagination__jump {
          color: white;
        }
        /deep/.el-pager li.active {
          color: #409eff;
        }
        /deep/.el-pager li {
          color: white;
          background: transparent;
        }
        /deep/.el-pager li {
          color: white;
        }
        /deep/.btn-prev {
          background: transparent;
        }
        /deep/.btn-next {
          background: transparent;
        }
        /deep/.btn-next i {
          color: white;
        }
        /deep/.btn-prev i {
          color: white;
        }
      }
  .pagination_box {
    margin-top: 20px;
    /deep/.el-input__inner {
      background-color: transparent !important;
      border: 1px solid;
      color: white;
    }
    /deep/.el-pagination__total {
      color: white;
    }
    /deep/.el-pagination__jump {
      color: white;
    }
    /deep/.el-pager li.active {
      color: #409eff;
    }
    /deep/.el-pager li {
      color: white;
      background: transparent;
    }
    /deep/.el-pager li {
      color: white;
    }
    /deep/.btn-prev {
      background: transparent;
    }
    /deep/.btn-next {
      background: transparent;
    }
    /deep/.btn-next i {
      color: white;
    }
    /deep/.btn-prev i {
      color: white;
    }
  }
}
</style>

 src/views/datamanage/dataUpdata.vue

@@ -40,7 +40,7 @@
              </el-option>
              </el-select>
          </el-form-item>
          <el-form-item :label="$t('dataManage.dataUpObj.entryTime')">
          <!-- <el-form-item :label="$t('dataManage.dataUpObj.entryTime')">
            <el-date-picker
              v-model.trim="formInline.gather"
              :picker-options="pickerOptions"
@@ -48,12 +48,30 @@
              placeholder="请选择"
              value-format="yyyy-MM-dd HH:mm:ss"
            />
          </el-form-item>
          </el-form-item> -->
          <el-form-item>
            <input id="uploadfile" @change= "handleFileChange" type="file"  name="file" multiple="multiple"  style="display: none"></input>
            <el-button icon="el-icon-document-add" @click="fileSelect" class="primary">{{
            <!-- <el-button icon="el-icon-document-add" @click="fileSelect" class="primary">{{
              $t('common.file')
            }}</el-button>
            }}</el-button> -->

            <el-input v-model="formInline.fileName" disabled>
         <template slot="append">
             <el-button v-if="formInline.fileName == '未选择文件'"
              type="info"
                @click="fileSelect">
                   选择文件
             </el-button>
             <el-button
               v-else
                type="info"
                @click="clearFileSelect"
                >
                    重置
             </el-button>
         </template>
      </el-input>

          </el-form-item>
          <br />
          <el-form-item :label="$t('dataManage.dataUpObj.describe')">
@@ -126,12 +144,12 @@
          fixed
         :formatter="changeSizeFile"
        />
         <el-table-column
         <!-- <el-table-column
          align="center"
          prop="guid"
          :label="$t('common.md5')"
          fixed
        />
        /> -->
    </el-table>
      </div>

@@ -288,6 +306,7 @@
      formInline: {
        verid: '',
        gather: '',
        fileName:'未选择文件'
      },
      formWarehousing: {
          name:''
@@ -542,13 +561,14 @@
            message: '上传成功',
            type: 'success'
          });

this.clearFileSelect();
        },
        error: (rs) => {
          alert("上传文件失败！");
          this.clearFileSelect();
        }
      });
      document.getElementById("uploadfile").value = "";

      this.handlerLoading(false);
    },
    //获取文件上传数据
@@ -590,10 +610,15 @@
    fileSelect() {
      $("#uploadfile").click();
    },
    handleFileChange() {
      var fs = document.getElementById("uploadfile");
    handleFileChange(event) {
      var f = event.currentTarget.files[0]
      this.formInline.fileName = f.name;

    },
    clearFileSelect(){
   this.formInline.fileName="未选择文件";
    document.getElementById("uploadfile").value = "";
    },
    //当前时间获取
    timeDefault() {
      var date = new Date();

 src/views/datamanage/projectManage.vue

@@ -57,7 +57,7 @@
              :label="$t('dataManage.projectObj.projtype')"
            />
            <el-table-column
              prop="location"
              prop="geom"
              :label="$t('dataManage.projectObj.location')"
            />
            <el-table-column
@@ -114,7 +114,7 @@
            </el-table-column>
          </el-table>
          <div style="margin-top: 10px" class="pagination_box">
            <el-pagination
            <!-- <el-pagination
              @size-change="handleLoaderSizeChange"
              @current-change="handleLoaderCurrentChange"
              :current-page="listLoader.pageIndex"
@@ -123,7 +123,7 @@
              layout="total, sizes, prev, pager, next, jumper"
              :total="count1"
            >
            </el-pagination>
            </el-pagination> -->
          </div>
          <!-- <el-form
            class="projFrom"
@@ -235,7 +235,7 @@
            <el-input v-model="editFrom.projtype"></el-input>
          </el-form-item>
          <el-form-item :label="$t('dataManage.projectObj.location')">
            <el-input :disabled="true" v-model="editFrom.location"></el-input>
            <el-input :disabled="true" v-model="editFrom.geom"></el-input>
            <el-link
              @click="ShowInner"
              style="color: white; margin-left: 20px"
@@ -307,7 +307,7 @@
      showMap: false,
      count: null,
      projectFrom: {},
      editFrom: { location: ' ' },
      editFrom: { geom: ' ' },
      dirId: null,
      elProject: [],
      dirList: [], //el树数据
@@ -362,7 +362,8 @@
    innerClose() {
      this.showMap = false;
      this.innerVisible = false;
      this.editFrom.location = this.$store.state.projeOl;
      debugger;
      this.editFrom.geom = this.$store.state.projeOl;
    },
    async insertEditFrom() {
      if (this.behavior == '新增项目') {
@@ -386,13 +387,12 @@
      this.setRestEditFrom();
    },
    setRestEditFrom() {
      this.editFrom = { location: ' ' };
      this.editFrom = { geom: ' ' };
      this.$store.state.projeOl = null;
    },

    //删除项目
    async deleteProject(row) {
      debugger;
      const data = await project_delete({ gid: row.gid });
      if (data.code != 200) {
        this.$message.error('项目删除失败');
@@ -405,7 +405,7 @@
      this.behavior = '修改项目';
      this.outerVisible = true;
      this.editFrom = row;
      this.$store.state.projeOl = row.location;
      this.$store.state.projeOl = row.geom;
    },
    //新增项目
    insertProject() {

 src/views/exportMap/index.vue

@@ -275,24 +275,32 @@
          label: '图层',
          children: [
            {
              id: '11',
              id: 11,
              label: '项目',
              value: '项目',
              layer: 'LF:bs_project',
              isEdit: false,
            },
            {
              id: 12,
              label: '站场',
              value: '站场',
              layer: 'LF:m_sitepoint',
              box: [
                84.21228790283203, 30.412200927734375, 121.11393737792969,
                41.46569061279297,
              ],
              isEdit: false,
            },
            {
              id: '12',
              id: 13,
              label: '管道中心线',
              value: '管道中心线',
              layer: 'LF:m_pipeline',
              box: [
                25.245140075683594, 11.197434425354004, 121.11258697509766,
                49.65690231323242,
              ],
              isEdit: false,
            },
            {
              id: 14,
              label: '战略通道',
              value: '战略通道',
              layer: 'LF:th_strategic_channel',
              isEdit: false,
            },
          ],
        },
@@ -322,7 +330,7 @@
    showMapLayer() {
      var val = this.data[0].children;
      var std = [];
      for (var i = val.length - 1; i >= 0; i--) {
      for (var i = 0; i < val.length; i++) {
        var layer2 = new Image({
          name: val[i].label,
          source: new ImageWMS({
@@ -505,8 +513,8 @@
        val_data.push('矢量图');
        val_data.push('矢量注记');
      } else {
        val_data.push('高德影像');
        val_data.push('高德影像注记');
        val_data.push('影像');
        val_data.push('影像注记');
      }
      this.setExportMapLayer(val_data);
      this.showMapApply = false;