From d6e51b776dfe5cfb575610f423238f98b5e58b94 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 22 四月 2024 15:35:55 +0800
Subject: [PATCH] fix: 修改页面
---
src/components/page/leaderShow/leaderIndex.vue | 6 ++
public/index.html | 47 +--------------
src/components/page/IndexXTYH.vue | 22 +------
src/components/page/TishiDialog.vue | 2
src/components/common/baiduMap.js | 36 ++++++++++++
src/components/page/TishiDialog2.vue | 2
src/components/page/show/show-index.vue | 8 ++
7 files changed, 59 insertions(+), 64 deletions(-)
diff --git a/public/index.html b/public/index.html
index 37a6931..d79e148 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,50 +5,13 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
<title>宄板嘲鐭垮尯鏅烘収鍋滆溅</title>
- <style>
- .loading {
- position: fixed;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- text-align: center;
- z-index: -1;
- }
-
- .spinner {
- width: 50px;
- height: 50px;
- border: 5px solid #ccc;
- border-top-color: #409EFF;
- border-radius: 50%;
- animation: spin 1s infinite linear;
- }
-
- .text {
- margin-top: 10px;
- font-size: 16px;
- color: #666;
- }
-
- @keyframes spin {
- to {
- transform: rotate(360deg);
- }
- }
- </style>
- <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=tuVbv4tLIzoX7IWdeKeTwojDqPILFoe5"></script>
- <!--<script src="//mapv.baidu.com/build/mapv.min.js"></script>
- <script src="https://code.bdstatic.com/npm/mapvgl@1.0.0-beta.127/dist/mapvgl.min.js"></script>-->
- <script type="text/javascript" src="http://api.map.baidu.com/library/Heatmap/2.0/src/Heatmap_min.js"></script>
- <script src="./static/iconfont.js"></script>
-
- <title>宄板嘲鏅烘収娉婅溅绯荤粺</title>
</head>
<body>
- <div class="loading" style="display:block">
- <div class="spinner"></div>
- <div class="text">姝ｅ湪鍔犺浇涓�...</div>
- </div>
<div id="app"></div>
</body>
+<!-- <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>-->
+<!-- <script>-->
+<!-- // VConsole 榛樿浼氭寕杞藉埌 `window.VConsole` 涓�-->
+<!-- var vConsole = new window.VConsole();-->
+<!-- </script>-->
</html>
diff --git a/src/components/common/baiduMap.js b/src/components/common/baiduMap.js
new file mode 100644
index 0000000..9a09b14
--- /dev/null
+++ b/src/components/common/baiduMap.js
@@ -0,0 +1,36 @@
+export default {
+ init: function (){
+ console.log("鍒濆鍖栫櫨搴﹀湴鍥捐剼鏈�...");
+ const AK = "****************";
+ const BMap_URL = "http://api.map.baidu.com/api?v=2.0&ak=tuVbv4tLIzoX7IWdeKeTwojDqPILFoe5&s=1&callback=onBMapCallback";
+ return new Promise((resolve, reject) => {
+ // 鍒ゆ柇鏄惁绗竴娆″姩鐢�
+ if(typeof BMap !== "undefined") {
+ resolve(BMap);
+ return true;
+ }
+ // 鐧惧害鍦板浘寮傛鍔犺浇鍥炶皟澶勭悊
+ window.onBMapCallback = function () {
+ console.log("鐧惧害鍦板浘鑴氭湰鍒濆鍖栨垚鍔�...");
+ // resolve(BMap);
+ };
+
+ // 鍒濆鍖栨垚鍔熷悗璋冪敤鐐硅仛鍚堟帴鍙�,鍥犱负鐧惧害鐨凧S闇�瑕佹椂闂�
+ $.getScript(BMap_URL ,function(){
+ console.log("鍔犺浇鑱氬悎鐐笿S鏂囦欢...");
+ //鑾峰彇鐧惧害鍦板浘js鎴愬姛鍚� 浼氭墽琛屾鏂规硶
+ setTimeout(function () {
+ let TextIconOverlay = document.createElement('script')
+ TextIconOverlay.type = "text/javascript"
+ TextIconOverlay.src = "//api.map.baidu.com/library/TextIconOverlay/1.2/src/TextIconOverlay_min.js"
+ let MarkerClusterer = document.createElement('script')
+ MarkerClusterer.type = "text/javascript"
+ // MarkerClusterer.src = "//api.map.baidu.com/library/MarkerClusterer/1.2/src/MarkerClusterer_min.js"
+ MarkerClusterer.src = "https://route-grasstech.oss-cn-shanghai.aliyuncs.com/NoDelete/MarkerClusterer.js"
+ document.body.appendChild(MarkerClusterer)
+ document.body.appendChild(TextIconOverlay)
+ }, 888)
+ });
+ });
+ }
+}
diff --git a/src/components/page/IndexXTYH.vue b/src/components/page/IndexXTYH.vue
index 3e9c0d0..94440a3 100644
--- a/src/components/page/IndexXTYH.vue
+++ b/src/components/page/IndexXTYH.vue
@@ -100,7 +100,7 @@
width="100%">
<div class="again-dialog-main">
<h1>
- 鎮ㄥ凡鍙戣捣杩囨璁㈠崟缂磋垂鐢宠锛屽纭缂磋垂鎴愬姛锛岃鍘熷湴绛夊緟鎶潌锛屽缂磋垂鏈垚鍔燂紝璇风户缁敮浠�
+ 鎮ㄥ凡鍙戣捣杩囨璁㈠崟缂磋垂鐢宠锛屽纭缂磋垂鎴愬姛锛岃鍘熷湴绛夊緟鎶潌鎴栬仈绯荤鐞嗗憳锛屽缂磋垂鏈垚鍔燂紝璇风户缁敮浠�
</h1>
</div>
<span slot="footer" class="dialog-footer">
@@ -182,12 +182,8 @@
for(var i=0;i<cs_arr.length;i++){
cs[cs_arr[i].split('=')[0]] = cs_arr[i].split('=')[1]
}
- // console.log(cs,'鎴戞槸cs=====')
- // this.outParkId = cs.code;
this.code2 = cs.code2;
this.code = cs.code;
- // console.log(this.code2,'this.code2=====2')
- // console.log(this.code,'this.code=====1')
//鍒濆鍖栬烦杞� 39 鏈嶅姟鍣�
if(this.code2 == null || this.code2 == ''){
// this.$message({
@@ -196,8 +192,8 @@
// duration:1000,
// });
window.location.href = "http://hesuancj.cn/#/index2?code2="+cs.code //姝ｅ紡
- // window.location.href = "http://192.168.0.8:8082/#/IndexXTYH39?code2="+cs.code //娴嬭瘯鐢ㄧ殑
- // setTimeout(function(){window.location.href = "http://192.168.0.8:8082/#/IndexXTYH39?code2="+cs.code},1000);
+ //window.location.href = "http://192.168.0.40:8080/#/IndexXTYH39?code2="+cs.code //娴嬭瘯鐢ㄧ殑
+ //window.location.href = "http://60.0.121.40:8889/#/IndexXTYH39?code2="+cs.code //娴嬭瘯鐢ㄧ殑
return;
}
if(this.code != null && this.code != '') {
@@ -222,21 +218,9 @@
if(!this.statisticData.enterTime) { //娌℃湁鍏ュ満
this.isShowjiaofei = false
this.tishiDialogVisiable = true
- // this.$message({
- // showClose: false,
- // duration:0,
- // type: 'success',
- // message: '鍏ュ満寮傚父锛岃鑱旂郴绠＄悊鍛�'
- // });
}else if(this.statisticData.enterTime && (!this.statisticData.price || this.statisticData.price == 0)) { //閲戦涓�0
this.isShowjiaofei = false
this.tishiDialogVisiable2 = true
- // this.$message({
- // showClose: false,
- // duration:0,
- // type: 'success',
- // message: '鏃犻渶缂磋垂锛岃鍘熷湴绛夊緟锛屾垨鑱旂郴绠＄悊鍛�'
- // });
}else {
this.isShowjiaofei = true
}
diff --git a/src/components/page/TishiDialog.vue b/src/components/page/TishiDialog.vue
index f66d6dd..8cf3e49 100644
--- a/src/components/page/TishiDialog.vue
+++ b/src/components/page/TishiDialog.vue
@@ -9,7 +9,7 @@
<div class="again-dialog-main">
<img src="../../assets/images/wrongIcon.png" alt="">
<h1>
- 鍏ュ満寮傚父锛岃鑱旂郴绠＄悊鍛�
+ 鍏ュ満淇℃伅寮傚父锛岃鑱旂郴绠＄悊鍛�
</h1>
</div>
</el-dialog>
diff --git a/src/components/page/TishiDialog2.vue b/src/components/page/TishiDialog2.vue
index 7a7c432..cb88af2 100644
--- a/src/components/page/TishiDialog2.vue
+++ b/src/components/page/TishiDialog2.vue
@@ -9,7 +9,7 @@
<div class="again-dialog-main">
<img src="../../assets/images/wrongIcon.png" alt="">
<h1>
- 鏃犻渶缂磋垂锛岃鍘熷湴绛夊緟锛屾垨鑱旂郴绠＄悊鍛�
+ 鏃犻渶缂磋垂锛岃閫�鍥為噸鏂拌瘑鍒溅鐗岋紝鎴栬仈绯荤鐞嗗憳
</h1>
</div>
</el-dialog>
diff --git a/src/components/page/leaderShow/leaderIndex.vue b/src/components/page/leaderShow/leaderIndex.vue
index b7e9438..9557ce8 100644
--- a/src/components/page/leaderShow/leaderIndex.vue
+++ b/src/components/page/leaderShow/leaderIndex.vue
@@ -210,6 +210,7 @@
import shangjiZhipaiForm from "./Dialog/shangjiZhipaiForm";
import xunjieOrderForm from "./Dialog/xunjieOrderForm";
import weizhangForm from "./Dialog/weizhangForm";
+ import BaiduMap from "../../common/baiduMap";
export default {
name: "leaderIndex",
components: {
@@ -292,6 +293,11 @@
}
},
mounted() {
+ BaiduMap.init()
+ .then((BMap) => {
+ console.log('鍦板浘鍒濆鍖�')
+ this.inits()
+ })
this.newTimes()
this.userName = this.getStore('name')
this.getData()
diff --git a/src/components/page/show/show-index.vue b/src/components/page/show/show-index.vue
index e2a2033..5e9aa24 100644
--- a/src/components/page/show/show-index.vue
+++ b/src/components/page/show/show-index.vue
@@ -473,6 +473,7 @@
<script>
import echarts from "echarts/lib/echarts";
+ import BaiduMap from '../../common/baiduMap'
export default {
name: "show-index",
data() {
@@ -517,7 +518,12 @@
}
}
},
- mounted() {
+ mounted() {
+ BaiduMap.init()
+ .then((BMap) => {
+ console.log('鍦板浘鍒濆鍖�')
+ this.inits()
+ })
this.tclyvEcharts()
this.tcpmEcharts()
this.ddtjEcharts()
--
Gitblit v1.9.1