项目管理界面优化，字典管理页面左侧树界面优化，数据上传版本显示错误优化，综合展示二三维切换效果优化

Surpriseplus

2023-02-28 cbc4fc2e4dce714c5d5723746368266915868007

 src/views/datamanage/dataUpdata.vue

@@ -10,6 +10,7 @@
      ]"></My-bread>
    <el-divider />
    <el-tabs
      type="card"
      v-model="activeTabName"
      @tab-click="handleTabClick"
    >
@@ -18,7 +19,10 @@
        :label="$t('dataManage.dataUpObj.uploaddata')"
        name="first"
      >
        <div class="inquire subpage_Div" ref="container">
        <div
          class="inquire subpage_Div"
          ref="container"
        >
          <el-form
            :inline="true"
            :model="formInline"
@@ -28,6 +32,7 @@
            <el-form-item
              :label="$t('dataManage.dataUpObj.UploadType')"
              style="margin-right: 2%"
              size="small"
            >
              <el-select
                :disabled="tableData.length == 0 ? false : true"
@@ -36,19 +41,31 @@
                :popper-append-to-body="false"
                placeholder="请选择"
              >
                <!--                <el-option
                                  v-for="item in uploadOption"
                                  :key="item.value"
                                  :label="item.label"
                                  :value="item.value"
                                ></el-option>-->

                <el-option
                  v-for="item in uploadOption"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                ></el-option>
                  :label="$t('shuJuGuanLi.pselect.dFile')"
                  value="v1"
                />
                <el-option
                  :label="$t('shuJuGuanLi.pselect.dFiles')"
                  value="v2"
                />

              </el-select>

            </el-form-item>
            <!-- 存储目录 -->
            <el-form-item
              style="margin-right: 2%"
              v-show="uploadFlag"
              :label="$t('dataManage.dataUpObj.storageDirectory')"
              size="small"
            >
              <el-select
                :popper-append-to-body="false"
@@ -83,6 +100,7 @@
              style="margin-right: 2%"
              v-show="!uploadFlag"
              :label="$t('dataManage.dataUpObj.entryName')"
              size="small"
            >
              <el-select
                :popper-append-to-body="false"
@@ -103,6 +121,7 @@
            <el-form-item
              :label="$t('dataManage.dataUpObj.dataVersion')"
              style="margin-right: 2%"
              size="small"
            >
              <el-select
                :popper-append-to-body="false"
@@ -123,6 +142,7 @@
            <el-form-item
              :label="$t('dataManage.dataUpObj.dataSpecialty')"
              style="margin-right: 2%"
              size="small"
            >
              <el-select
                :popper-append-to-body="false"
@@ -130,19 +150,37 @@
                v-model="formInline.specialtyId"
                :placeholder="$t('common.choose')"
              >
                <!--                <el-option
                                  v-for="item in specialtyOption"
                                  :key="item.value"
                                  :label="item.label"
                                  :value="item.value">
                                </el-option>-->

                <el-option
                  v-for="item in specialtyOption"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                >
                </el-option>
                  :label="$t('shuJuGuanLi.pselect.SurveyDiscipline')"
                  value="测量专业"
                />
                <el-option
                  :label="$t('shuJuGuanLi.pselect.SurveysDiscipline')"
                  value="勘察专业"
                />
                <el-option
                  :label="$t('shuJuGuanLi.pselect.GeologicalDisasterSpecialty')"
                  value="地灾专业"
                />
                <el-option
                  :label="$t('shuJuGuanLi.pselect.CavernSpecialty')"
                  value="洞库专业"
                />

              </el-select>
            </el-form-item>
            <!-- 坐标系 -->
            <el-form-item
              :label="$t('dataManage.dataUpObj.coordinateSystem')"
              style="margin-right: 3%"
              size="small"
            >
              <el-select
                :popper-append-to-body="false"
