From b921db470a289d3a5bdf2db8d60e6e5e6b4b5973 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 10 May 2021 14:55:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
public/xcxh5map/xcxmap.html | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/public/xcxh5map/xcxmap.html b/public/xcxh5map/xcxmap.html
index b2c7250..6ba90af 100644
--- a/public/xcxh5map/xcxmap.html
+++ b/public/xcxh5map/xcxmap.html
@@ -6,34 +6,64 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>map</title>
+ <!-- vue -->
+ <script src="https://cdn.jsdelivr.net/npm/vue@2.6.12"></script>
+
<!-- leaflet支持 -->
<script src="./lid/leaflet.js"></script>
<link rel="stylesheet" href="./lid/leaflet.css" />
+
<!-- leaflet聚合支持 -->
<link rel="stylesheet" href="./lid/MarkerCluster.css" />
<link rel="stylesheet" href="./lid/MarkerCluster.Default.css" />
<script src="./lid/leaflet.markercluster-src.js"></script>
+
<!-- layui支持 -->
- <link rel="stylesheet" href="../map/lib/layui/css/layui.css" media="all">
- <script src="../map/lib/layui/layui.js" charset="utf-8"></script>
+ <!-- <link rel="stylesheet" href="../map/lib/layui/css/layui.css" media="all"> -->
+ <!-- <script src="../map/lib/layui/layui.js" charset="utf-8"></script> -->
+
+ <!-- elementui -->
+ <script src="../map/lib/elementUi.js"></script>
+ <!-- <link rel="stylesheet" href="../map/lib/elementUi.css"> -->
+ <link rel="stylesheet" href="./css/elementUI.css">
+ <!-- <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> -->
+
<!-- jqurey -->
- <script src="../map/lib/jquery.js" charset="utf-8"></script>
+ <!-- <script src="../map/lib/jquery.js" charset="utf-8"></script> -->
+
<!-- 微信支持 -->
<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
- <script src="./js/wx.js"></script>
+ <!-- <script src="./js/wx.js"></script> -->
+
<!-- omyself支持 -->
<link rel="stylesheet" href="./css/body.css" />
- <!-- 获取urlData -->
- <script src="./js/getUrlData.js"></script>
- <!-- 初始化地图 -->
- <script src="./js/createMap.js"></script>
- <!-- 初始化属性 -->
- <script src="./js/def.js"></script>
- <!-- window.onlond -->
- <script src="./js/startMap.js"></script>
</head>
+
<body>
- <div id="map"></div>
+ <div id="mapVue">
+ <!-- <div class="popup">
+ <el-drawer title="我是标题" :visible.sync="drawer" >
+ <span>我来啦!123{{dialogVisible}}222</span>
+ </el-drawer>
+ </div> -->
+ <div id="map"></div>
+ <div id="seedata">
+ <div class="title">
+ {{seedata.title}}
+ </div>
+ <div class="main">
+ <el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-tab-pane label="用户管理" name="first">用户管理</el-tab-pane>
+ <el-tab-pane label="配置管理" name="second">配置管理</el-tab-pane>
+ <el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>
+ <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>
+ </el-tabs>
+ {{seedata.jd}}-{{seedata.wd}}
+ </div>
+ </div>
+ </div>
+ <!-- vue渲染 -->
+ <script src="./js/vueMain.js"></script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.3