From 16fbbddb45ec387f359358da77f81bfbbb3644fc Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 17 十月 2022 16:26:37 +0800
Subject: [PATCH] 黑白名单,令牌管理，综合展示修改
---
src/views/Synthesis/viewport.vue | 32 +++++--
src/api/api.js | 20 +++++
src/views/maintenance/tokentool.vue | 2
src/views/maintenance/blackwhiteList.vue | 44 +++++-----
src/components/mapsdk.vue | 21 ++++-
src/views/Synthesis/analyse.vue | 80 ++++++++++++--------
6 files changed, 127 insertions(+), 72 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index d99345c..8daa725 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -349,3 +349,23 @@
export function menuAuthSelectByPageForRole(params) {
return request.get('/menuAuth/selectByPageForRole', { params: params });
}
+//浠ょ墝绠＄悊鍒楄〃鑾峰彇
+export function select_Token_ByPageAndCount(params) {
+ return request.get('/token/selectByPageAndCount', { params: params });
+}
+//浠ょ墝绠＄悊鏂板
+export function insertToken(params) {
+ return request.post('/token/insertToken', params);
+}
+//浠ょ墝绠＄悊鍒犻櫎
+export function deleteTokens(params) {
+ return request.get(' /token/deleteTokens', { params: params });
+}
+//浠ょ墝绠＄悊淇敼
+export function updateToken(params) {
+ return request.post('/token/updateToken', params);
+}
+//榛戠櫧鍚嶅崟鍒楄〃鑾峰彇
+export function blacklistSelectByPageAndCount(params) {
+ return request.get('/blacklist/selectByPageAndCount', { params: params });
+}
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index 8ba7bb7..9730a8c 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -4,7 +4,7 @@
<script>
export default {
- name: "",
+ name: '',
data() {
return {};
},
@@ -13,9 +13,9 @@
},
methods: {
init3DMap() {
- window.sgworld = new SmartEarth.SGWorld("mapdiv", {
- url: "/SmartEarthSDK/Workers/image/earth.jpg",
- licenseServer: "http://192.168.20.39/LFServer",
+ window.sgworld = new SmartEarth.SGWorld('mapdiv', {
+ url: '/SmartEarthSDK/Workers/image/earth.jpg',
+ licenseServer: 'http://192.168.20.39/LFServer',
});
window.Viewer = sgworld._Viewer;
sgworld.Navigate.Stop(); //鍙栨秷椋炶鐘舵��
@@ -25,8 +25,19 @@
});
//鏄剧ずfps
sgworld._Viewer.scene.debugShowFramesPerSecond = false;
- sgworld.navControl("enableCompass", false);
+ //mpt娣诲姞
+ var option = {
+ url: 'http://183.162.245.49:82/SG/Elevation',
+ layerName: 'zhufeng.397336.mpt',
+ requestVertexNormals: true,
+ };
+ sgworld.Creator.sfsterrainprovider('', option, '', true, '');
+ //瀵艰埅鎺т欢
+ document.getElementById('distanceLegendDiv').style.display = 'none';
+ //姣斾緥灏�
+ sgworld.navControl('enableCompass', false);
//sgworld.navControl("enableDistanceLegend", false);
+ setTimeout(() => {}, 10000);
},
},
};
diff --git a/src/views/Synthesis/analyse.vue b/src/views/Synthesis/analyse.vue
index afba6fa..e676895 100644
--- a/src/views/Synthesis/analyse.vue
+++ b/src/views/Synthesis/analyse.vue
@@ -19,53 +19,69 @@
export default {
data() {
return {
+ isoline: null,
+ isolineFlag: false,
itemsOne: [
{
- id: "1",
- name: "synthesis.contouranalysis",
- class: "d1",
+ id: '1',
+ name: 'synthesis.contouranalysis',
+ class: 'd1',
},
{
- id: "2",
- name: "synthesis.slopeanalysis",
- class: "d2",
+ id: '2',
+ name: 'synthesis.slopeanalysis',
+ class: 'd2',
},
{
- id: "3",
- name: "synthesis.pathanalysis",
- class: "d3",
+ id: '3',
+ name: 'synthesis.pathanalysis',
+ class: 'd3',
},
{
- id: "4",
- name: "synthesis.cuttinganalysis",
- class: "d4",
+ id: '4',
+ name: 'synthesis.cuttinganalysis',
+ class: 'd4',
},
{
- id: "5",
- name: "synthesis.floodanalysis",
- class: "d5",
+ id: '5',
+ name: 'synthesis.floodanalysis',
+ class: 'd5',
},
{
- id: "6",
- name: "synthesis.earthworkcalculation",
- class: "d6",
+ id: '6',
+ name: 'synthesis.earthworkcalculation',
+ class: 'd6',
},
{
- id: "7",
- name: "synthesis.crosssectionanalysis",
- class: "d7",
+ id: '7',
+ name: 'synthesis.crosssectionanalysis',
+ class: 'd7',
},
{
- id: "8",
- name: "synthesis.imagecontrast",
- class: "d8",
+ id: '8',
+ name: 'synthesis.imagecontrast',
+ class: 'd8',
},
],
};
},
+ mounted() {
+ if (this.isoline == null) {
+ this.isoline = new SmartEarth.ElevationTool(sgworld);
+ }
+ },
methods: {
changeAnalsy(res) {
switch (res.id) {
+ case '1':
+ this.isolineFlag = !this.isolineFlag;
+ this.isoline.tf = this.isolineFlag;
+ this.isoline.render();
+ break;
+ case '2':
+ elevationTool.type = 'slope';
+ elevationTool.render();
+ break;
}
},
},
@@ -92,33 +108,33 @@
margin: 0px;
}
.d1 {
- background: url("../../assets/img/synthesis/妞渾 8 鎷疯礉 8.png") no-repeat
+ background: url('../../assets/img/synthesis/妞渾 8 鎷疯礉 8.png') no-repeat
center;
}
.d2 {
- background: url("../../assets/img/synthesis/鍦嗚鐭╁舰 12 鎷疯礉 5.png") no-repeat
+ background: url('../../assets/img/synthesis/鍦嗚鐭╁舰 12 鎷疯礉 5.png') no-repeat
center;
}
.d3 {
- background: url("../../assets/img/synthesis/鍦嗚鐭╁舰 10 鍓湰 3.png") no-repeat
+ background: url('../../assets/img/synthesis/鍦嗚鐭╁舰 10 鍓湰 3.png') no-repeat
center;
}
.d4 {
- background: url("../../assets/img/synthesis/鍥惧眰 74 鎷疯礉 3.png") no-repeat
+ background: url('../../assets/img/synthesis/鍥惧眰 74 鎷疯礉 3.png') no-repeat
center;
}
.d5 {
- background: url("../../assets/img/synthesis/鍥惧眰 20.png") no-repeat center;
+ background: url('../../assets/img/synthesis/鍥惧眰 20.png') no-repeat center;
}
.d6 {
- background: url("../../assets/img/synthesis/鍥惧眰 14 鎷疯礉 3.png") no-repeat
+ background: url('../../assets/img/synthesis/鍥惧眰 14 鎷疯礉 3.png') no-repeat
center;
}
.d7 {
- background: url("../../assets/img/synthesis/鍥惧眰 18.png") no-repeat center;
+ background: url('../../assets/img/synthesis/鍥惧眰 18.png') no-repeat center;
}
.d8 {
- background: url("../../assets/img/synthesis/鍦嗚鐭╁舰 12 鎷疯礉 6.png") no-repeat
+ background: url('../../assets/img/synthesis/鍦嗚鐭╁舰 12 鎷疯礉 6.png') no-repeat
center;
}
.backimge4 {
diff --git a/src/views/Synthesis/viewport.vue b/src/views/Synthesis/viewport.vue
index 7c64c78..5fd0ad1 100644
--- a/src/views/Synthesis/viewport.vue
+++ b/src/views/Synthesis/viewport.vue
@@ -20,6 +20,7 @@
data() {
return {
isRuler: false,
+ isNaviget: false,
itemsOne: [
{
id: '1',
@@ -68,13 +69,13 @@
changeview(res) {
switch (res.id) {
case '1':
- this.$bus.$emit('changemap', "鍒嗗睆");
+ this.$bus.$emit('changemap', '鍒嗗睆');
break;
case '2':
- this.$bus.$emit('changemap', "浜岀淮");
+ this.$bus.$emit('changemap', '浜岀淮');
break;
case '3':
- this.$bus.$emit('changemap', "涓夌淮");
+ this.$bus.$emit('changemap', '涓夌淮');
break;
case '4':
window.sgworld.Navigate.jumpTo({
@@ -91,6 +92,15 @@
case '7':
this.isRuler = !this.isRuler;
window.sgworld.navControl('enableCompass', this.isRuler);
+ break;
+ case '8':
+ this.isNaviget = !this.isNaviget;
+ if (this.isNaviget == false) {
+ document.getElementById('distanceLegendDiv').style.display = 'none';
+ } else if (this.isNaviget == true) {
+ document.getElementById('distanceLegendDiv').style.display =
+ 'block';
+ }
break;
}
// this.$bus.$emit("changetool", res_val);
@@ -119,35 +129,35 @@
margin: 0px;
}
.b1 {
- background: url("../../assets/img/synthesis/鍦嗚鐭╁舰 12 鎷疯礉 3.png") no-repeat
+ background: url('../../assets/img/synthesis/鍦嗚鐭╁舰 12 鎷疯礉 3.png') no-repeat
center;
}
.b2 {
- background: url("../../assets/img/synthesis/鍥惧眰 10 鎷疯礉.png") no-repeat
+ background: url('../../assets/img/synthesis/鍥惧眰 10 鎷疯礉.png') no-repeat
center;
}
.b3 {
- background: url("../../assets/img/synthesis/鍥惧眰 11 鎷疯礉.png") no-repeat
+ background: url('../../assets/img/synthesis/鍥惧眰 11 鎷疯礉.png') no-repeat
center;
}
.b4 {
- background: url("../../assets/img/synthesis/鍥惧眰 12 鎷疯礉 2.png") no-repeat
+ background: url('../../assets/img/synthesis/鍥惧眰 12 鎷疯礉 2.png') no-repeat
center;
}
.b5 {
- background: url("../../assets/img/synthesis/鍦嗚鐭╁舰 5 鎷疯礉 2.png") no-repeat
+ background: url('../../assets/img/synthesis/鍦嗚鐭╁舰 5 鎷疯礉 2.png') no-repeat
center;
}
.b6 {
- background: url("../../assets/img/synthesis/鍦嗚鐭╁舰 5 鎷疯礉 3.png") no-repeat
+ background: url('../../assets/img/synthesis/鍦嗚鐭╁舰 5 鎷疯礉 3.png') no-repeat
center;
}
.b7 {
- background: url("../../assets/img/synthesis/鐭╁舰 9.png") no-repeat center;
+ background: url('../../assets/img/synthesis/鐭╁舰 9.png') no-repeat center;
}
.b8 {
- background: url("../../assets/img/synthesis/妞渾 4.png") no-repeat center;
+ background: url('../../assets/img/synthesis/妞渾 4.png') no-repeat center;
}
.backimge2 {
width: 30px;
diff --git a/src/views/maintenance/blackwhiteList.vue b/src/views/maintenance/blackwhiteList.vue
index 8a7fc7d..5d0c029 100644
--- a/src/views/maintenance/blackwhiteList.vue
+++ b/src/views/maintenance/blackwhiteList.vue
@@ -61,20 +61,20 @@
</el-form-item>
<el-form-item>
<el-button @click="onSubmit">{{
- $t("operatManage.BWL.change")
+ $t('operatManage.BWL.change')
}}</el-button>
</el-form-item>
<el-form-item>
<el-button @click="onSubmit"
><i class="el-icon-search"></i> {{
- $t("operatManage.BWL.search")
+ $t('operatManage.BWL.search')
}}</el-button
>
</el-form-item>
<el-form-item>
<el-button @click="onSubmit"
><i class="el-icon-delete"></i> {{
- $t("operatManage.BWL.reset")
+ $t('operatManage.BWL.reset')
}}</el-button
>
</el-form-item>
@@ -161,14 +161,14 @@
<el-form-item>
<el-button @click="onSubmit"
><i class="el-icon-search"></i> {{
- $t("operatManage.BWL.search")
+ $t('operatManage.BWL.search')
}}</el-button
>
</el-form-item>
<el-form-item>
<el-button @click="onSubmit"
><i class="el-icon-delete"></i> {{
- $t("operatManage.BWL.reset")
+ $t('operatManage.BWL.reset')
}}</el-button
>
</el-form-item>
@@ -229,10 +229,10 @@
</el-tabs>
</div>
</template>
-
- <script>
-import MyBread from "../../components/MyBread.vue";
-import { blacklistSelectByPageAndCount } from "../../api/api";
+
+<script>
+import MyBread from '../../components/MyBread.vue';
+import { blacklistSelectByPageAndCount } from '../../api/api';
export default {
//import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {
@@ -241,14 +241,14 @@
data() {
return {
- activeName: "first",
+ activeName: 'first',
currentPage: 1,
form: {
- blackListIP: "",
- IPState: "",
- interceptionCycle: "",
- unit: "",
- interceptionNumber: "",
+ blackListIP: '',
+ IPState: '',
+ interceptionCycle: '',
+ unit: '',
+ interceptionNumber: '',
},
BTableData: [],
WTableData: [],
@@ -269,7 +269,7 @@
methods: {
//鏍煎紡鍖栨椂闂�
add0(m) {
- return m < 10 ? "0" + m : m;
+ return m < 10 ? '0' + m : m;
},
//鏍煎紡鍖栨椂闂�
format(shijianchuo) {
@@ -282,7 +282,7 @@
var mm = time.getMinutes();
var s = time.getSeconds();
return (
- y + "-" + this.add0(m) + "-" + this.add0(d)
+ y + '-' + this.add0(m) + '-' + this.add0(d)
// " " +
// this.add0(h) +
// ":" +
@@ -319,7 +319,7 @@
this.getList();
},
onSubmit() {
- console.log("submit!");
+ console.log('submit!');
},
resetForm(formName) {
this.$refs[formName].resetFields();
@@ -328,16 +328,15 @@
const data = await blacklistSelectByPageAndCount(this.WListData);
if (data.code != 200) {
- return this.$message.error("鍒楄〃璋冪敤澶辫触");
+ return this.$message.error('鍒楄〃璋冪敤澶辫触');
}
this.WTableData = data.result;
this.Wcount = data.count;
},
async BGetList() {
const data = await blacklistSelectByPageAndCount(this.BListData);
- console.log(data);
if (data.code != 200) {
- return this.$message.error("鍒楄〃璋冪敤澶辫触");
+ return this.$message.error('鍒楄〃璋冪敤澶辫触');
}
this.BTableData = data.result;
this.Bcount = data.count;
@@ -349,7 +348,7 @@
},
};
</script>
- <style lang="less" scoped>
+<style lang="less" scoped>
//@import url(); 寮曞叆鍏叡css绫�
.logLog_box {
background: rgb(240, 242, 245);
@@ -384,4 +383,3 @@
}
}
</style>
-
\ No newline at end of file
diff --git a/src/views/maintenance/tokentool.vue b/src/views/maintenance/tokentool.vue
index df6fea4..1e2d131 100644
--- a/src/views/maintenance/tokentool.vue
+++ b/src/views/maintenance/tokentool.vue
@@ -490,8 +490,8 @@
if (this.ruleForm.value != null) {
this.listData.type = parseInt(this.ruleForm.value);
}
- debugger;
const data = await select_Token_ByPageAndCount(this.listData);
+ console.log('Token鑾峰彇', data);
if (data.code != 200) {
this.$message.error('鍒楄〃璋冪敤澶辫触');
}
--
Gitblit v1.9.3