@@ -161,22 +199,25 @@
            </el-form-item>
            <div class="flex_box">
              <div style="margin-right: auto">
                 <!-- 选择数据 -->
                <el-form-item>
                <!-- 选择数据 -->
                <el-form-item size="small">
                  <el-link
                    :disabled="tableData.length == 0 ? false : true"
                    v-show="formInline.specialtyData == '请选择数据'"
                    @click="setSelectFile"
                    :underline="false"
                    type="primary"
                  >{{$t('dataManage.dataUpObj.selectData') }}</el-link>
                  >{{ $t('dataManage.dataUpObj.selectData') }}
                  </el-link>
                  <el-link
                    v-show="formInline.specialtyData != '请选择数据'"
                    @click="restSelectFile"
                    :underline="false"
                    type="primary"
                  >{{$t('common.reset') }}</el-link>
                  >{{ $t('common.reset') }}
                  </el-link>
                  <input
                    size="small"
                    id="selectDataFile"
                    type="file"
                    name="file"
@@ -186,30 +227,35 @@
                    style="display: none"
                  ></input>
                </el-form-item>
                <el-form-item>
                <el-form-item size="small">
                  <el-input
                    placeholder="请输入内容"
                    :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
                    v-model="formInline.specialtyData"
                    style="width:210px;"
                    style="width:200px;"
                    disabled
                  >
                  </el-input>
                </el-form-item>
                <!-- 选择元数据 -->
                <el-form-item v-show="uploadFlag">
                <el-form-item
                  v-show="uploadFlag"
                  style="padding-left: 16px"
                >
                  <el-link
                    :disabled="tableData.length == 0 ? false : true"
                    v-show="formInline.metaData == '请选择元数据'"
                    @click="setMetaFile"
                    :underline="false"
                    type="primary"
                  >{{$t('dataManage.dataUpObj.selectMetadata') }}</el-link>
                  >{{ $t('dataManage.dataUpObj.selectMetadata') }}
                  </el-link>
                  <el-link
                    v-show="formInline.metaData != '请选择元数据'"
                    @click="restMetaFile"
                    :underline="false"
                    type="primary"
                  >{{$t('common.reset') }}</el-link>
                  >{{ $t('common.reset') }}
                  </el-link>
                  <input
                    id="metaDataFile"
                    type="file"
