Merge branches 'master' and 'master' of http://103.85.165.99:8989/r/LFWEB_NEW

TreeWish

2023-02-28 c900c0914a81a1f373ad18e0fa7458b35eb6502c

Merge branches 'master' and 'master' of http://103.85.165.99:8989/r/LFWEB_NEW

 src/views/Archive/index.vue

@@ -966,6 +966,7 @@
      }
    };
    return {

      fromSqlflag: false,
      filedsOption: [],
      condOption: [],
@@ -1063,6 +1064,9 @@
    this.signGetPublicKey();
  },
  methods: {
    getAttachTable() {

    },
    setRestMetaData() {
      this.fromQueryMeta.name = "";
      this.listMetaData.name = this.fromQueryMeta.name;
@@ -1391,15 +1395,21 @@
    },
    //重置
    setQuerAllTablesRefresh() {
      this.formInline = {
        fileName: "",//高级搜索
        dataType: "type2", //数据类型
        category: [], //查询类别,
        item: [],
        depcode: this.depOption[0].code,
        depName: this.depOption[0].name,
        keywords: '',
      }
      // this.formInline = {
      //   fileName: "",//高级搜索
      //   dataType: "type2", //数据类型
      //   category: [], //查询类别,
      //   item: [],
      //   depcode: null, //单位,
      //   depName: null,//单位,
      //   keywords: '',
      // }
      this.formInline.fileName = "";//高级搜索
      this.formInline.category = [];//高级搜索
      this.formInline.item = [];//高级搜索
      this.formInline.depcode = null;//高级搜索
      this.formInline.depName = null;//高级搜索
      this.formInline.keywords = "";//高级搜索
      this.getAllTabesData();
    },
    handleSelectionChange() {
@@ -1796,8 +1806,8 @@
        return this.$message.error('单位列表获取失败');
      }
      this.depOption = this.treeData(data.result);
      this.formInline.depcode = this.depOption[0].code
      this.formInline.depName = this.depOption[0].name;
      // this.formInline.depcode = this.depOption[0].code
      // this.formInline.depName = this.depOption[0].name;
      this.getAllTabesData();
    },
    //树列表生成

 src/views/datamanage/catalogueManage.vue

@@ -151,6 +151,20 @@
            />
          </el-form-item>
          <el-form-item
            :label="$t('dataManage.dataUpObj.inspectionItems')"
            :label-width="formLabelWidth"
          >
            <el-input
              v-model="itemdetail.checks"
              type="textarea"
              style=" max-width: 420px"
              :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
              clearable
            />
            <!--            resize="none"-->
            <!--            style="height: 100%; overflow: auto; max-width: 400px"-->
          </el-form-item>
          <el-form-item
            :label="$t('dataManage.dataUpObj.fileExtension')"
            :label-width="formLabelWidth"
          >
@@ -161,8 +175,6 @@
              :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
              clearable
            />
            <!--            resize="none"-->
            <!--            style="height: 100%; overflow: auto; max-width: 400px"-->
          </el-form-item>
          <!--          <el-form-item
            :label="$t('dataManage.dataUpObj.inspectionItems')"
@@ -445,7 +457,9 @@
            obj.name = v.name;
            obj.pname = v.pname;
            obj.descr = v.explain;
            obj.checks = v.checks;
            obj.bak = v.bak;
            obj.exts = v.exts;
            obj.orderNum = null;
            obj.pid = null;
            arr.push(obj);

 src/views/datamanage/dataUpdata.vue

@@ -955,7 +955,7 @@
        </el-form-item>
        <el-form-item
          v-show="formCheckAll.isDiZai"
          label="所属专业"
          label="地灾类型"
        >

          <el-select
@@ -1515,6 +1515,7 @@
        selectFileType: "*.*",
        coordinateId: null,
        path: null,
        verid: null,
      },
      cascader: {
        label: "name",
@@ -1603,6 +1604,7 @@
      metaDataTable: [],
      queryMetaFlag1: false,
      metaDataTable1: [],
      getCheckedKeys: null
    };
  },

