Merge branch 'develop_jzl'

gassafetyprogress-web/src/components/GetPos/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-02-12 11:07:10
- * @LastEditTime: 2022-02-16 17:08:55
+ * @LastEditTime: 2022-02-22 15:08:10
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/components/GetPos.vue/index.vue
@@ -92,7 +92,9 @@ export default {
   methods: {
     init() {
       this.$nextTick(() => {
-        this.map = new EditorMap("getposmap", {}, this);
+        const path = eval(this.$store.state.user.systemSetting.map_center);
+        console.log("path",path);
+        this.map = new EditorMap("getposmap", {center:path}, this);
         // 如果不传值就是设备,传pipe就是管道
         if (this.device == "") {
           // 如果传了路径就创建一个marker，如果没传就直接激活手动创建

gassafetyprogress-web/src/views/bigWindow/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-01-11 13:44:17
- * @LastEditTime: 2022-02-17 11:47:53
+ * @LastEditTime: 2022-02-22 15:09:22
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/views/Home.vue
@@ -182,9 +182,11 @@ export default {
     },
   },
   mounted() {
+    const path = eval(this.$store.state.user.systemSetting.map_center);
     this.map = new EditorMap(
       "map",
       {
+        center:path,
         mapStyle: "amap://styles/f71d3a3d73e14f5b2bf5508bf1411758",
         zoom: 14.5,
       },

gassafetyprogress-web/vue.config.js

@@ -34,7 +34,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8903/gassafety`,
+        target: `http://222.223.203.154:8092/gassafety`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''