@@ -222,104 +268,113 @@
                </el-form-item>
                <el-form-item
                  v-show="uploadFlag"
                  size="small"
                >
                  <el-input
                    placeholder="请输入内容"
                    :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
                    v-model="formInline.metaData"
                    style="width:210px;"
                    style="width:200px;"
                    disabled
                  >
                  </el-input>
                </el-form-item>
                <!-- 选择WBS数据 -->
                <el-form-item v-show="!uploadFlag">
              <el-link
                :disabled="tableData.length == 0 ? false : true"
                v-show="formInline.wbsData == '请选择WBS数据'"
                @click="setWBSFile"
                :underline="false"
                type="primary"
              >{{$t('dataManage.dataUpObj.selectWBSData') }}</el-link>
              <el-link
                :disabled="tableData.length == 0 ? false : true"
                v-show="formInline.wbsData != '请选择WBS数据'"
                @click="restWBSFile"
                :underline="false"
                type="primary"
              >{{$t('common.reset') }}</el-link>
              <input
                id="wbsDataFile"
                type="file"
                name="file"
                multiple="multiple"
                accept=".xls,.xlsx"
                style="display: none"
                @change="handleWBSFileChange"
              ></input>
                  <el-link
                    :disabled="tableData.length == 0 ? false : true"
                    v-show="formInline.wbsData == '请选择WBS数据'"
                    @click="setWBSFile"
                    :underline="false"
                    type="primary"
                  >{{ $t('dataManage.dataUpObj.selectWBSData') }}
                  </el-link>
                  <el-link
                    :disabled="tableData.length == 0 ? false : true"
                    v-show="formInline.wbsData != '请选择WBS数据'"
                    @click="restWBSFile"
                    :underline="false"
                    type="primary"
                  >{{ $t('common.reset') }}
                  </el-link>
                  <input
                    id="wbsDataFile"
                    type="file"
                    name="file"
                    multiple="multiple"
                    accept=".xls,.xlsx"
                    style="display: none"
                    @change="handleWBSFileChange"
                  ></input>
                </el-form-item>
                <el-form-item v-show="!uploadFlag">
              <el-input
                placeholder="请选择WBS数据"
                v-model="formInline.wbsData"
                style="width:210px;"
                disabled
              >
              </el-input>
                  <el-input
                    placeholder="请选择WBS数据"
                    v-model="formInline.wbsData"
                    style="width:210px;"
                    disabled
                  >
                  </el-input>
                </el-form-item>
              </div>
              <div>
                <el-form-item>
              <!-- 上传 -->
              <el-button
                v-if="menuStatus.upload"
                :disabled="tableData.length == 0 ? false : true"
                @click="setFileUpload"
                size="small"
                icon="el-icon-upload"
                type="success"
              >{{
              $t('common.upload')
            }}</el-button>
              <!-- 删除 -->
              <el-button
                v-if="menuStatus.delete"
                :disabled="multipleSelection.length == 0 ? true : false"
                icon="el-icon-delete"
                size="small"
                @click="setFileDelete"
                type="danger"
              >{{ $t('common.delete') }}</el-button>
              <!-- 入库 -->
              <el-button
                v-if="menuStatus.insert"
                @click="setFileWare"
                size="small"
                :disabled="tableData.length == 0 ?  true: false"
                icon="el-icon-folder-add"
                type="warning"
              >{{ $t('common.Warehousin') }}</el-button>
              <!-- 质检 -->
              <el-button
                style="margin-right:-9px"
                v-if="menuStatus.insert"
                :disabled="multipleSelection.length == 0 ? true : false"
                type="info"
                size="small"
                icon="el-icon-folder-checked"
                @click="handleQuayTestClick()"
              >{{$t('common.quayTest')}}
              </el-button>
                  <!-- 上传 -->
                  <el-button
                    v-if="menuStatus.upload"
                    :disabled="tableData.length == 0 ? false : true"
                    @click="setFileUpload"
                    size="small"
                    icon="el-icon-upload"
                    type="success"
                  >{{
                      $t('common.upload')
                    }}
                  </el-button>
                  <!-- 删除 -->
                  <el-button
                    v-if="menuStatus.delete"
                    :disabled="multipleSelection.length == 0 ? true : false"
                    icon="el-icon-delete"
                    size="small"
                    @click="setFileDelete"
                    type="danger"
                  >{{ $t('common.delete') }}
                  </el-button>
                  <!-- 入库 -->
                  <el-button
                    v-if="menuStatus.insert"
                    @click="setFileWare"
                    size="small"
                    :disabled="tableData.length == 0 ?  true: false"
                    icon="el-icon-folder-add"
                    type="warning"
                  >{{ $t('common.Warehousin') }}
                  </el-button>
                  <!-- 质检 -->
                  <el-button
                    style="margin-right:-9px"
                    v-if="menuStatus.insert"
                    :disabled="multipleSelection.length == 0 ? true : false"
                    type="info"
                    size="small"
                    icon="el-icon-folder-checked"
                    @click="handleQuayTestClick()"
                  >{{ $t('common.quayTest') }}
                  </el-button>

                </el-form-item>
              </div>
            </div>
           
          

          </el-form>
         

        </div>
        <!-- 上传数据列表 -->
        <div class="table_box" :style="styleVar">
        <div class="dividing-line"></div>
        <div
          class="table_box"
          :style="styleVar"
        >
          <el-table
            style="width:100%"
            :data="tableData"