@@ -1893,6 +1895,7 @@
        this.$message.error("字段列表调用失败");
        return;
      }

      var val = data1.result;
      for (var i in val) {
        val[i].createuser = val[i].createName;
@@ -1909,6 +1912,29 @@
      }
      this.dbTableData = data1.result;
      this.count1 = data1.count;
    },

    changetimeLayer(res) {
      var time = new Date(res);
      var y = time.getFullYear();
      var m = time.getMonth() + 1;
      var d = time.getDate();
      var h = time.getHours();
      var mm = time.getMinutes();
      var s = time.getSeconds();
      return (
        y +
        '-' +
        this.add0(m) +
        '-' +
        this.add0(d) +
        ' ' +
        h +
        ':' +
        mm +
        ':' +
        s
      );
    },
    //自动匹配取消
    setInsrtWareTableClose() {
@@ -2135,9 +2161,9 @@
    //整体文件质检提交
    commonTestQuay() {
      this.testQuayVisible = false;
      if (this.formCheckAll.diZaiType != "NO") {
        this.formCheckAll.isDiZai = "YES";
      }
      // if (this.formCheckAll.diZaiType != "NO") {
      //   this.formCheckAll.isDiZai = "YES";
      // }
      this.loading = true;
      this.getStartTestQuayTaskStatus();
    },
@@ -2197,8 +2223,8 @@
        this.getStartTaskStatus();
      } else {
        this.quayTestForms.names = this.pathBak;
        var value = this.$refs["selectcascader"].getCheckedNodes();
        var bak = value[0].data.fullName.split("\\");
        var value = this.getCheckedKeys
        var bak = value.data.fullName.split("\\");
        this.quayTestForms.xmmc = bak[this.taskStatus];
        this.quayTestForms.sjzy = this.formInline.specialtyId;
        this.quayTestForms.zipPath =
@@ -2534,7 +2560,7 @@
          return rs;
        }
      });
      this.pathBak = val[0].bak;
      this.pathBak = val[0].checks;
      this.formInline.dirid = val[0].id;
      this.getselectVerByDirid();
    },
@@ -2613,8 +2639,9 @@
        return this.$message("请选择需要质检的文件");
      }
      if (this.formInline.uploadType == "v1") {
        var value = this.$refs["selectcascader"].getCheckedNodes();
        var fileType = value[0].data.fullName;

        var value = this.getCheckedKeys
        var fileType = value.data.fullName;
        this.quayTestForms.names = fileType;
        this.quayTestForms.sjzy = this.formInline.specialtyId;
        this.quayTestVisible = true;
@@ -2647,10 +2674,10 @@
        this.formCheckAll.xmmc = val[0].name;
        this.formCheckAll.sjzy = this.formInline.specialtyId;
        if (this.formCheckAll.sjzy.indexOf("地灾") != -1) {
          this.formCheckAll.isDiZai = true;
          this.formCheckAll.isDiZai = "YES";
          this.formCheckAll.diZaiType = this.disOptions[0].value;
        } else {
          this.formCheckAll.isDiZai = false;
          this.formCheckAll.isDiZai = "NO";
          this.formCheckAll.diZaiType = "NO";
        }
        this.testQuayVisible = true;
@@ -2829,7 +2856,7 @@
        this.formInline.entryId = this.entryOption[0].name;
        this.formInline.dirid = this.entryOption[0].id;
        this.getselectVerByDirid();
        this.pathBak = this.entryOption[0].bak;
        this.pathBak = this.entryOption[0].checks;
      } else {
        this.getStartDirChecked(this.catalogOption);
        this.getselectVerByDirid();
@@ -2840,7 +2867,7 @@
    //版本号获取
    async getselectVerByDirid() {
      this.verOption = [];
      this.formInline.verid = "";

      const res = await dataUploadSelectVerByDirid({
        dirid: this.formInline.dirid,
      });
@@ -2912,7 +2939,8 @@
      // this.$refs['selectcascader'].dropDownVisible = false
      // var value = this.$refs['selectcascader'].getCheckedNodes();

      var bak = node.data.bak;
      var bak = node.data.checks;
      this.getCheckedKeys = node
      this.pathBak = bak;
      if (bak != null) {
        for (var key in this.quayTestShow) {
@@ -2921,7 +2949,7 @@
          }
        }
      }
      var fileType = node.data.code;
      var fileType = node.data.exts;
      if (fileType == null) {
        fileType = "*.*";
      }

 src/views/datamanage/versionManage.vue

@@ -300,7 +300,7 @@
          >
            <el-select
              :popper-append-to-body="false"
              v-model="insertform.path"
              v-model="insertform.dirName"
              placeholder="请选择"
              style="width:85%"
            >
@@ -550,7 +550,10 @@
      this.insertform.dirid = value;
    },
    catalogChangeAdd(data, node, nodeData) {
      this.$set(this.insertform, "path", data.id);

      this.insertform.path = data.id
      this.insertform.dirid = data.id
      // this.$set(this.insertform, "path", data.id);
      this.$set(this.insertform, "dirName", data.name);
    },
    upCatalogChange(val) {
@@ -592,9 +595,9 @@
        return;
      }
      this.insertform.name = this.getYMD();
      this.insertform.path = 1;
      this.insertform.dirid = 1;
      this.upform.dirid == 1;
      // this.insertform.path = 1;
      // this.insertform.dirid = 1;
      // this.upform.dirid == 1;
      this.catalogOption = this.treeData(res.result);
      this.editcatalogOption = this.treeData(res.result);
    },
@@ -709,6 +712,7 @@
      this.insertform = {};
    },
    async insertFromData() {

      if (this.insertform.dirid == null) {
        this.$message({
          message: "请选择角色所属单位",
@@ -716,6 +720,7 @@
        });
        return;
      }

      const data = await insertVersion(this.insertform);
      if (data.code == 200) {
        this.InsertFormdialog = false;