Browse Source

Merge branch 'yx' of ssh://61.161.152.110:29418/electronic-map into tjj2

darker 3 years ago
parent
commit
b00a0d6b64
3 changed files with 7 additions and 3 deletions
  1. 4 2
      package.json
  2. 2 0
      public/index.html
  3. 1 1
      src/main.js

+ 4 - 2
package.json

@@ -14,10 +14,12 @@
     "@arcgis/core": "^4.19.3",
     "animate.css": "3.5",
     "axios": "^0.21.1",
+    "babel-polyfill": "^6.26.0",
     "core-js": "^3.6.5",
     "echarts": "^5.1.1",
     "echarts-gl": "^2.0.4",
-    "element-plus": "^1.0.2-beta.53",
+    "element-plus": "^1.1.0-beta.4",
+    "es6-promise": "^4.2.8",
     "file-saver": "^2.0.5",
     "font-awesome": "^4.7.0",
     "html2canvas": "^1.0.0-rc.7",
@@ -26,7 +28,7 @@
     "stompjs": "^2.3.3",
     "three": "^0.129.0",
     "vivus": "^0.4.6",
-    "vue": "^3.0.0",
+    "vue": "^3.0.11",
     "vue-axios": "^3.2.4",
     "vue-router": "^4.0.0-0",
     "vuex": "^4.0.0-0",

+ 2 - 0
public/index.html

@@ -2,6 +2,8 @@
 <html lang="">
   <head>
     <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,IE=IE9">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">

+ 1 - 1
src/main.js

@@ -6,7 +6,7 @@ import 'font-awesome/css/font-awesome.min.css';
 
 // 引入 element-ui
 import ElementPlus from 'element-plus';
-import 'element-plus/lib/theme-chalk/index.css';
+import 'element-plus/dist/index.css';
 import locale from 'element-plus/lib/locale/lang/zh-cn';
 
 // 引入环境配置