@@ -383,175 +438,204 @@
        :label="$t('dataManage.dataUpObj.receiptdata')"
        name="second"
      >
        <div class="inquire subpage_Div" ref="container1">
        <div
          class="inquire subpage_Div"
          ref="container1"
        >
          <el-form
            :inline="true"
            :model="formWarehousing"
            class="demo-form-inline"
          >
          <div class="flex_box">
            <div style="margin-right: auto">
            <el-form-item :label="$t('dataManage.dataUpObj.describe')">
              <el-input
                v-model="formWarehousing.name"
                placeholder="请输入内容"
                style="width: 200px;"
              ></el-input>
            </el-form-item>
            <div class="flex_box">
              <div style="margin-right: auto">
                <el-form-item
                  size="small"
                  :label="$t('dataManage.dataUpObj.describe')"
                >
                  <el-input
                    v-model="formWarehousing.name"
                    :placeholder="$t('shuJuGuanLi.lable1')"
                    style="width: 200px;"
                  ><i
                      slot="suffix"
                      class="el-icon-search"
                      @click="setWarehouseSearch"
                      style="padding-right: 8px"
                    ></i></el-input>
                </el-form-item>
              </div>
              <div>
                <el-form-item>
                  <el-button
                    v-if="menuStatus.upload"
                    :disabled="multipleDelete.length == 0 ? true : false"
                    @click="setEnclosure"
                    icon="el-icon-folder-opened"
                    type="success"
                    size="small"
                  >{{ $t('common.enclosure') }}
                  </el-button>
                  <el-button
                    v-if="menuStatus.delete"
                    @click="setWarehouseDel"
                    icon="el-icon-folder-delete"
                    type="danger"
                    size="small"
                  >{{ $t('common.delete') }}
                  </el-button>
                  <!--                  <el-button
                      @click="setWarehouseSearch"
                      icon="el-icon-upload"
                      size="small"
                      class="primary"
                  >{{
                      $t('common.iquery')
                    }}
                  </el-button>-->
                  <el-button
                    @click="setWarehouseReset"
                    icon="el-icon-folder-add"
                    size="small"
                    type="info"
                  >{{ $t('common.reset') }}
                  </el-button>
                </el-form-item>
              </div>
            </div>
            <div>
  <el-form-item>
              <el-button
                v-if="menuStatus.delete"
                @click="setWarehouseDel"
                icon="el-icon-folder-delete"
                type="danger"
                size="small"
              >{{ $t('common.delete') }}</el-button>
              <el-button
                @click="setWarehouseSearch"
                icon="el-icon-upload"
                size="small"
                class="primary"
              >{{
              $t('common.iquery')
            }}</el-button>
              <el-button
                @click="setWarehouseReset"
                icon="el-icon-folder-add"
                size="small"
                type="info"
              >{{ $t('common.reset') }}</el-button>
            </el-form-item>
            <el-form-item>
              <el-button
                v-if="menuStatus.upload"
                :disabled="multipleDelete.length == 0 ? true : false"
                @click="setEnclosure"
                icon="el-icon-folder-opened"
                type="success"
                size="small"
              >{{ $t('common.enclosure') }}</el-button>
            </el-form-item>
            </div>
          </div>
           
          

          </el-form>
        </div>
        <!-- 入库 -->
        
            <div class="table_box"  :style="styleVar1">
              <el-table
                ref="filterTable"
                :data="waretableData"
                style="width: 100%"
                height="calc(100% - 57px)"
                @selection-change="handleDelteChange"
              >
                <el-table-column
                  type="selection"
                  width="55"
                >
                </el-table-column>
                <el-table-column
                  align="center"
                  type="index"
                  :label="$t('common.index')"
                  width="70px"
                ></el-table-column>
                <el-table-column
                  align="center"
    
                  :label="$t('common.name')"
          
                  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"
                  :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-column
                  align="center"
                  prop="uname"
                  :label="$t('dataManage.vmobj.createonuser')"
                />
                <el-table-column
                  align="center"
                  prop="createTime"
                  :label="$t('dataManage.vmobj.createontime')"
                  :formatter="changetimeFile"
                  width="100"
                />
              </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="count"
              >
              </el-pagination>
            </div>
            </div>
           
         
        <div class="dividing-line"></div>
        <div
          class="table_box"
          :style="styleVar1"
        >
          <el-table
            ref="filterTable"
            :data="waretableData"
            style="width: 100%"
            height="calc(100% - 57px)"
            @selection-change="handleDelteChange"
          >
            <el-table-column
              type="selection"
              width="55"
            >
            </el-table-column>
            <el-table-column
              align="center"
              type="index"
              :label="$t('common.index')"
              width="70px"
            ></el-table-column>
            <el-table-column
              align="center"
              :label="$t('common.name')"
              width="120"
            >
              <template slot-scope="scope">
                <span v-if="scope.row.ismeta > 0">
                  <el-link
                    style="color:#409eff"
                    title="源数据查询"
                    @click="setQueryMetaData(scope.row)"
                    target="_blank"
                  >{{ scope.row.name }}</el-link>

                </span>
                <span v-else-if="scope.row.metaid > 0">
                  <el-link
                    style="color:#409eff"
                    title="元数据查询"
                    @click="setMetaDataQuery(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"
              :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-column
              align="center"
              prop="uname"
              :label="$t('dataManage.vmobj.createonuser')"
            />
            <el-table-column
              align="center"
              prop="createTime"
              :label="$t('dataManage.vmobj.createontime')"
              :formatter="changetimeFile"
              width="100"
            />
          </el-table>
          <div
            class="pagination_box"
            style="margin-top: 15px"
          >
            <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="count"
            >
            </el-pagination>
          </div>
        </div>

      </el-tab-pane>
    </el-tabs>
    <!-- 质检弹窗 -->
