From 0a722969a72ced13136b82d8c01939bea2c43745 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期四, 27 七月 2023 17:21:53 +0800
Subject: [PATCH] 项目管理，数据发布修改
---
src/views/datamanage/dataUpdata.vue | 217 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 183 insertions(+), 34 deletions(-)
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index 5ed4237..b4921f3 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -3,6 +3,7 @@
class="subpage_Box"
v-loading="loading"
element-loading-background="rgba(0, 0, 0, 0.8)"
+ :element-loading-text="loadText"
>
<My-bread :list="[
`${$t('dataManage.dataManage')}`,
@@ -68,6 +69,7 @@
size="small"
>
<el-select
+ ref="multiSelect"
:popper-append-to-body="false"
v-model="formInline.dirName"
:disabled="tableData.length == 0 ? false : true"
@@ -158,7 +160,7 @@
</el-option>-->
<el-option
- :label="$t('shuJuGuanLi.pselect.SurveyDiscipline')"
+ :label="$t('shuJuGuanLi.pselect.SurveyingAndMapping')"
value="娴嬮噺涓撲笟"
/>
<el-option
@@ -173,7 +175,10 @@
:label="$t('shuJuGuanLi.pselect.CavernSpecialty')"
value="娲炲簱涓撲笟"
/>
-
+ <el-option
+ :label="$t('shuJuGuanLi.pselect.LineDiscipline')"
+ value='绾胯矾涓撲笟'
+ />
</el-select>
</el-form-item>
<!-- 鍧愭爣绯� -->
@@ -605,6 +610,14 @@
/>
<el-table-column
align="center"
+ :label="$t('common.dataStatus')"
+ :formatter="stateFormat"
+ >
+
+ </el-table-column>
+ <el-table-column
+ align="
+ center"
prop="desc"
:label="$t('dataManage.dataUpObj.describe')"
/>
@@ -629,7 +642,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
+ :page-sizes="[10, 50, 100, 200,500]"
:page-size="listData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count"
@@ -988,7 +1001,7 @@
<el-button
class="elBotton"
size="small"
- @click="commonTestQuay"
+ @click="commonTestQuay()"
>纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -1005,7 +1018,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)"
@@ -1023,7 +1039,10 @@
</div>
</div>
- <div class="transFarBox subpage_Div">
+ <div
+ class="transFarBox subpage_Div"
+ style="border: 1px solid #E4E7ED;"
+ >
<ul>
<li
@click="singleElection2(item)"
@@ -1047,7 +1066,10 @@
</div>
</div>
</div>
- <div class="transFarBox subpage_Div">
+ <div
+ class="transFarBox subpage_Div"
+ style="border: 1px solid #E4E7ED;"
+ >
<ul>
<li
@click="singleElection3(i)"
@@ -1114,7 +1136,7 @@
@size-change="handleLoaderSizeChange"
@current-change="handleLoaderCurrentChange"
:current-page="listLoader.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
+ :page-sizes="[10, 50, 100, 200]"
:page-size="listLoader.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count1"
@@ -1276,7 +1298,7 @@
@size-change="handleMetaSizeChange"
@current-change="handMetaCurrentChange"
:current-page="listMetaData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
+ :page-sizes="[10, 50, 100, 200]"
:page-size="listMetaData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="listMetaData.count"
@@ -1367,6 +1389,44 @@
</div>
</el-dialog>
+ <el-dialog
+ :title="fromQueryMeta.title"
+ :visible.sync="warehouseDialog"
+ width="70%"
+ :close-on-click-modal="false"
+ :before-close="handleWarehouseClose"
+ >
+ <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'"
@@ -1376,6 +1436,37 @@
style="display: none"
@change="uploadAnFilesChange"
/>
+ <el-dialog :visible.sync="noteVisible">
+ <div class="nodeBox">
+ <div style="text-align: center;">
+ <h1>
+ 鏁版嵁涓婁紶娉ㄦ剰浜嬮」
+ </h1>
+ </div>
+ <h3>
+ 1銆侀」鐩暣浣撲笂浼�
+ </h3>
+
+ <h5> 鎸夌収椤圭洰鏍囧噯缁撴瀯缁勭粐鏁版嵁骞舵墦zip鍖咃紝鎸夎姹傜紪杈戝ソWBS鏂囦欢銆傞�夋嫨闇�瑕佷笂浼犲搴旂殑椤圭洰鍚嶇О锛岄�夋嫨zip鏁版嵁鍖呭拰WBS鏂囦欢锛屽畬鎴愭暣浣撻」鐩暟鎹笂浼狅紝涓婁紶鍏ュ簱瀹屾垚鍚庯紝绯荤粺鑷姩瑙ｅ帇zip鍖咃紝浠ip鍖呭唴鍘熷鏂囦欢鏍煎紡瀛樺偍鍦ㄩ鍏堢粍缁囩殑鐩綍缁撴瀯涓嬨��</h5>
+ <h3>
+ 2銆佸崟鏂囦欢涓婁紶
+ </h3>
+ <h5> 涓婁紶鍗曚釜鏂囦欢锛岄�夋嫨闇�瑕佷笂浼犵殑瀛樺偍鐩綍浣嶇疆銆佹暟鎹増鏈�佹暟鎹笓涓氥�佹暟鎹紙.xls銆�.xlsx銆乸df銆乴as绛夋牸寮忥級銆佸厓鏁版嵁绛夛紝瀹屾垚鍗曚釜鏂囦欢鏁版嵁涓婁紶锛�</h5>
+ <h5> 鎵归噺涓婁紶涓�涓渶灏忕洰褰曟枃浠跺す涓嬬殑鍚勭被鏁版嵁锛岄�夋嫨闇�瑕佷笂浼犳暟鎹殑瀛樺偍鐩綍浣嶇疆銆佹暟鎹増鏈�佹暟鎹笓涓氥�佹暟鎹紙zip鏍煎紡锛夈�佸厓鏁版嵁绛夛紝瀹屾垚涓�涓枃浠跺す涓嬪悇绫绘暟鎹笂浼狅紝涓婁紶鍏ュ簱瀹屾垚鍚庯紝绯荤粺鑷姩瑙ｅ帇zip鍖咃紝浠ip鍖呭唴鍘熷鏂囦欢瀛樺偍鏁版嵁銆�</h5>
+ <h5> 鍗曟枃浠朵笂浼犱笉鏀寔澶氱骇鐩綍鏂囦欢澶逛互zip鍘嬬缉鍖呮柟寮忎笂浼犮��</h5>
+ <h3>
+ 3銆佺壒瀹氭牸寮忓崟鏂囦欢涓婁紶瑕佹眰
+ </h3>
+ <h5>鈭� <span>DOM鏁版嵁涓婁紶锛�</span>鑷冲皯闇�鍖呭惈.tif銆�.tif.ovr鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ <h5>鈭� <span>DEM鏁版嵁涓婁紶锛�</span>鑷冲皯闇�鍖呭惈.tif銆�.tif.ovr鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ <h5>鈭� <span>OSGB鍊炬枩妯″瀷鏁版嵁涓婁紶锛�</span>闇�鍖呭惈Data鏂囦欢澶广�乵etadata.xml鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ <h5>鈭� <span>Las銆丩az鐐逛簯鏁版嵁涓婁紶锛�</span>鍙崟鐙笂浼犳枃浠讹紝涔熷彲浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ <h5>鈭� <span>CPT鐐逛簯鏁版嵁涓婁紶锛�</span>鍙崟鐙笂浼犳枃浠讹紝涔熷彲浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ <h5>鈭� <span>MPT鍦烘櫙鏁版嵁涓婁紶锛�</span>闇�鍖呭惈.mIdx銆�.Strmi銆�.mpt鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ <h5>鈭� <span>GDB鏍煎紡鐭㈤噺鏂囦欢涓婁紶锛�</span>闇�鍖呭惈gdb鍚勭被瀛愭枃浠讹紝浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ <h5>鈭� <span>SHP鐭㈤噺鏂囦欢涓婁紶锛�</span>闇�鍖呭惈.shp銆�.shx銆�.dbf銆乸rj瀛愭枃浠讹紝浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -1560,6 +1651,7 @@
wareTableFlag: null,
insertWareList: null,
loading: false,
+ loadText: '',
dbTableData: [],
dialogVisible: false,
listLoader: {
@@ -1610,12 +1702,15 @@
sc: {
label1: '涓婁紶',
label2: '鏂囦欢涓婁紶杩涘害锛�'
- }
+ },
+ warehouseDialog: false,
+ wareData: [],
+ noteVisible: false,
};
},
mounted() {
-
+ this.noteVisible = true;
//鑾峰彇鍧愭爣绯�
this.setCoordinateSystem();
//鑾峰彇椤圭洰鍚嶇О
@@ -1635,6 +1730,16 @@
},
watch: {},
methods: {
+ stateFormat(row, column) {
+ var val = ['shp', 'gdb', 'xls', 'xlsx']
+ if (val.indexOf(row.type) > -1 && row.rows > 0) {
+ return '宸蹭笂浼�,宸插叆搴�'
+ } else if (val.indexOf(row.type) > -1 && row.rows == 0) {
+ return '宸蹭笂浼�,鏈叆搴�'
+ } else {
+ return '宸蹭笂浼�'
+ }
+ },
setRestMetaData() {
this.fromQueryMeta.name = "";
this.listMetaData.name = this.fromQueryMeta.name;
@@ -1807,7 +1912,7 @@
"bs.m_equipment_nameplate",
"bs.m_hydraulic_protection",
"bs.m_marker",
- "bs.s_borehole",
+ "bs.s_explorationpoint",
];
var std = [];
this.enclosureData = [];
@@ -1961,6 +2066,9 @@
},
//鑷姩鍖归厤纭
async setInsrtWareTable() {
+ this.loading = true;
+ this.dialogWarehousing = false;
+ this.loadText = "鏁版嵁鍏ュ簱涓�,璇风瓑寰�..."
if (this.tableWareThree.length != 0) {
for (var i in this.tableWareThree) {
var tabs = this.tableWareThree[i].tabs;
@@ -1979,20 +2087,32 @@
});
}
- this.loading = true;
+
const res = await dataUpload_insertFiles(
JSON.stringify(this.insertWareList)
);
- this.loading = false;
+
if (res.code != 200) {
this.$message.error("鏁版嵁鍏ュ簱澶辫触");
return;
}
+
this.$message({
message: "鏁版嵁鍏ュ簱鎴愬姛",
type: "success",
});
+ this.loading = false;
+ this.loadText = ""
+ if (res.result.length > 0) {
+ this.warehouseDialog = true;
+ this.wareData = res.result;
+ }
+
this.setInsrtWareTableClose();
+ },
+ handleWarehouseClose() {
+ this.warehouseDialog = false;
+ this.wareData = [];
},
//鑷姩鍖归厤
autoMatchWare() {
@@ -2002,7 +2122,8 @@
for (var i = 0; i < val1.length; i++) {
const stdTab = this.setSplitWare(val1[i].tab);
for (var j = 0; j < val2.length; j++) {
- if (val2[j].tab == stdTab) {
+
+ if (val2[j].tab.indexOf(stdTab) > -1) {
std.push(val1[i].tab);
val1[i].entity = val2[j].entity;
val1[i].tabDesc = val2[j].tabDesc;
@@ -2130,18 +2251,21 @@
}
}
}
-
+ this.loading = true;
var obj = {
dirid: this.formInline.dirid,
epsgCode: this.formInline.coordinateId,
path: this.formInline.path,
verid: this.formInline.verid,
};
+ this.loadText = "鏁版嵁鏄犲皠鏌ヨ涓�,璇风瓑寰�..."
//鏌ヨ鏄犲皠
const data = await dataUpload_selectMappers(obj);
if (data.code != 200) {
return this.$message.error("鏁版嵁鏄犲皠澶辫触");
}
+ this.loading = false;
+ this.loadText = " "
var std = [];
var result = data.result;
this.insertWareList = data.result;
@@ -2175,7 +2299,6 @@
// if (this.formCheckAll.diZaiType != "NO") {
// this.formCheckAll.isDiZai = "YES";
// }
- //
this.sc = {
label1: '璐ㄦ',
label2: '鏂囦欢璐ㄦ杩涘害锛�'
@@ -2206,6 +2329,7 @@
this.formCheckAll.wbsPath = path;
}
}
+ this.formCheckAll.sjfl = '鏁板瓧鍖栨垚鏋�'
const data = await dataUpload_uploadChecks(this.formCheckAll);
if (data.code != 200) {
this.$message.error("鏁版嵁璐ㄦ鎻愪氦澶辫触");
@@ -2259,6 +2383,7 @@
this.quayTestForms.sjzy = this.formInline.specialtyId;
this.quayTestForms.zipPath =
this.multipleSelection[this.taskStatus].path;
+ this.quayTestForms.sjfl = '鏁板瓧鍖栨垚鏋�'
const data = await dataUpload_uploadChecks(this.quayTestForms);
if (data.code != 200) {
this.$message.error("鏁版嵁璐ㄦ鎻愪氦澶辫触");
@@ -2290,14 +2415,15 @@
this.multipleSelection[this.taskStatus].path
) {
this.tableData[i].status = "璐ㄦ鎴愬姛";
+
}
}
- if (this.progress == 1) {
- clearInterval(this.setIntel);
- this.setIntel = null;
- this.taskStatus++;
- this.getStartTaskStatus();
- }
+ // if (this.progress == 1) {
+ clearInterval(this.setIntel);
+ this.setIntel = null;
+ this.taskStatus++;
+ this.getStartTaskStatus();
+ // }
} else {
//浠诲姟澶辫触
for (var i in this.tableData) {
@@ -2349,11 +2475,11 @@
}
}
}
- if (this.progress == 1) {
- clearInterval(this.setIntel);
- this.setIntel = null;
- this.loading = false;
- }
+ // if (this.progress == 1) {
+ clearInterval(this.setIntel);
+ this.setIntel = null;
+ this.loading = false;
+ // }
} else {
//浠诲姟澶辫触
for (var i in this.tableData) {
@@ -2805,11 +2931,13 @@
},
//涓婁紶鏁版嵁鍒楄〃娓呭崟鍒濆鍖�
setStartWareTable() {
- this.listData = {
- pageIndex: 1,
- pageSize: 10,
- name: null,
- };
+ // this.listData = {
+ // pageIndex: 1,
+ // pageSize: 10,
+ // name: null,
+ // };
+ this.listData.pageIndex = 1;
+ this.listData.name = null;
this.getAllWareTable();
},
//鑾峰彇鏁版嵁涓婁紶鍒楄〃娓呭崟
@@ -2999,11 +3127,16 @@
this.formInline.dirid = node.data.id;
this.formInline.dirName = node.data.name;
this.getselectVerByDirid();
+ setTimeout(() => {
+ this.$refs.multiSelect.blur()
+ }, 100)
},
//Tabsq鍒囨崲
handleTabClick(tab, event) {
if (tab.name == "second") {
this.setStartWareTable();
+ } else {
+ this.noteVisible = true
}
this.calHeight();
},
@@ -3048,7 +3181,23 @@
z-index: 9999;
}
}
-
+.nodeBox {
+ h5 {
+ line-height: 26px;
+ font-size: 14px;
+ span {
+ font-weight: bolder;
+ }
+ }
+ h3 {
+ line-height: 40px;
+ font-size: 16px;
+ font-weight: bold;
+ }
+ h1 {
+ font-weight: bold;
+ }
+}
.inquire {
padding: 8px;
//margin-top: 20px;
--
Gitblit v1.9.3