From 1346c413ebdbbaed423a96172ae89854618ef30a Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期二, 28 十一月 2023 10:51:25 +0800
Subject: [PATCH] 数据上传入库修改，图层管理添加单位信息
---
src/views/datamanage/dataUpdata.vue | 318 +++++++++++++---------------------------------------
1 files changed, 80 insertions(+), 238 deletions(-)
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index a967df8..9d9f354 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -29,43 +29,12 @@
:model="formInline"
class="demo-form-inline"
>
- <!-- 鍏ュ簱绫诲瀷 -->
- <el-form-item
- :label="$t('dataManage.dataUpObj.UploadType')"
- style="margin-right: 2%"
- size="small"
- >
- <el-select
- :disabled="tableData.length == 0 ? false : true"
- v-model="formInline.uploadType"
- @change="uploadTypeChange"
- :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
- :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')"
+ :label="$t('dataManage.dataUpObj.resourceDirectory')"
size="small"
>
<el-select
@@ -88,37 +57,8 @@
/>
</el-option>
</el-select>
- <!-- <el-cascader
- :disabled="tableData.length == 0 ? false : true"
- v-model="formInline.dirid"
- :options="catalogOption"
- @change="catalogChange"
- ref="selectcascader"
- :props="cascader"
- ></el-cascader> -->
</el-form-item>
- <!-- 椤圭洰鍚嶇О -->
- <el-form-item
- style="margin-right: 2%"
- v-show="!uploadFlag"
- :label="$t('dataManage.dataUpObj.entryName')"
- size="small"
- >
- <el-select
- :popper-append-to-body="false"
- :disabled="tableData.length == 0 ? false : true"
- v-model="formInline.entryId"
- @change="entryNameChange"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in entryOption"
- :key="item.id"
- :label="item.name"
- :value="item.name"
- ></el-option>
- </el-select>
- </el-form-item>
+
<!-- 鏁版嵁鐗堟湰 -->
<el-form-item
:label="$t('dataManage.dataUpObj.dataVersion')"
@@ -141,65 +81,64 @@
</el-option>
</el-select>
</el-form-item>
- <!-- 鏁版嵁涓撲笟 -->
- <!-- <el-form-item
- :label="$t('dataManage.dataUpObj.dataSpecialty')"
+ <!-- 浼犳劅鍣ㄧ被鍨� -->
+ <el-form-item
+ :label="$t('dataManage.dataUpObj.sensorType')"
style="margin-right: 2%"
size="small"
>
<el-select
:popper-append-to-body="false"
- :disabled="tableData.length == 0 ? false : true"
- v-model="formInline.specialtyId"
+ v-model="formInline.sensorType"
:placeholder="$t('common.choose')"
+ size="small"
>
-
<el-option
- :label="$t('shuJuGuanLi.pselect.SurveyingAndMapping')"
- 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-option
- :label="$t('shuJuGuanLi.pselect.LineDiscipline')"
- value='绾胯矾涓撲笟'
- />
+ v-for="item in sensorOption"
+ :key="item.value"
+ :label="item.name"
+ :value="item.value"
+ >
+ </el-option>
</el-select>
- </el-form-item> -->
- <!-- 鍧愭爣绯� -->
+ </el-form-item>
+ <!-- 鍏冩暟鎹被鍨� -->
<el-form-item
- v-show="false"
- :label="$t('dataManage.dataUpObj.coordinateSystem')"
- style="margin-right: 3%"
+ :label="$t('dataManage.dataUpObj.metadataType')"
+ style="margin-right: 2%"
size="small"
>
<el-select
:popper-append-to-body="false"
- :disabled="tableData.length == 0 ? false : true"
- v-model="formInline.coordinateId"
+ v-model="formInline.mataType"
:placeholder="$t('common.choose')"
+ size="small"
>
<el-option
- v-for="item in coordinateOption"
- :key="item.epsgcode"
- :label="item.coordinate"
- :value="item.epsgcode"
+ v-for="item in metaOption"
+ :key="item.value"
+ :label="item.name"
+ :value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<div class="flex_box">
<div style="margin-right: auto">
+
+ <!-- 閲囬泦鏃堕棿 -->
+ <el-form-item
+ :label="$t('dataManage.dataUpObj.collectionTime')"
+ size="small"
+ >
+ <el-date-picker
+ v-model="formInline.acqTime"
+ type="datetime"
+ placeholder="璇烽�夋嫨閲囬泦鏃堕棿"
+ >
+ </el-date-picker>
+ </el-form-item>
+
<!-- 閫夋嫨鏁版嵁 -->
<el-form-item size="small">
<el-link
@@ -237,85 +176,7 @@
>
</el-input>
</el-form-item>
- <!-- 閫夋嫨鍏冩暟鎹� -->
- <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>
- <el-link
- v-show="formInline.metaData != '璇烽�夋嫨鍏冩暟鎹�'"
- @click="restMetaFile"
- :underline="false"
- type="primary"
- >{{ $t('common.reset') }}
- </el-link>
- <input
- id="metaDataFile"
- type="file"
- name="file"
- multiple="multiple"
- accept=".xls,.xlsx"
- style="display: none"
- @change="handleMetaFileChange"
- ></input>
- </el-form-item>
- <el-form-item
- v-show="uploadFlag"
- size="small"
- >
- <el-input
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
- v-model="formInline.metaData"
- 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-form-item>
- <el-form-item v-show="!uploadFlag">
- <el-input
- placeholder="璇烽�夋嫨WBS鏁版嵁"
- v-model="formInline.wbsData"
- style="width:210px;"
- disabled
- >
- </el-input>
- </el-form-item>
+
</div>
<div>
<el-form-item>
@@ -352,7 +213,7 @@
>{{ $t('common.Warehousin') }}
</el-button>
<!-- 璐ㄦ -->
- <el-button
+ <!-- <el-button
style="margin-right:-9px"
v-if="menuStatus.insert"
:disabled="multipleSelection.length == 0 ? true : false"
@@ -361,7 +222,7 @@
icon="el-icon-folder-checked"
@click="handleQuayTestClick()"
>{{ $t('common.quayTest') }}
- </el-button>
+ </el-button> -->
</el-form-item>
</div>
@@ -469,7 +330,7 @@
</div>
<div>
<el-form-item>
- <el-button
+ <!-- <el-button
v-if="menuStatus.upload"
:disabled="multipleDelete.length == 0 ? true : false"
@click="setEnclosure"
@@ -477,7 +338,7 @@
type="success"
size="small"
>{{ $t('common.enclosure') }}
- </el-button>
+ </el-button> -->
<el-button
v-if="menuStatus.delete"
@click="setWarehouseDel"
@@ -1459,6 +1320,7 @@
dataUpload_selectMetaById,
selectdirTab,
} from "../../api/api";
+import { meta_type, sensor_type } from "./js/layerManage";
export default {
name: "dataUpdata",
@@ -1469,34 +1331,7 @@
return {
coordinateOption: [],
disOptions: [
- {
- name: "宕╁娌荤悊",
- value: "宕╁娌荤悊",
- },
- {
- name: "涓嶇ǔ瀹氭枩鍧℃不鐞�",
- value: "涓嶇ǔ瀹氭枩鍧℃不鐞�",
- },
- {
- name: "鍦伴潰濉岄櫡娌荤悊",
- value: "鍦伴潰濉岄櫡娌荤悊",
- },
- {
- name: "楂橀櫋杈瑰潯娌荤悊",
- value: "楂橀櫋杈瑰潯娌荤悊",
- },
- {
- name: "娉ョ煶娴佹不鐞�",
- value: "娉ョ煶娴佹不鐞�",
- },
- {
- name: "姘存瘉娌荤悊",
- value: "姘存瘉娌荤悊",
- },
- {
- name: "婊戝潯娌荤悊",
- value: "婊戝潯娌荤悊",
- },
+
],
testQuayVisible: false,
formCheckAll: {
@@ -1574,6 +1409,9 @@
coordinateId: null,
path: null,
verid: null,
+ sensorType: 0,
+ mataType: 0,
+ acqTime: null
},
cascader: {
label: "name",
@@ -1582,22 +1420,7 @@
emitPath: false,
},
specialtyOption: [
- {
- value: "娴嬮噺涓撲笟",
- label: "娴嬮噺涓撲笟",
- },
- {
- value: "鍕樺療涓撲笟",
- label: "鍕樺療涓撲笟",
- },
- {
- value: "鍦扮伨涓撲笟",
- label: "鍦扮伨涓撲笟",
- },
- {
- value: "娲炲簱涓撲笟",
- label: "娲炲簱涓撲笟",
- },
+
],
fileType: [],
pathBak: null,
@@ -1670,15 +1493,18 @@
},
warehouseDialog: false,
wareData: [],
+ metaOption: [],
+ sensorOption: []
};
},
mounted() {
-
+ //鑾峰彇浼犳劅鍣ㄥ厓鏁版嵁绫诲瀷
+ this.getSensorMeta()
//鑾峰彇鍧愭爣绯�
- this.setCoordinateSystem();
+ // this.setCoordinateSystem();
//鑾峰彇椤圭洰鍚嶇О
- this.setProjectName();
+ // this.setProjectName();
//鑾峰彇鏂囦欢涓婁紶璺緞
this.getFilePath();
//鏉冮檺鑾峰彇
@@ -1694,6 +1520,10 @@
},
watch: {},
methods: {
+ getSensorMeta() {
+ this.metaOption = meta_type;
+ this.sensorOption = sensor_type;
+ },
stateFormat(row, column) {
var val = ['shp', 'gdb', 'xls', 'xlsx']
if (val.indexOf(row.type) > -1 && row.rows > 0) {
@@ -2010,11 +1840,11 @@
'-' +
this.add0(d) +
' ' +
- h +
+ this.add0(h) +
':' +
- mm +
+ this.add0(mm) +
':' +
- s
+ this.add0(s)
);
},
//鑷姩鍖归厤鍙栨秷
@@ -2050,6 +1880,16 @@
res.isMeta = true;
}
});
+ }
+ var time = null;
+ if (this.formInline.acqTime) {
+ time = this.changetimeLayer(this.formInline.acqTime)
+ }
+
+ for (var i in this.insertWareList) {
+ this.insertWareList[i].mataType = this.formInline.mataType;
+ this.insertWareList[i].sensortype = this.formInline.sensorType;
+ this.insertWareList[i].acqTime = time;
}
@@ -2218,7 +2058,7 @@
this.loading = true;
var obj = {
dirid: this.formInline.dirid,
- epsgCode: this.formInline.coordinateId,
+ epsgCode: 'EPSG:4490',
path: this.formInline.path,
verid: this.formInline.verid,
};
@@ -2542,9 +2382,9 @@
this.formInline.specialtyData = "璇烽�夋嫨鏁版嵁";
document.getElementById("selectDataFile").value = "";
this.formInline.metaData = "璇烽�夋嫨鍏冩暟鎹�";
- document.getElementById("metaDataFile").value = "";
+ // document.getElementById("metaDataFile").value = "";
this.formInline.wbsData = "璇烽�夋嫨WBS鏁版嵁";
- document.getElementById("wbsDataFile").value = "";
+ // document.getElementById("wbsDataFile").value = "";
},
//鑾峰彇涓婁紶鏂囦欢鏁伴噺
async getFileLength() {
@@ -2728,8 +2568,8 @@
},
//閲嶇疆WPS閫夋嫨
restWBSFile() {
- this.formInline.wbsData = "璇烽�夋嫨WBS鏁版嵁";
- document.getElementById("wbsDataFile").value = "";
+ // this.formInline.wbsData = "璇烽�夋嫨WBS鏁版嵁";
+ // document.getElementById("wbsDataFile").value = "";
},
//WBS鏁版嵁Change浜嬩欢
handleWBSFileChange(event) {
@@ -2859,6 +2699,7 @@
},
//鏍煎紡鍖栨椂闂�
changetimeFile(res) {
+ if (!res.createTime) return;
var time = new Date(res.createTime);
var y = time.getFullYear();
var m = time.getMonth() + 1;
@@ -2882,6 +2723,7 @@
},
//鏍煎紡鍖栨椂闂�
add0(m) {
+
return m < 10 ? "0" + m : m;
},
//澶у皬鍊兼敼鍙�
@@ -2950,8 +2792,8 @@
},
//閲嶇疆鍏冩暟鎹�
restMetaFile() {
- this.formInline.metaData = "璇烽�夋嫨鍏冩暟鎹�";
- document.getElementById("metaDataFile").value = "";
+ // this.formInline.metaData = "璇烽�夋嫨鍏冩暟鎹�";
+ // document.getElementById("metaDataFile").value = "";
},
//閫夋嫨鍏冩暟鎹枃浠跺垏鎹�
handleMetaFileChange(event) {
--
Gitblit v1.9.3