@@ -559,7 +643,6 @@
      title="数据质检"
      :visible.sync="quayTestVisible"
      width="70%"
      top="2vh"
      :modal="false"
      :before-close="handleQuayTestCloseDown"
    >
@@ -592,7 +675,8 @@
            <el-checkbox
              checked
              disabled
            >属性检查：(*dlg*.gdb+*地形图**.dwg)</el-checkbox>
            >属性检查：(*dlg*.gdb+*地形图**.dwg)
            </el-checkbox>
          </div>
          <div
            class="ContBox"
@@ -601,7 +685,8 @@
            <el-checkbox
              checked
              disabled
            >数学基础检查：(.shp,.dlg)</el-checkbox>
            >数学基础检查：(.shp,.dlg)
            </el-checkbox>
          </div>
          <div
            class="ContBox"
@@ -610,7 +695,8 @@
            <el-checkbox
              checked
              disabled
            >图面整饰检查：(.dwg)</el-checkbox>
            >图面整饰检查：(.dwg)
            </el-checkbox>
          </div>
          <div
            class="ContBox"
@@ -619,7 +705,8 @@
            <el-checkbox
              checked
              disabled
            >表格数据检查：(.xls/.xlsx)</el-checkbox>
            >表格数据检查：(.xls/.xlsx)
            </el-checkbox>
          </div>
          <div
            class="ContBox"
@@ -628,7 +715,8 @@
            <el-checkbox
              checked
              disabled
            >原点检查：(*剖面图*.dwg)</el-checkbox>
            >原点检查：(*剖面图*.dwg)
            </el-checkbox>
          </div>
          <div
            class="ContBox"
@@ -637,7 +725,8 @@
            <el-checkbox
              checked
              disabled
            >元数据检查：(*元数据*.xls/.xlsx)</el-checkbox>
            >元数据检查：(*元数据*.xls/.xlsx)
            </el-checkbox>
          </div>
          <div
            class="ContBox"
@@ -652,7 +741,8 @@
                <el-checkbox
                  checked
                  disabled
                >拓扑检查：(*地形图*.dwg)</el-checkbox>
                >拓扑检查：(*地形图*.dwg)
                </el-checkbox>
              </el-form-item>
              <el-form-item>
                <div class="ContDiv">
@@ -709,7 +799,8 @@
                <el-checkbox
                  checked
                  disabled
                >栅格检查：(.tif/.img)</el-checkbox>
                >栅格检查：(.tif/.img)
                </el-checkbox>
              </el-form-item>
              <el-form-item>
                <div class="ContDiv">
@@ -742,7 +833,8 @@
                <el-checkbox
                  checked
                  disabled
                >高程检查：(.tif/.img)</el-checkbox>
                >高程检查：(.tif/.img)
                </el-checkbox>
              </el-form-item>
              <el-form-item>
                <div class="ContDiv">
@@ -775,7 +867,8 @@
                <el-checkbox
                  checked
                  disabled
                >点云检查：(.laz + *激光点云*.xls/.xlsx)</el-checkbox>
                >点云检查：(.laz + *激光点云*.xls/.xlsx)
                </el-checkbox>
              </el-form-item>
              <el-form-item>
                <div class="ContDiv">
@@ -800,7 +893,8 @@
                <el-checkbox
                  checked
                  disabled
                >OSGB检查：(.osgb + *倾斜摄影*.xls/.xlsx) </el-checkbox>
                >OSGB检查：(.osgb + *倾斜摄影*.xls/.xlsx)
                </el-checkbox>
              </el-form-item>
              <el-form-item>
                <div class="ContDiv">
