Merge branch 'preview' of http://120.46.222.128:10021/elink-star/epmet-work-pc into preview

.env.development

@@ -1,7 +1,8 @@
 NODE_ENV=development
 
-VUE_APP_API_SERVER =  http://192.168.1.144/api
+VUE_APP_API_SERVER =  http://localhost:8080/api
-# VUE_APP_API_SERVER =  http://118.190.150.119:41080/api
+# VUE_APP_API_SERVER =  http://192.168.1.140/api
+# VUE_APP_API_SERVER =  http://219.146.91.110:30801/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epmet-cloud.elinkservice.cn/api

package.json

@@ -26,6 +26,7 @@
     "axios": "^0.19.0",
     "babel-eslint": "^8.0.1",
     "babel-plugin-component": "^1.1.1",
+    "css-loader": "^5.0.0",
     "echarts": "^5.2.2",
     "echarts-gl": "^2.0.9",
     "element-theme": "2.0.1",
@@ -40,8 +41,9 @@
     "jsencrypt": "^3.0.3",
     "lodash": "^4.17.15",
     "mint-ui": "^2.2.13",
+    "moment": "^2.29.4",
     "node-sass": "^4.12.0",
-        "ol": "^7.2.2",
+    "ol": "7.2.2",
     "portfinder": "^1.0.21",
     "proj4": "^2.8.0",
     "qs": "^6.7.0",
@@ -70,10 +72,12 @@
     "cross-env": "^7.0.3",
     "dai-js": "^0.0.12",
     "element-theme-chalk": "^2.13.0",
+    "filemanager-webpack-plugin": "^2.0.5",
     "natives": "^1.1.6",
     "ol": "^7.2.2",
     "sass-loader": "^7.3.1",
     "script-loader": "^0.7.2",
+    "style-loader": "^3.3.3",
     "tinymce": "5.8.2",
     "vue-template-compiler": "^2.6.11"
   },

src/App.vue

@@ -42,7 +42,7 @@ export default {
   },
   computed: {},
   mounted() {
-    console.log("开始：：：：" + localStorage.getItem("userType"));
+    // console.log("开始：：：：" + localStorage.getItem("userType"));
     if (!localStorage.getItem("userType")) {
       localStorage.setItem("userType", "oper");
     }
@@ -64,7 +64,7 @@ export default {
     // eslint-disable-next-line
     // debugger
     that.setEnv(env);
-    console.log("屏幕宽度:" + document.documentElement.clientWidth);
+    // console.log("屏幕宽度:" + document.documentElement.clientWidth);
     // 根据屏幕分辨率调整size
     if (document.documentElement.clientHeight < 800) {
       // medium大小
@@ -226,4 +226,22 @@ export default {
 * {
   @include scrollBar;
 }
+.selectPopClass {
+  border: none !important;
+  background: linear-gradient(180deg, #05326e 0%, #032a5d 100%) !important;
+  .el-select-dropdown__item {
+    color: #fff !important;
+    background: #05326e !important;
+  }
+  dropdown__item.hover,
+  .el-select-dropdown__item:hover {
+    background: #032a5d !important;
+  }
+  .popper__arrow {
+    border: none !important;
+    &::after {
+      border-bottom-color: #05326e !important;
+    }
+  }
+}
 </style>

src/assets/fonts/HYShuYuanHeiJ/index.css

@@ -0,0 +1,12 @@
+@font-face {
+    font-family: 'HYShuYuanHeiJ';
+    src: url('HYShuYuanHeiJRegular.eot');
+    src: url('HYShuYuanHeiJRegular.eot?#iefix') format('embedded-opentype'),
+        url('HYShuYuanHeiJRegular.woff2') format('woff2'),
+        url('HYShuYuanHeiJRegular.woff') format('woff'),
+        url('HYShuYuanHeiJRegular.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+    font-display: swap;
+}
+