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

王旭

2023-02-23 67769a8a47fe971de05219de20bb65a9e6604f8b

 src/views/Archive/index.vue

@@ -527,27 +527,31 @@
          <el-form-item>
            <el-button
              @click="conditionVisible = true"
              type="info"
              type="success"
                        size="small"
              icon="el-icon-plus"
            >{{$t('common.append')}}</el-button>
          </el-form-item>
          <el-form-item>
            <el-button
              @click="submitForm()"
              type="info"
              type="primary"
              size="small"
              icon="el-icon-search"
            >{{$t('common.iquery')}}</el-button>
          </el-form-item>
          <el-form-item>
            <el-button
              type="info"
                        size="small"
              @click="resetForm()"
              icon="el-icon-search"
            >{{$t('common.reset')}}</el-button>
          </el-form-item>
          <el-form-item>
            <el-button
              type="info"
              type="warning"
                        size="small"
              @click="downloadForm()"
              icon="el-icon-download"
            >{{$t('common.download')}}</el-button>
@@ -829,30 +833,30 @@
          <el-table-column
            type="index"
            width="50"
            label="序号"
            :label="$t('common.index')"
          >
          </el-table-column>
          <el-table-column
            property="descr"
            label="标题"
         :label="$t('common.title')"
          > </el-table-column>
          <el-table-column
            property="name"
            label="文件名称"
         :label="$t('common.fileNme')"
          > </el-table-column>
          <el-table-column
            property="createName"
            label="出图人"
           :label="$t('operatManage.BWL.requestUser')"
          > </el-table-column>
          <el-table-column
            property="createTime"
            :formatter="formatData"
            label="日期"
         :label="$t('dataApply.careatetime')"
          >
          </el-table-column>

          <el-table-column
            label="操作"
             :label="$t('common.download')"
            width="120"
          >
            <template slot-scope="scope">
@@ -1113,10 +1117,14 @@
        return;
      }
      this.downloadLogVisible = false;
 
      var obj = {
        entities: [this.listTypeData.name], // bpachydrogeology,bhydrogeologyattach
        filter: this.listTypeData.filter,
        pwd: encrypt.encrypt(this.codeForm.password)
        pwd: encrypt.encrypt(this.codeForm.password),
        depcodes: [this.listData.depcode],
        dirs: this.listData.dirs

      };
      this.loading = true;
      var that = this;
@@ -1872,6 +1880,7 @@
      var data2 = domains.result;
      this.formInline.fileName = ""
      var std = [];
      this.filedsOption=[];
      for (var i in data1) {

        if (data1[i].type != 'geomtry' && data1[i].type != 'null') {
@@ -2276,8 +2285,8 @@
  /deeep/.el-form-item {
    margin-bottom: 0px;
  }
   /deeep/ .el-dialog__wrapper{
    z-index: 999;
  .el-dialog__wrapper {
    z-index: 9999;
  }
}
</style>