@@ -834,50 +928,49 @@
    <el-dialog
      title="数据质检"
      :visible.sync="testQuayVisible"
      top="2vh"
      :modal="false"
      :before-close="handleTestQuayCloseDown"

    >
      <el-form :model="formCheckAll" label-position="top">
      <el-form
        :model="formCheckAll"
        label-position="top"
      >
        <el-form-item label="项目名称">
         
            <el-input
              disabled
              v-model="formCheckAll.xmmc"
              style="width:85%"
            ></el-input>
     

          <el-input
            disabled
            v-model="formCheckAll.xmmc"
            style="width:85%"
          ></el-input>

        </el-form-item>
        <el-form-item label="所属专业">

       
            <el-input
              disabled
              v-model="formCheckAll.sjzy"
              style="width:85%"
            ></el-input>
    
          <el-input
            disabled
            v-model="formCheckAll.sjzy"
            style="width:85%"
          ></el-input>

        </el-form-item>
        <el-form-item
          v-show="formCheckAll.isDiZai"
          label="所属专业"
        >
         
            <el-select
              v-model="formCheckAll.diZaiType"
              placeholder="请选择"
              style="width:85%"

          <el-select
            v-model="formCheckAll.diZaiType"
            placeholder="请选择"
            style="width:85%"
          >
            <el-option
              v-for="item in disOptions"
              :key="item.value"
              :label="item.label"
              :value="item.value"
            >
              <el-option
                v-for="item in disOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              >
              </el-option>
            </el-select>
      
            </el-option>
          </el-select>

        </el-form-item>
      </el-form>
@@ -908,7 +1001,6 @@
      :title="$t('dataManage.datawarehousing')"
      :visible.sync="dialogWarehousing"
      width="70%"
      top="2vh"
    >
      <div class="dialogBox">
        <div class="transFarBox subpage_Div">
@@ -917,7 +1009,8 @@
              @click="singleElection(item)"
              v-for="(item, i) in tableWareOne"
              :class="{ active: activeName == item.eventid }"
            >{{item.tab}} ({{item.type}})</li>
            >{{ item.tab }} ({{ item.type }})
            </li>
          </ul>
        </div>
        <div class="tarnsbtton">
@@ -934,14 +1027,16 @@
              @click="singleElection2(item)"
              v-for="(item, i) in tableWareTwo"
              :class="{ active: activeName2 == item.entity }"
            >{{item.tabDesc}} ( {{item.ns}}.{{item.tab}})</li>
            >{{ item.tabDesc }} ( {{ item.ns }}.{{ item.tab }})
            </li>
          </ul>
        </div>
        <div class="tarnsbtton">
          <div>
            <div style="padding:2%">
              <el-link @click="setWareTableChangeLeft"><i class="el-icon-d-arrow-left"></i></el-link>
            </div><br />
            </div>
            <br />
            <div style="padding:2%">
              <el-link><i
                  @click="setWareTableChangeRight"
@@ -956,7 +1051,8 @@
              @click="singleElection3(i)"
              v-for="(item, i) in tableWareThree"
              :class="{ active: activeName3 ==( item.tab+i)}"
            >{{item.tab}} ( {{item.tabDesc}} {{item.ns}}.{{item.tabs}} )</li>
            >{{ item.tab }} ( {{ item.tabDesc }} {{ item.ns }}.{{ item.tabs }} )
            </li>
          </ul>
        </div>
      </div>
@@ -985,7 +1081,6 @@
      :title="$t('common.details')"
      :visible.sync="dialogVisible"
      width="70%"
       top="2vh"
    >
      <div style="height: 500px; overflow: auto">
        <el-table
@@ -1010,7 +1105,7 @@
          ></el-table-column>
        </el-table>
        <div
          style="margin-top: 10px"
          style="margin-top: 15px"
          class="pagination_box"
        >
          <el-pagination
@@ -1032,7 +1127,6 @@
      title="上传进度"
      :visible.sync="jindudialogVisible"
      width="30%"
       top="2vh"
    >
      <div>
        <div>
@@ -1051,12 +1145,11 @@
      :title="$t('common.details')"
      :visible.sync="enclosureVisible"
      :show-close="false"
       top="2vh"
    >
      <span
        style="font-size:20px"
        class="scopeRowColor"
      >{{enclosureTitle}}不能上传附件是否继续</span>
      >{{ enclosureTitle }}不能上传附件是否继续</span>
      <span
        slot="footer"
        class="dialog-footer"
