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

王旭

2023-05-10 7a0c7de021aebbef3ec137f2f94ff73ab41014d7

 src/views/datamanage/uploadmanage.vue

@@ -129,12 +129,14 @@
            size="small"
            :title="$t('dataManage.vmobj.keyword')"
            v-model="formInline.name"
              :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuedataName')"
          > <i
              @click="getTableData"
              :title="$t('common.iquery')"
              slot="suffix"
              class="el-icon-search"
              style="padding-right: 8px"
            
            ></i></el-input>
        </el-form-item>
        <el-form-item style="float:right">
@@ -440,7 +442,7 @@
      :close-on-click-modal="false"
      :show-close="false"
    >
      <div style="width:100%;height:30vh">
      <div style="width:100%; ">
        <el-form
          ref="form"
          :model="insertLayer"
@@ -457,6 +459,24 @@
              disabled
              v-model="insertLayer.number"
            ></el-input>
          </el-form-item>
          <el-form-item
            :label="$t('dataManage.vmobj.labe14')"
            v-show="formInline.type =='DOM'"
          >
            <el-select
              style="width:100%"
              v-model="insertLayer.noData"
            >
              <el-option
                label="黑色"
                value="0"
              ></el-option>
              <el-option
                label="白色"
                value="255"
              ></el-option>
            </el-select>
          </el-form-item>
          <el-form-item :label="$t('dataManage.vmobj.minLevel')">
            <!-- <el-input
@@ -583,6 +603,9 @@
        value: 'DOM',
        label: '影像数据(.tif, .img)'
      }, {
        value: 'DEM',
        label: '高程数据(.tif)'
      }, {
        value: 'MPT',
        label: '场景数据(.mpt)'
      }, {
@@ -608,7 +631,7 @@
      detailsDialogVisible: false,
      itemdetail: {},
      insertDialogVisible: false,
      insertLayer: { name: '', number: null, min: 4, max: 18 },
      insertLayer: { name: '', number: null, min: 4, max: 18, noData: '0' },
      loadDialogVisible: false,
      options: [],
      isFullscreen: false,
@@ -627,7 +650,7 @@
    },
    setOptions() {
      var std = [];
      for (var i = 0; i < 21; i++) {
      for (var i = 0; i < 23; i++) {
        std.push({
          value: i,
          label: i
@@ -685,7 +708,8 @@
        max: max,
        name: name,
        ids: std,
        type: this.formInline.type
        type: this.formInline.type,
        noData: this.insertLayer.noData
      }
      this.loadDialogVisible = true
      this.insertDialogVisible = false;
@@ -707,12 +731,13 @@
    //数据发布
    async setPagePublish() {
      if (this.multipleSelection.length == 0) {
        this.$message.error("请选择要发布的数据")
        this.$message("请选择要发布的数据")
        return
      }
      if (this.formInline.type == "DOM") {
      if (this.formInline.type == "DOM" || this.formInline.type == "DEM") {
        this.insertLayer.name = this.formInline.dirName;
        this.insertLayer.number = this.multipleSelection.length
        this.insertLayer.noData = '0';
        this.insertDialogVisible = true;
      } else {
        var std = [];
@@ -722,7 +747,6 @@
        var obj = {
          dircode: this.formInline.dirid,
          depcode: this.formInline.depid,

          ids: std,
          type: this.formInline.type
        }