From 084dd988ee8e655227436a4894d26cd64043806f Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期四, 23 一月 2025 09:29:46 +0800
Subject: [PATCH] 稳定版提交
---
src/components/coordinate.vue | 6
src/components/toplane.vue | 39 +--------
src/components/degree.vue | 103 +++++++++++++++----------
src/components/distance.vue | 33 ++++++--
4 files changed, 93 insertions(+), 88 deletions(-)
diff --git a/src/components/coordinate.vue b/src/components/coordinate.vue
index 32aa151..0c541ec 100644
--- a/src/components/coordinate.vue
+++ b/src/components/coordinate.vue
@@ -39,7 +39,6 @@
style=" margin-right: 50px; margin-top: 180px;" class="fixed-button">璁＄畻鍧愭爣</el-button>
<el-button @click="onClear" type="success" style=" margin-left: 80px; margin-top:180px" class="fixed-buttonB">娓呯┖鏁版嵁</el-button>
</el-form>
-
</div>
<div style="text-align: center;color: #f5f7fa;position: absolute;font-size: 12px;bottom:30px;left: 0;right: 0;">
<a target="_blank" id="icp">鍖椾含鍗庢槦鍖楁枟鏅烘帶鎶�鏈湁闄愬叕鍙哥増鏉冩墍鏈変含ICP澶�15062414鍙�-11</a>
@@ -50,11 +49,11 @@
<script>
import axios from 'axios';
-const url = 'http://39.106.210.13:8848/hxzkuwb/gnssToxy';
+const url = 'http://39.106.210.13:8087/gnssToxy';
+// const url = 'http://localhost:8888/hxzkuwb/gnssToxy';
// const url = 'http://127.0.0.1:8848/hxzkuwb/gnssToxy';
// const url = 'http://localhost:8848/Hxzkrd/compute/gnssToxy';
export default {
-
data() {
return {
dialogVisible: false,
@@ -68,6 +67,7 @@
};
},
methods: {
+
goToDistance() {
this.$router.push('/distance'); // 鏍规嵁鑷畾涔夌殑璺敱璁剧疆璺宠浆鍒版寚瀹氶〉闈�
},
diff --git a/src/components/degree.vue b/src/components/degree.vue
index 95eb706..853e303 100644
--- a/src/components/degree.vue
+++ b/src/components/degree.vue
@@ -1,18 +1,20 @@
<template>
<div class="fullscreen-bg">
<div style="width: 20%;margin-top: 10px; position: absolute;">
- <el-button class="title_linespan" type="text" @click="goToindex">瀹樼綉</el-button >
- <el-button class="title_linespan" type="text" @click="goToDistance">璁＄畻璺濈</el-button >
- <el-button class="title_linespan" style="color: #f5f7fa; text-decoration: underline;" type="text" @click="goToDegree">搴﹀垎杞崲</el-button >
- <el-button class="title_linespan" type="text" @click="goToCoordinate">鍧愭爣璁＄畻</el-button >
- <el-button class="title_linespan" type="text" @click="goToplane">鍧愭爣杞崲</el-button >
- </div>
+ <el-button class="title_linespan" type="text" @click="goToindex">瀹樼綉</el-button>
+ <el-button class="title_linespan" type="text" @click="goToDistance">璁＄畻璺濈</el-button>
+ <el-button class="title_linespan" style="color: #f5f7fa; text-decoration: underline;" type="text"
+ @click="goToDegree">搴﹀垎杞崲</el-button>
+ <el-button class="title_linespan" type="text" @click="goToCoordinate">鍧愭爣璁＄畻</el-button>
+ <el-button class="title_linespan" type="text" @click="goToplane">鍧愭爣杞崲</el-button>
+ </div>
<div class="bg-red">
<el-form :inline="true" :label-position="labelPosition" label-width="80px" :model="formLabelAlign">
<h3 style="margin-left: -330px; color: #f5f7fa;">搴﹀垎杞害</h3>
- <el-input type="textarea" :rows="3" v-model="formLabelAlign.df" placeholder="杈撳叆搴﹀垎鏍煎紡鏁版嵁" style="width: 90%; margin-top: 5px;"></el-input>
+ <el-input type="textarea" :rows="3" v-model="formLabelAlign.df" placeholder="杈撳叆搴﹀垎鏍煎紡鏁版嵁"
+ style="width: 90%; margin-top: 5px;"></el-input>
<el-form-item style="margin-top: 20px; margin-right: 20px; color: #f5f7fa;">
<el-input v-model="formLabelAlign.resdu" style="margin-left: 10px; width: 325px;"></el-input>
</el-form-item>
@@ -22,7 +24,8 @@
<!--------------------------------------------------------------->
<h3 style="margin-left: -330px; color: #f5f7fa;">搴﹁浆搴﹀垎</h3>
- <el-input type="textarea" :rows=3 v-model="formLabelAlign.du" placeholder="杈撳叆搴︽牸寮忔暟鎹暟鎹�" style="width: 90%; margin-top: 5px;"></el-input>
+ <el-input type="textarea" :rows=3 v-model="formLabelAlign.du" placeholder="杈撳叆搴︽牸寮忔暟鎹暟鎹�"
+ style="width: 90%; margin-top: 5px;"></el-input>
<el-form-item style="margin-top: 20px; margin-right: 20px; color: #f5f7fa;">
<el-input v-model="formLabelAlign.resdf" style="margin-left: 10px; width: 325px;"></el-input>
</el-form-item>
@@ -30,20 +33,23 @@
<el-button @click="onDuSubmit" type="success">璁＄畻</el-button>
</el-form-item>
</el-form>
-
+
</div>
<div style="text-align: center;color: #f5f7fa;position: absolute;font-size: 12px;bottom:30px;left: 0;right: 0;">
- <a target="_blank" id="icp">鍖椾含鍗庢槦鍖楁枟鏅烘帶鎶�鏈湁闄愬叕鍙哥増鏉冩墍鏈変含ICP澶�15062414鍙�-11</a>
- </div>
+ <a target="_blank" id="icp">鍖椾含鍗庢槦鍖楁枟鏅烘帶鎶�鏈湁闄愬叕鍙哥増鏉冩墍鏈変含ICP澶�15062414鍙�-11</a>
+ </div>
</div>
</template>
<script>
import axios from 'axios';
-const dfurl = 'http://39.106.210.13:8848/hxzkuwb/ddmm2d';
-const duurl = 'http://39.106.210.13:8848/hxzkuwb/dd2ddmm';
+const dfurl = 'http://39.106.210.13:8087/ddmm2d';
+const duurl = 'http://39.106.210.13:8087/dd2ddmm';
+
+// const dfurl = 'http://localhost:8082/ddmm2d';
+// const duurl = 'http://localhost:8082/dd2ddmm';
// const dfurl = 'http://127.0.0.1:8848/hxzkuwb/ddmm2d';
// const duurl = 'http://127.0.0.1:8848/hxzkuwb/dd2ddmm';
// const dfurl = 'http://localhost:8848/Hxzkrd/compute/ddmm2d';
@@ -63,7 +69,7 @@
},
methods: {
goToDistance() {
-
+
this.$router.push('/distance'); // 鏍规嵁鑷畾涔夌殑璺敱璁剧疆璺宠浆鍒版寚瀹氶〉闈�
// this.$router.go(0);
},
@@ -87,24 +93,29 @@
console.log(this.formLabelAlign.df.split("."));
if (!this.formLabelAlign.df) {
this.$message.error('璇疯緭鍏ュ害鍒嗘牸寮忔暟鎹�');
- }else if (this.formLabelAlign.df.split(".").length!=2) {
+ } else if (this.formLabelAlign.df.split(".").length != 2) {
this.$message.error('杈撳叆鏈夎锛屾棤娉曡绠楋紒璇锋鏌ユ暟鎹�');
} else {
const changeOrigin = true;
- const params = { df: this.formLabelAlign.df };
- axios.get(dfurl, { params })
- .then((response) => {
- console.log('鎴愬姛鑾峰彇鍒板悗绔暟鎹�', response.data);
- // 澶勭悊杩斿洖鐨勬暟鎹�
- // console.log(res);
- this.formLabelAlign.resdu = response.data
+ const params = { df: this.formLabelAlign.df };
+ axios.get(dfurl, {
+ params,
+ // headers: {
+ // 'X-Access-Token:': `eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ0aW1lU3RhbXAiOjE3MzU0NTM1OTgzODksInVzZXJJZCI6IueOi-mjniJ9.HReZWbn3qHCAFw65InGjQ7ShiMbxQ0cbkM9RQNuhnfg` // 灏唗oken娣诲姞鍒拌姹傚ご涓�
+ // }
})
- .catch((error) => {
- console.error('鑾峰彇鍚庣鏁版嵁澶辫触', error);
- // 閿欒澶勭悊
- });
+ .then((response) => {
+ console.log('鎴愬姛鑾峰彇鍒板悗绔暟鎹�', response.data);
+ // 澶勭悊杩斿洖鐨勬暟鎹�
+ // console.log(res);
+ this.formLabelAlign.resdu = response.data
+ })
+ .catch((error) => {
+ console.error('鑾峰彇鍚庣鏁版嵁澶辫触', error);
+ // 閿欒澶勭悊
+ });
}
-
+
@@ -112,21 +123,26 @@
onDuSubmit() {
if (!this.formLabelAlign.du) {
this.$message.error('璇疯緭鍏ュ害鏍煎紡鏁版嵁');
- }else if (this.formLabelAlign.du.split(".").length!=2) {
+ } else if (this.formLabelAlign.du.split(".").length != 2) {
this.$message.error('杈撳叆鏈夎锛屾棤娉曡绠楋紒璇锋鏌ユ暟鎹�');
} else {
- const params = { du: this.formLabelAlign.du };
- axios.get(duurl, { params })
- .then((response) => {
- console.log('鎴愬姛鑾峰彇鍒板悗绔暟鎹�', response.data);
- // 澶勭悊杩斿洖鐨勬暟鎹�
- // console.log(res);
- this.formLabelAlign.resdf = response.data
+ const params = { du: this.formLabelAlign.du };
+ axios.get(duurl, {
+ params,
+ // headers: {
+ // 'X-Access-Token::': `eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ0aW1lU3RhbXAiOjE3MzU0NTM1OTgzODksInVzZXJJZCI6IueOi-mjniJ9.HReZWbn3qHCAFw65InGjQ7ShiMbxQ0cbkM9RQNuhnfg` // 灏唗oken娣诲姞鍒拌姹傚ご涓�
+ // }
})
- .catch((error) => {
- console.error('鑾峰彇鍚庣鏁版嵁澶辫触', error);
- // 閿欒澶勭悊
- });
+ .then((response) => {
+ console.log('鎴愬姛鑾峰彇鍒板悗绔暟鎹�', response.data);
+ // 澶勭悊杩斿洖鐨勬暟鎹�
+ // console.log(res);
+ this.formLabelAlign.resdf = response.data
+ })
+ .catch((error) => {
+ console.error('鑾峰彇鍚庣鏁版嵁澶辫触', error);
+ // 閿欒澶勭悊
+ });
}
},
}
@@ -138,11 +154,13 @@
margin-left: 10px;
color: #007cf0
}
+
/* 榧犳爣鎮诞鍚庣殑璁剧疆 */
.title_linespan:hover {
color: #ffffff;
- text-decoration: underline;
+ text-decoration: underline;
}
+
.fullscreen-bg {
position: fixed;
top: 0;
@@ -178,7 +196,6 @@
:deep(.el-input__wrapper) {
font-size: 14px;
/* width: 100%; */
- /* height:320px;
-} */
-
+/* height:320px;
+} */
</style>
\ No newline at end of file
diff --git a/src/components/distance.vue b/src/components/distance.vue
index 84e4180..4b0304d 100644
--- a/src/components/distance.vue
+++ b/src/components/distance.vue
@@ -66,12 +66,19 @@
<script>
import axios from 'axios';
-const dfurl = 'http://39.106.210.13:8848/hxzkuwb/ddmm2d';
-const duurl = 'http://39.106.210.13:8848/hxzkuwb/dd2ddmm';
-// const url = 'http://127.0.0.1:8848/hxzkuwb/jisuanjingwei.do';
-const url = 'http://39.106.210.13:8848/hxzkuwb/jisuanjingwei.do';
-const url1 = 'http://39.106.210.13:8848/hxzkuwb/jisuanbaowen.do';
-const duggaurl = 'http://39.106.210.13:8848/hxzkuwb/jisuandubaowen.do';
+const dfurl = 'http://39.106.210.13:8087/ddmm2d';
+const duurl = 'http://39.106.210.13:8087/dd2ddmm';
+ // const url = 'http://127.0.0.1:8888/hxzkuwb/jisuanjingwei.do';
+const url = 'http://39.106.210.13:8087/jisuanjingwei.do';
+const url1 = 'http://39.106.210.13:8087/jisuanbaowen.do';
+const duggaurl = 'http://39.106.210.13:8087/jisuandubaowen.do';
+
+// const dfurl = 'http://localhost:8888/hxzkuwb/ddmm2d';
+// const duurl = 'http://localhost:8888/hxzkuwb/dd2ddmm';
+// // const url = 'http://127.0.0.1:8888/hxzkuwb/jisuanjingwei.do';
+// const url = 'http://localhost:8888/hxzkuwb/jisuanjingwei.do';
+// const url1 = 'http://localhost:8888/hxzkuwb/jisuanbaowen.do';
+// const duggaurl = 'http://localhost:8888/hxzkuwb/jisuandubaowen.do';
// const url = 'http://localhost:8848/Hxzkrd/compute/jisuanjingwei.do';
export default {
@@ -527,8 +534,17 @@
});
}
} else {
- var gnssa1 = this.formLabelAlign.gnssa.replace(/\s*/g, "").split(",")
- var gnssb1 = this.formLabelAlign.gnssb.replace(/\s*/g, "").split(",")
+ if (!this.formLabelAlign.gnssa) {
+ this.$message.error('璇疯緭鍏鐐笹NGGA鏍煎紡鏁版嵁');
+ }else if (!this.formLabelAlign.gnssb) {
+ this.$message.error('璇疯緭鍏鐐笹NGGA鏍煎紡鏁版嵁');
+ } else if (this.formLabelAlign.gnssa.split(",").length<15) {
+ this.$message.error('A鐐笹NGGA鏍煎紡鏁版嵁鏈夎');
+ }else if (this.formLabelAlign.gnssb.split(",").length<15) {
+ this.$message.error('B鐐笹NGGA鏍煎紡鏁版嵁鏈夎');
+ } else{
+ var gnssa1 = this.formLabelAlign.gnssa.split(",")
+ var gnssb1 = this.formLabelAlign.gnssb.split(",")
var str = gnssa1[2] + ";" + gnssa1[4] + ";" + gnssb1[2] + ";" + gnssb1[4];
// const params = { gnggA: this.formLabelAlign.gnssa,gnggB:this.formLabelAlign.gnssb };
const params = { str:str };
@@ -542,6 +558,7 @@
console.error('鑾峰彇鍚庣鏁版嵁澶辫触', error);
// 閿欒澶勭悊
});
+ }
}
},
onClear() {
diff --git a/src/components/toplane.vue b/src/components/toplane.vue
index 07ab711..33e9f99 100644
--- a/src/components/toplane.vue
+++ b/src/components/toplane.vue
@@ -13,13 +13,13 @@
<!-- <el-form :inline="true" :label-position="labelPosition" label-width="80px" :model="formLabelAlign"> -->
<div style="display: flex; ">
- <div style="width:16%;height: 60px;border-right: 1px solid black">
+ <div style="width:15.9%;height: 60px;border-right: 1px solid black">
<h2 style="color: #f5f7fa;margin-left: 5px;width: 50px;">鍚嶇О</h2>
</div>
<div style="width:42%;height: 60px;border-right: 1px solid black">
<h3 style="color: #f5f7fa;font-size: 18px;">婵�鍏夌偣浜�</h3>
</div>
- <div style="width:42%;height: 60px;">
+ <div style="width:41.9%;height: 60px;">
<h3 style="color: #f5f7fa;font-size: 18px;">CAD鍦板浘</h3>
</div>
</div>
@@ -275,9 +275,11 @@
// String posPlane = "158,596,0;671,596,0;158,1430,0";
// String posPointCloud = "3.851,8.806,-0.207;7.68,5.362,-0.197;-1.71,2.54,-0.21";
// String posPointCloudCheck = "-1.161,3.115,2.424";
+// 鎴愬姛鑾峰彇鍒板悗绔暟鎹� 161.5472106600515;1352.1185150148528;263.3654095401726;
import axios from 'axios';
//const dfurl = 'http://39.106.210.13:8848/hxzkuwb/ddmm2d';
-const plane = 'http://39.106.210.13:8848/hxzkuwb/toplane';
+const plane = 'http://39.106.210.13:8087/toplane';
+// const plane = 'http://localhost:8888/hxzkuwb/toplane';
// const dfurl = 'http://127.0.0.1:8848/hxzkuwb/ddmm2d';
// const duurl = 'http://127.0.0.1:8848/hxzkuwb/dd2ddmm';
// const dfurl = 'http://localhost:8848/Hxzkrd/compute/ddmm2d';
@@ -320,37 +322,6 @@
planeDY: '',
planeDZ: '',
},
-
- // labelPosition: 'right',
- // formLabelAlign: {
- // df: '',
- // du: '',
- // resdu: '',
- // resdf: ''
- // },
- // tableData: [
-
- // {
- // name: '宸茬煡A鐐�',
- // todayBuy: 300,
- // monthBuy: 2200,
- // totalBuy: 24000
- // },
- // {
- // name: '宸茬煡B鐐�',
- // todayBuy: 300,
- // monthBuy: 2200,
- // totalBuy: 24000
- // },
- // {
- // name: '宸茬煡C鐐�',
- // todayBuy: 300,
- // monthBuy: 2200,
- // totalBuy: 24000
- // }
- // ],
-
-
};
},
--
Gitblit v1.9.3