@@ -1068,101 +1161,113 @@
        >继续</el-button>
      </span>
    </el-dialog>
   <el-dialog
    <el-dialog
      :title="fromQueryMeta.title"
      :visible.sync="queryMetaFlag"
      width="70%" 
      top="2vh"
      width="70%"
    >
    <div style="height: 500px; overflow: auto;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% - 130px)"
                
              >
             
                <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
         
      <div style="height: 500px; overflow: auto;width:100%; ">
        <el-form
          :inline="true"
          :model="fromQueryMeta"
          class="demo-form-inline"
        >
          <el-form-item>
            <el-input
              size="small"
              v-model="fromQueryMeta.name"
              :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
              suffix-icon="el-icon-edit"
            ></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% - 130px)"
        >

          <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
          style="margin-top: 15px"
          class="pagination_box"
        >
          <el-pagination
@@ -1176,8 +1281,89 @@
          >
          </el-pagination>
        </div>
    </div>
     
      </div>

    </el-dialog>
    <el-dialog
      :title="fromQueryMeta.title"
      :visible.sync="queryMetaFlag1"
      width="70%"
    >
      <div style="height: 65vh; width: 100%">

        <el-table
          ref="filterTable"
          :data="metaDataTable1"
          style="width: 100%"
          height="100%"
        >
          <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>
    </el-dialog>
    <input
      name="file1"
@@ -1196,24 +1382,26 @@
import MyBread from "../../components/MyBread.vue";
import { getToken } from "@/utils/auth";
import {
  dataUploadSelectPath,
  selectdirTab,
  dataUploadSelectVerByDirid,
  dataUpload_selectByPageForUpload,
  dataUpload_deleteMetas,
  dataUpload_selectCoords,
  dataUpload_selectProject,
  dataUploadSelectFiles,
  dataUploadDeleteFiles,
  dataUpload_uploadChecks,
  dataUpload_selectTaskStatus,
  dataUpload_selectMappers,
  dataUpload_selectTabs,
  dataUpload_insertFiles,
  dataUpload_selectFields,
  dataUpload_selectByPageForUpload,
  dataUpload_selectCoords,
  dataUpload_selectDbData,
  dataUpload_selectFields,
  dataUpload_selectMappers,
  dataUpload_selectPageAndCountByPid,
  dataUpload_selectProject,
  dataUpload_selectTabs,
  dataUpload_selectTaskStatus,
  dataUpload_uploadChecks,
  dataUploadDeleteFiles,
  dataUploadSelectFiles,
  dataUploadSelectPath,
  dataUploadSelectVerByDirid,
  dataUpload_selectMetaById,
  selectdirTab,
} from "../../api/api";

