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

@@ -1,118 +1,122 @@
 {
-    "name": "epmet-oper-gov",
+  "name": "epmet-oper-gov",
-    "version": "1.0.0",
+  "version": "1.0.0",
-    "private": true,
+  "private": true,
-    "scripts": {
+  "scripts": {
-        "dev": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
+    "dev": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
-        "serve": "vue-cli-service serve",
+    "serve": "vue-cli-service serve",
-        "build": "vue-cli-service build",
+    "build": "vue-cli-service build",
-        "build:sit": "vue-cli-service build --mode production.sit",
+    "build:sit": "vue-cli-service build --mode production.sit",
-        "build:uat": "vue-cli-service build --mode production.uat",
+    "build:uat": "vue-cli-service build --mode production.uat",
-        "build:preview": "vue-cli-service build --mode preview",
+    "build:preview": "vue-cli-service build --mode preview",
-        "build:prod": "vue-cli-service build --mode production",
+    "build:prod": "vue-cli-service build --mode production",
-        "build:shibei_prod": "vue-cli-service build --mode shibei_production",
+    "build:shibei_prod": "vue-cli-service build --mode shibei_production",
-        "lint": "vue-cli-service lint",
+    "lint": "vue-cli-service lint",
-        "et": "node_modules/.bin/et",
+    "et": "node_modules/.bin/et",
-        "et:init": "node_modules/.bin/et -i",
+    "et:init": "node_modules/.bin/et -i",
-        "et:list": "gulp themes"
+    "et:list": "gulp themes"
+  },
+  "dependencies": {
+    "@antv/l7": "2.9.14",
+    "@antv/l7-draw": "3.0.5",
+    "@antv/l7-maps": "2.9.14",
+    "@riophae/vue-treeselect": "^0.4.0",
+    "@tinymce/tinymce-vue": "^3.2.8",
+    "async-validator": "^4.2.5",
+    "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",
+    "element-ui": "2.13.2",
+    "file-saver": "^2.0.5",
+    "gulp-autoprefixer": "^6.1.0",
+    "gulp-clean-css": "^4.2.0",
+    "gulp-load-plugins": "^2.0.0",
+    "gulp-rename": "^1.4.0",
+    "gulp-sass": "^4.0.2",
+    "js-cookie": "^2.2.0",
+    "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",
+    "portfinder": "^1.0.21",
+    "proj4": "^2.8.0",
+    "qs": "^6.7.0",
+    "quill": "^1.3.6",
+    "screenfull": "^4.2.1",
+    "sortablejs": "^1.12.0",
+    "svg-sprite-loader": "^4.1.6",
+    "throttle-debounce": "^3.0.1",
+    "turf": "^3.0.14",
+    "v-distpicker": "^1.2.2",
+    "vue": "^2.6.11",
+    "vue-baidu-map": "^0.21.22",
+    "vue-i18n": "^8.12.0",
+    "vue-quill-editor": "^3.0.6",
+    "vue-router": "^3.0.7",
+    "vuex": "^3.1.1",
+    "xlsx": "^0.17.1"
+  },
+  "devDependencies": {
+    "@antv/f2": "^3.8.10-beta.1",
+    "@tinymce/tinymce-vue": "3.2.8",
+    "@vue/cli-plugin-babel": "^3.10.0",
+    "@vue/cli-plugin-eslint": "^3.10.0",
+    "@vue/cli-service": "^3.10.0",
+    "@vue/eslint-config-standard": "^4.0.0",
+    "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"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
     },
-    "dependencies": {
+    "extends": [
-        "@antv/l7": "2.9.14",
+      "plugin:vue/essential",
-        "@antv/l7-draw": "3.0.5",
+      "@vue/standard"
-        "@antv/l7-maps": "2.9.14",
-        "@riophae/vue-treeselect": "^0.4.0",
-        "@tinymce/tinymce-vue": "^3.2.8",
-        "async-validator": "^4.2.5",
-        "axios": "^0.19.0",
-        "babel-eslint": "^8.0.1",
-        "babel-plugin-component": "^1.1.1",
-        "echarts": "^5.2.2",
-        "echarts-gl": "^2.0.9",
-        "element-theme": "2.0.1",
-        "element-ui": "2.13.2",
-        "file-saver": "^2.0.5",
-        "gulp-autoprefixer": "^6.1.0",
-        "gulp-clean-css": "^4.2.0",
-        "gulp-load-plugins": "^2.0.0",
-        "gulp-rename": "^1.4.0",
-        "gulp-sass": "^4.0.2",
-        "js-cookie": "^2.2.0",
-        "jsencrypt": "^3.0.3",
-        "lodash": "^4.17.15",
-        "mint-ui": "^2.2.13",
-        "node-sass": "^4.12.0",
-        "ol": "^7.2.2",
-        "portfinder": "^1.0.21",
-        "proj4": "^2.8.0",
-        "qs": "^6.7.0",
-        "quill": "^1.3.6",
-        "screenfull": "^4.2.1",
-        "sortablejs": "^1.12.0",
-        "svg-sprite-loader": "^4.1.6",
-        "throttle-debounce": "^3.0.1",
-        "turf": "^3.0.14",
-        "v-distpicker": "^1.2.2",
-        "vue": "^2.6.11",
-        "vue-baidu-map": "^0.21.22",
-        "vue-i18n": "^8.12.0",
-        "vue-quill-editor": "^3.0.6",
-        "vue-router": "^3.0.7",
-        "vuex": "^3.1.1",
-        "xlsx": "^0.17.1"
-    },
-    "devDependencies": {
-        "@antv/f2": "^3.8.10-beta.1",
-        "@tinymce/tinymce-vue": "3.2.8",
-        "@vue/cli-plugin-babel": "^3.10.0",
-        "@vue/cli-plugin-eslint": "^3.10.0",
-        "@vue/cli-service": "^3.10.0",
-        "@vue/eslint-config-standard": "^4.0.0",
-        "cross-env": "^7.0.3",
-        "dai-js": "^0.0.12",
-        "element-theme-chalk": "^2.13.0",
-        "natives": "^1.1.6",
-        "ol": "^7.2.2",
-        "sass-loader": "^7.3.1",
-        "script-loader": "^0.7.2",
-        "tinymce": "5.8.2",
-        "vue-template-compiler": "^2.6.11"
-    },
-    "eslintConfig": {
-        "root": true,
-        "env": {
-            "node": true
-        },
-        "extends": [
-            "plugin:vue/essential",
-            "@vue/standard"
-        ],
-        "rules": {},
-        "parserOptions": {
-            "parser": "babel-eslint"
-        }
-    },
-    "postcss": {
-        "plugins": {
-            "autoprefixer": {}
-        }
-    },
-    "engines": {
-        "node": ">= 8.11.1",
-        "npm": ">= 5.6.0"
-    },
-    "browserslist": [
-        "> 1%",
-        "last 2 versions",
-        "not ie <= 10"
     ],
-    "element-theme": {
+    "rules": {},
-        "config": "./src/element-ui/theme-variables.scss",
+    "parserOptions": {
-        "out": "./src/element-ui/theme",
+      "parser": "babel-eslint"
-        "minimize": true,
+    }
-        "browsers": [
+  },
-            "> 1%",
+  "postcss": {
-            "last 2 versions",
+    "plugins": {
-            "not ie <= 10"
+      "autoprefixer": {}
-        ]
     }
+  },
+  "engines": {
+    "node": ">= 8.11.1",
+    "npm": ">= 5.6.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 10"
+  ],
+  "element-theme": {
+    "config": "./src/element-ui/theme-variables.scss",
+    "out": "./src/element-ui/theme",
+    "minimize": true,
+    "browsers": [
+      "> 1%",
+      "last 2 versions",
+      "not ie <= 10"
+    ]
+  }
 }

src/App.vue

@@ -13,11 +13,11 @@ export default {
   watch: {
     "$i18n.locale": "i18nHandle",
   },
-  created () {
+  created() {
     this.i18nHandle(this.$i18n.locale);
   },
   methods: {
-    i18nHandle (val, oldVal) {
+    i18nHandle(val, oldVal) {
       localStorage.setItem("language", val);
       document.querySelector("html").setAttribute("lang", val);
       document.title = messages[val].brand.lg;
@@ -26,7 +26,7 @@ export default {
         window.location.reload();
       }
     },
-    refreshView () {
+    refreshView() {
       // In order to make the cached page re-rendered
       this.$store.dispatch("delAllCachedViews", this.$route);
 
@@ -41,8 +41,8 @@ export default {
     ...mapActions(["setClientHeight", "setSize", "setResolution", "setEnv"]),
   },
   computed: {},
-  mounted () {
+  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大小
@@ -155,7 +155,7 @@ export default {
     position: relative;
     max-height: 83vh;
     box-sizing: border-box;
-    padding: 0 0 16px ;
+    padding: 0 0 16px;
     .dialog-h-content {
       max-height: calc(83vh - 80px);
       box-sizing: border-box;
@@ -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;
+}
+