From 797992cf12451dc64070ec63b6b1917aa5cc9b2e Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期四, 13 四月 2023 16:26:58 +0800
Subject: [PATCH] 目录管理页面修改；数据上传页面修改
---
src/assets/lang/zh.js | 3
src/views/datamanage/dictionaryManage.vue | 11 +-
src/views/datamanage/catalogueManage.vue | 134 +++++++++++++++++++++++++++++++--
src/assets/lang/en.js | 3
src/views/datamanage/dataUpdata.vue | 62 ++++++++++++++-
5 files changed, 193 insertions(+), 20 deletions(-)
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index 1d52ddf..876add7 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -58,7 +58,8 @@
preview: 'preview',
attribute: 'Attribute',
id: "ID",
- info: 'Info'
+ info: 'Info',
+ warehousResults: 'Warehousing results'
},
dataManage: {
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index 4838cc6..dc35488 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -58,7 +58,8 @@
preview: '棰勮',
attribute: '灞炴��',
id: "ID",
- info: '淇℃伅'
+ info: '淇℃伅',
+ warehousResults: '鍏ュ簱缁撴灉'
},
dataManage: {
dataManage: '鏁版嵁绠＄悊',
diff --git a/src/views/datamanage/catalogueManage.vue b/src/views/datamanage/catalogueManage.vue
index 2c28a0f..b6db35b 100644
--- a/src/views/datamanage/catalogueManage.vue
+++ b/src/views/datamanage/catalogueManage.vue
@@ -173,13 +173,26 @@
:label="$t('dataManage.dataUpObj.inspectionItems')"
:label-width="formLabelWidth"
>
- <el-input
+ <el-select
+ style="width: 420px"
v-model="itemdetail.checks"
+ multiple
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ <!-- <el-input
+
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>
@@ -324,12 +337,26 @@
:label="$t('dataManage.dataUpObj.inspectionItems')"
:label-width="formLabelWidth"
>
- <el-input
- v-model="ruleForm.checks"
+ <!-- <el-input
+
type="textarea"
resize="none"
- style="height: 100%; overflow: auto"
- />
+
+ /> -->
+ <el-select
+ v-model="ruleForm.checks"
+ multiple
+ style="width:100%;"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+
</el-form-item>
<el-form-item
:label="$t('dataManage.dataUpObj.code')"
@@ -420,7 +447,9 @@
dirList: [], //el鏍戞暟鎹�
old_dirDat: [], //el鏍戞暟鎹�(鎷栧姩鍓�)
newData: [], //鎷栧姩鍚庡師濮嬫暟鎹�
- itemdetail: {},
+ itemdetail: {
+ checks: [],
+ },
itemaName: null,
backUpData: "",
formLabelWidth: "150px",
@@ -434,6 +463,7 @@
name: "",
descr: "",
bak: "",
+ checks: []
},
rules: {
name: [{ required: true, validator: validName, trigger: "blur" }],
@@ -443,6 +473,52 @@
fileList: [],
file: null,
tableData: [],
+ options: [
+ {
+ value: 'checkMain',
+ label: '鎬昏川妫�'
+ }, {
+ value: 'checkOsgb',
+ label: 'OSGB妫�鏌�'
+ }, {
+ value: 'checkXls',
+ label: '琛ㄦ牸鏁版嵁妫�鏌�'
+ }, {
+ value: 'checkLaz',
+ label: '鐐逛簯妫�鏌�'
+ }, {
+ value: 'checkDem',
+ label: '楂樼▼妫�鏌�'
+ }, {
+ value: 'checkAttrs',
+ label: '灞炴�ф鏌�'
+ }, {
+ value: 'checkTopology',
+ label: '鎷撴墤妫�鏌�'
+ }, {
+ value: 'checkDecorate',
+ label: '鍥鹃潰鏁撮グ妫�鏌�'
+ }, {
+ value: 'checkOrigin',
+ label: '鍘熺偣妫�鏌�'
+ }, {
+ value: 'checkDom',
+ label: '鏍呮牸妫�鏌�'
+ }, {
+ value: 'checkMath',
+ label: '鏁板鍩虹妫�鏌�'
+ }, {
+ value: 'checkMeta',
+ label: '鍏冩暟鎹鏌�'
+ }, {
+ value: 'checkLogical',
+ label: '閫昏緫涓�鑷存�ф鏌�'
+ }, {
+ value: 'checkSingleIntegrity',
+ label: '鍗曢」鎴愭灉瀹屾暣鎬ф鏌�'
+ }
+
+ ],
};
},
methods: {
@@ -786,7 +862,9 @@
this.$refs[formName].validate((valid) => {
if (valid) {
this.fullscreenLoading = true;
- insertDir(this.ruleForm)
+ var val = this.ruleForm;
+ val.checks = this.ruleForm.checks.toString()
+ insertDir(val)
.then((res) => {
setTimeout(() => {
this.fullscreenLoading = false;
@@ -980,14 +1058,35 @@
}
this.newNode = node;
this.backUpData = JSON.stringify(data);
- this.itemdetail = JSON.parse(JSON.stringify(data));
+ var val = JSON.parse(JSON.stringify(data));
+ this.itemdetail = val;
+ var checks = [];
+ if (val.checks) {
+ if (val.checks.indexOf(',') > -1) {
+ var value = val.checks.split(',');
+ for (var i in value) {
+ checks.push(value[i])
+ }
+ } else {
+ checks.push(val.checks)
+ }
+ this.itemdetail.checks = checks;
+ } else {
+ this.itemdetail.checks = []
+ }
+
},
updCata(formName) {
this.$nextTick(() => {
this.$refs[formName].validate((valid) => {
if (valid) {
this.fullscreenLoading = true;
- updateDirTree(this.itemdetail)
+
+ var val = this.itemdetail
+ var value = this.itemdetail.checks.toString()
+ val.checks = value;
+
+ updateDirTree(val)
.then((res) => {
setTimeout(() => {
this.fullscreenLoading = false;
@@ -1013,6 +1112,21 @@
// this.$refs[formName].resetFields();
if (this.backUpData != "") {
this.itemdetail = JSON.parse(this.backUpData);
+ var val = JSON.parse(this.backUpData);
+ var checks = [];
+ if (val.checks) {
+ if (val.checks.indexOf(',') > -1) {
+ var value = val.checks.split(',');
+ for (var i in value) {
+ checks.push(value[i])
+ }
+ } else {
+ checks.push(val.checks)
+ }
+ this.itemdetail.checks = checks;
+ } else {
+ this.itemdetail.checks = []
+ }
}
},
showPermsMenu(res) {
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index cbeda1f..3a9a5fd 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -1008,7 +1008,10 @@
width="70%"
>
<div class="dialogBox">
- <div class="transFarBox subpage_Div">
+ <div
+ class="transFarBox subpage_Div"
+ style="border: 1px solid #E4E7ED;"
+ >
<ul>
<li
@click="singleElection(item)"
@@ -1026,7 +1029,10 @@
</div>
</div>
- <div class="transFarBox subpage_Div">
+ <div
+ class="transFarBox subpage_Div"
+ style="border: 1px solid #E4E7ED;"
+ >
<ul>
<li
@click="singleElection2(item)"
@@ -1050,7 +1056,10 @@
</div>
</div>
</div>
- <div class="transFarBox subpage_Div">
+ <div
+ class="transFarBox subpage_Div"
+ style="border: 1px solid #E4E7ED;"
+ >
<ul>
<li
@click="singleElection3(i)"
@@ -1370,6 +1379,43 @@
</div>
</el-dialog>
+ <el-dialog
+ :title="fromQueryMeta.title"
+ :visible.sync="warehouseDialog"
+ width="70%"
+ :close-on-click-modal="false"
+ >
+ <div style="height:65vh">
+ <el-table
+ ref="wareTable"
+ :data="wareData"
+ style="width: 100%"
+ height="calc(100% - 1px)"
+ >
+ <el-table-column
+ align="center"
+ prop="name"
+ :label="$t('common.name')"
+ />
+ <el-table-column
+ align="center"
+ prop="sizes"
+ :label="$t('common.size')"
+ :formatter="changeSizeFile"
+ />
+ <el-table-column
+ align="center"
+ prop="type"
+ :label="$t('common.type')"
+ />
+ <el-table-column
+ align="center"
+ prop="msg"
+ :label="$t('common.warehousResults')"
+ />
+ </el-table>
+ </div>
+ </el-dialog>
<input
name="file1"
:accept="'.zip'"
@@ -1613,7 +1659,9 @@
sc: {
label1: '涓婁紶',
label2: '鏂囦欢涓婁紶杩涘害锛�'
- }
+ },
+ warehouseDialog: true,
+ wareData: [],
};
},
@@ -1991,10 +2039,16 @@
this.$message.error("鏁版嵁鍏ュ簱澶辫触");
return;
}
+ debugger
this.$message({
message: "鏁版嵁鍏ュ簱鎴愬姛",
type: "success",
});
+ if (res.result.length > 0) {
+ this.warehouseDialog = true;
+ this.wareData = res.result;
+ }
+
this.setInsrtWareTableClose();
},
//鑷姩鍖归厤
diff --git a/src/views/datamanage/dictionaryManage.vue b/src/views/datamanage/dictionaryManage.vue
index b13b259..6ed0f2b 100644
--- a/src/views/datamanage/dictionaryManage.vue
+++ b/src/views/datamanage/dictionaryManage.vue
@@ -18,19 +18,19 @@
:placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
suffix-icon="el-icon-search"
></el-input>
- <el-tree
+ <!-- <el-tree
:data="domainData"
:props="defaultProps"
>
- </el-tree>
- <!-- <el-tree
+ </el-tree> -->
+ <el-tree
:data="domainData"
:props="defaultProps"
@node-click="getTableDesc"
:filter-node-method="filterNode"
ref="tree"
- ></el-tree> -->
+ ></el-tree>
<!-- <ul>
<li
@click="getTableDesc(item)"
@@ -661,6 +661,9 @@
},
//鑾峰彇琛ㄦ牸瀛楁淇℃伅
getTableDesc(res) {
+ if (res.children) {
+ return
+ }
this.insertform.tab = res.tab;
this.insertform.tabDesc = res.tabDesc;
this.insertform.ns = res.ns;
--
Gitblit v1.9.3