export default {
  name: "dataUpdata",
  components: {
@@ -1274,7 +1462,6 @@
        demTolerance: "5",
        demChangeRate: "200",
        lazDensity: "1",
        imgResolution: "0.2",
      },
      quayTestShow: {
        checkOsgb: false,
@@ -1320,7 +1507,6 @@
      formInline: {
        uploadType: "v1",
        dirid: null,
        verid: null,
        specialtyId: "测量专业",
        specialtyData: "请选择数据",
        metaData: "请选择元数据",
@@ -1374,8 +1560,8 @@
      dbTableData: [],
      dialogVisible: false,
      listLoader: {
        id: null,
        pageSize: 1,
        dirid: null,
        pageIndex: 1,
        pageSize: 10,
      },
      count1: 0,
@@ -1409,18 +1595,19 @@
        pageSize: 10,
        count: 0,
      },
      queryMetaFlag: true,
      queryMetaFlag: false,
      fromQueryMeta: {
        title: "",
        name: "",
      },
      metaDataTable: [],
      queryMetaFlag1: false,
      metaDataTable1: [],
    };
  },

  mounted() {
    //获取目录
    this.getSelectdirTab();

    //获取坐标系
    this.setCoordinateSystem();
    //获取项目名称
@@ -1431,6 +1618,8 @@
    this.getPerms();
    window.addEventListener("resize", this.onResize);
    this.calHeight();
    //获取目录
    this.getSelectdirTab();
  },
  beforeDestroy() {
    this.timer && clearTimeout(this.timer);
@@ -1464,6 +1653,22 @@
      this.listMetaData.pageIndex = val;
      this.startQueryMetaData();
    },

    //元数据查询
    async setMetaDataQuery(row) {
      this.fromQueryMeta.title = row.name;
      this.listMetaData = {
        id: row.metaid,
      };
      const data = await dataUpload_selectMetaById(this.listMetaData);
      if (data.code != 200) {
        return;
      }
      this.queryMetaFlag1 = true;
      this.metaDataTable1 = [data.result];
    },


    //元数据查询
    setQueryMetaData(row) {
      this.fromQueryMeta.title = row.name;
@@ -1498,8 +1703,8 @@
        const rect1 = this.$refs.container1.getBoundingClientRect();

        this.tableHeight = `${rect.height + 40}px`;
        this.styleVar["height"] = `calc(100% - ${rect.height + 40}px)`;
        this.styleVar1["height"] = `calc(100% - ${rect1.height + 40}px)`;
        this.styleVar["height"] = `calc(100% - ${rect.height + 28}px)`;
        this.styleVar1["height"] = `calc(100% - ${rect1.height + 28}px)`;
      });
    },
    editFromDataClose() {
@@ -1529,10 +1734,10 @@
      this.loading = true;
      $.ajax(
        BASE_URL +
          "/dataUpload/uploadXlsAnnex?token=" +
          getToken() +
          "&path=" +
          this.formInline.path,
        "/dataUpload/uploadXlsAnnex?token=" +
        getToken() +
        "&path=" +
        this.formInline.path,
        {
          type: "post",
          data: formData,
@@ -1576,7 +1781,8 @@
      $("#editimageFile").click();
    },
    //上传附件
    uploadAnnex() {},
    uploadAnnex() {
    },
    //附件上传
    setEnclosure() {
      var enclosureData = [
@@ -2258,10 +2464,10 @@
      this.loading = true;
      $.ajax(
        BASE_URL +
          "/dataUpload/uploadFiles?token=" +
          token +
          "&path=" +
          this.formInline.path,
        "/dataUpload/uploadFiles?token=" +
        token +
        "&path=" +
        this.formInline.path,
        {
          type: "post",
          data: formData,
@@ -2380,7 +2586,8 @@
        .then((_) => {
          this.closeTestQuayCloseDialog();
        })
        .catch((_) => {});
        .catch((_) => {
        });
    },
    closeTestQuayCloseDialog() {
      this.testQuayVisible = false;
@@ -2391,7 +2598,8 @@
        .then((_) => {
          this.closeQuayTestCloseDialog();
        })
        .catch((_) => {});
        .catch((_) => {
        });
    },
    closeQuayTestCloseDialog() {
      this.quayTestVisible = false;
@@ -2636,6 +2844,7 @@
      const res = await dataUploadSelectVerByDirid({
        dirid: this.formInline.dirid,
      });

      if (res.code != 200) {
        this.$message.error("版本列表获取失败");
        return;
@@ -2650,9 +2859,11 @@
        this.$message.error("目录列表获取失败");
        return;
      }
      debugger
      this.catalogOption = this.treeData(res.result);
      this.formInline.dirName = this.catalogOption[0].name;
      this.getStartDirChecked(this.catalogOption);
      this.formInline.dirid = this.catalogOption[0].id;
      // this.getStartDirChecked(this.catalogOption);
      this.getselectVerByDirid();
    },

@@ -2742,7 +2953,7 @@
<style lang="less" scoped>
.bottom {
  width: 100%;
  margin-top: 1%;
  margin-top: 0.5%;
  // height: 74%;
  height: 570px;
  display: flex;
@@ -2754,6 +2965,7 @@

    border-radius: 5px;
    padding: 1%;

    .table_box {
      width: 100%;
      height: 93%;
@@ -2761,30 +2973,36 @@
      overflow: auto;
    }
  }
  /deeep/.el-loading-mask {

  /deeep/ .el-loading-mask {
    z-index: 9999;
  }
}

.inquire {
  padding: 8px;
  margin-top: 20px;
  //margin-top: 20px;

  border-radius: 5px;

  margin-bottom: 20px;
  //margin-bottom: 20px;
  .el-form-item {
    margin: 5px;
  }
}

.el-tabs {
  height: calc(100% - 70px);
  height: calc(100% - 18px);
}

/deep/ .el-tabs__content {
  height: calc(100% - 49px);
}

/deep/ .el-tab-pane {
  height: 100%;
}

.text-center {
  text-align: center;
}