ffpark_front.git

parent: 4ee6f738 | 补丁 | 提交 | ignore whitespace

kongdeqiang

2024-04-22 d6e51b776dfe5cfb575610f423238f98b5e58b94

fix: 修改页面

6个文件已修改

1个文件已添加

	public/index.html	47 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/common/baiduMap.js	36 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/page/IndexXTYH.vue	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/page/TishiDialog.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/page/TishiDialog2.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/page/leaderShow/leaderIndex.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/page/show/show-index.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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>

 src/components/common/baiduMap.js

New file
@@ -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);
            };

            // 初始化成功后调用点聚合接口,因为百度的JS需要时间
            $.getScript(BMap_URL ,function(){
                console.log("加载聚合点JS文件...");
                //获取百度地图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)
            });
        });
    }
}

 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
          }

 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>

 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>

 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()

 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()

			@@ -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>

New file
			@@ -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);
			};

			// 初始化成功后调用点聚合接口,因为百度的JS需要时间
			$.getScript(BMap_URL ,function(){
			console.log("加载聚合点JS文件...");
			//获取百度地图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)
			});
			});
			}
			}

			@@ -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
			}

			@@ -9,7 +9,7 @@
			<div class="again-dialog-main">
			<img src="../../assets/images/wrongIcon.png" alt="">
			<h1>
			入场异常，请联系管理员
			入场信息异常，请联系管理员
			</h1>
			</div>
			</el-dialog>

			@@ -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()

			@@ -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()