From d88143708375c191f1e9f0bc567ef1e18dbeaa1e Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期四, 31 八月 2023 16:02:17 +0800
Subject: [PATCH] 资源查询，资源管理修改
---
src/components/MapView/moonMap.vue | 4
src/assets/lang/zh.js | 2
src/views/resourceQuery/resourceQuery.vue | 25 ++++++++
src/assets/lang/en.js | 2
src/views/datamanage/resourceManagement.vue | 109 ++++++++++++++++++++++++++++++++++-
5 files changed, 135 insertions(+), 7 deletions(-)
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index d146404..6ee313a 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -126,6 +126,8 @@
prompt15: 'Please enter service parameters',
prompt16: "Please enter descriptive information",
prompt17: "Please enter note information",
+ prompt18: "Please select a service category",
+ prompt19: "Please select the resource status",
tableName: 'Table Name',
resourceName: 'resourceName',
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index ea14b33..758ca5f 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -124,6 +124,8 @@
prompt15: '璇疯緭鍏ユ湇鍔″弬鏁�',
prompt16: "璇疯緭鍏ユ弿杩颁俊鎭�",
prompt17: "璇疯緭鍏ュ娉ㄤ俊鎭�",
+ prompt18: "璇烽�夋嫨鏈嶅姟绫诲埆",
+ prompt19: "璇烽�夋嫨璧勬簮鐘舵��",
tableName: '琛ㄥ悕绉�',
resourceName: '璧勬簮鍚嶇О',
},
diff --git a/src/components/MapView/moonMap.vue b/src/components/MapView/moonMap.vue
index 3dbb2af..5358d65 100644
--- a/src/components/MapView/moonMap.vue
+++ b/src/components/MapView/moonMap.vue
@@ -184,7 +184,7 @@
Cesium.Cartographic.fromDegrees(that.longitude, that.latitude, 0)
)
if (that.altHeight) {
- that.altHeight = that.altHeight.toFixed(6);
+ that.altHeight = that.altHeight.toFixed(2);
}
}
}, SmartEarth.Cesium.ScreenSpaceEventType.MOUSE_MOVE);
@@ -219,7 +219,7 @@
globe.ellipsoid.cartesianToCartographic(rightPosition);
var geodesic = new SmartEarth.Cesium.EllipsoidGeodesic();
geodesic.setEndPoints(leftCartographic, rightCartographic);
- that.rate = geodesic.surfaceDistance.toFixed(6); //鍒嗚鲸鐜�
+ that.rate = geodesic.surfaceDistance.toFixed(2); //鍒嗚鲸鐜�
});
},
diff --git a/src/views/datamanage/resourceManagement.vue b/src/views/datamanage/resourceManagement.vue
index 19f21af..af3bc84 100644
--- a/src/views/datamanage/resourceManagement.vue
+++ b/src/views/datamanage/resourceManagement.vue
@@ -24,10 +24,78 @@
> <i
:title="$t('common.iquery')"
slot="suffix"
- @click="setListDataStart"
+ @click="getResTableData"
class="el-icon-search"
style="padding-right: 8px"
></i></el-input>
+ </el-form-item>
+ <!-- 鏈嶅姟绫诲埆 -->
+ <el-form-item>
+ <el-select
+ size="small"
+ v-model="formInline.category"
+ :placeholder="$t('dataManage.layerObj.prompt18')"
+ @change="getResTableData"
+ >
+ <el-option
+ v-for="item in serviceType"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 鏁版嵁绫诲瀷 -->
+ <el-form-item>
+ <el-select
+ size="small"
+ v-model="formInline.data"
+ :placeholder="$t('dataManage.layerObj.prompt8')"
+ @change="getResTableData"
+ >
+ <el-option
+ v-for="item in dataType"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 鏈嶅姟绫诲埆 -->
+ <el-form-item>
+ <el-select
+ size="small"
+ v-model="formInline.type"
+ :placeholder="$t('dataManage.layerObj.prompt3')"
+ @change="getResTableData"
+ >
+ <el-option
+ v-for="item in dataTypes"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 鐘舵�� -->
+ <el-form-item>
+ <el-select
+ size="small"
+ v-model="formInline.status"
+ :placeholder="$t('dataManage.layerObj.prompt19')"
+ @change="getResTableData"
+ >
+ <el-option
+ v-for="item in statusType"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item style="float: right;">
<el-button
@@ -579,7 +647,11 @@
return {
formInline: {
- name: null
+ name: null,
+ type: null,
+ data: null,
+ category: null,
+ status: null
},
menuStatus: {
delete: false,
@@ -609,6 +681,7 @@
editDialog: false,
insertDialog: false,
dataType: [],
+ dataTypes: [],
serviceType: [],
categoryType: [],
insertDisabled: false,
@@ -616,6 +689,16 @@
isFullscreen: false,
prevDialog: false,
showMapView: false,
+ statusType: [
+ {
+ label: '绂佺敤', value: 0
+ },
+ {
+ label: '鍚敤鍘熷鍦板潃', value: 1
+ }, {
+ label: '鍚敤浠ｇ悊鍦板潃', value: 2
+ }
+ ]
};
},
watch: {
@@ -672,7 +755,13 @@
.catch(_ => { });
},
setEmptyData() {
- this.formInline.name = ""
+ this.formInline = {
+ name: null,
+ type: null,
+ data: null,
+ category: null,
+ status: null
+ }
this.setListDataStart()
},
setInsertTableData() {
@@ -809,7 +898,13 @@
})
}
this.dataType = str;
-
+ for (var i in serve_type) {
+ std.push({
+ value: serve_type[i].value,
+ label: serve_type[i].name,
+ })
+ }
+ this.dataTypes = std;
},
setScopeEdit(row) {
this.copyData = JSON.parse(JSON.stringify(row));
@@ -976,7 +1071,11 @@
}
},
async getResTableData() {
- this.listData.name = this.formInline.name
+ this.listData.name = this.formInline.name;
+ this.listData.data = this.formInline.data;
+ this.listData.type = this.formInline.type;
+ this.listData.category = this.formInline.category;
+ this.listData.status = this.formInline.status;
const data = await select_Res_ByPageAndCount(this.listData);
if (data.code != 200) {
return this.$message({
diff --git a/src/views/resourceQuery/resourceQuery.vue b/src/views/resourceQuery/resourceQuery.vue
index bfd8ac3..7f05ef8 100644
--- a/src/views/resourceQuery/resourceQuery.vue
+++ b/src/views/resourceQuery/resourceQuery.vue
@@ -376,6 +376,31 @@
if (data.code != 200) return
var std = [];
var result = data.result;
+
+ e.createUser = e.createName;
+ e.depcode = e.depName
+ e.dircode = e.dirName;
+ e.updateUser = e.updateName;
+
+ e.verid = e.verName;
+ if (e.sensortype > 0) {
+ for (var i in this.sensorOption) {
+ if (this.sensorOption[i].value == e.sensortype) {
+ e.sensortype = this.sensorOption[i].name
+ }
+ }
+ } else {
+ e.sensortype = null
+ }
+ if (e.mataType > 0) {
+ for (var i in this.metaOption) {
+ if (this.metaOption[i].value == e.mataType) {
+ e.mataType = this.metaOption[i].name
+ }
+ }
+ } else {
+ e.mataType = null
+ }
for (var i in result) {
for (var key in e) {
if (result[i].field == key) {
--
Gitblit v1.9.3