Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

.beagle-arm.yml

@@ -31,7 +31,7 @@ pipeline:
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
-    base: registry.cn-qingdao.aliyuncs.com/wod-k8s/node-arm64:14.5.0-buster-slim
+    base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base-arm64:2.0
     repo: wod/apaas-ui-arm64
     version: "v3.0.0"
     channel: alpha
@@ -47,7 +47,7 @@ pipeline:
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
-    base: registry.cn-qingdao.aliyuncs.com/wod-k8s/node-arm64:14.5.0-buster-slim
+    base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base-arm64:2.0
     repo: wod/apaas-ui-arm64
     version: "v3.0.0"
     registry: registry.cn-qingdao.aliyuncs.com
@@ -62,7 +62,7 @@ pipeline:
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
-    base: registry.cn-qingdao.aliyuncs.com/wod-k8s/node-arm64:14.5.0-buster-slim
+    base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base-arm64:2.0
     repo: wod/apaas-ui-arm64
     version: "v3.0"
     registry: registry.cn-qingdao.aliyuncs.com

src/pages/workbench/intelligent_details.vue

@@ -18,26 +18,33 @@
 export default {
   data() {
     return {
-      originUrl:'https://apaasgis.wodcloud.com/portal/apaasplat/viewer/item.html'
+      originUrl:'https://apaasgis.wodcloud.com/portal/apaasplat/viewer/item.html',
     };
   },
   computed:{
-    itemUrl:function(){
+    itemUrl(){
       let _self = this;
       if(_self.$route.name == 'intelligent_details'){
-        return `${_self.originUrl}?id=${_self.$route.query.id}&activeMenu=${_self.$route.query.type}`
+        return `${_self.originUrl}?id=${_self.$route.query.id}&activeMenu=${_self.$route.query.activeMenu}`
       }
     }
   },
   mounted() {
+    this.$nextTick(() => {
       window.addEventListener('message',event =>{
         let data = event.data;
-      if (data.cmd == 'mapmsg'){
+        if (data.cmd == 'mapdetailtoview'){
           console.log(data);
+          this.$store.commit("setZnztDetailsParams", data.params);
+          this.$router.push('/intelligent_drawing')
         }
       })
+    })
   },
   methods: {},
+  destroyed () {
+    // window.removeEventListener('message')
+  }
 };
 
 </script>

src/pages/workbench/intelligent_drawing.vue

@@ -14,34 +14,38 @@
 </template>
 
 <script>
+import { mapState } from "vuex";
 export default {
   data() {
     return {
       url:'https://apaasgis.wodcloud.com/portal/apaasplat/viewer/mapViewer.html',
+      queryType: '',
+      id: '',
     };
   },
   computed:{
+    ...mapState(['znztDetailsParams']),
     getZnztParams() {
       return this.$store.state.znztParams;
     },
     znztUrl(){
-      return this.url+this.urlParams
-    },
-    urlParams(){
-      if(this.$store.state.znztParams){
-        return `?webmap=${this.$store.state.znztParams.id}`;
-      }else{
-        return ''
+      if(this.queryType == 'webmap'){
+        return this.url + `?webmap=${this.id}`;
+      }else if (this.queryType == 'layers'){
+        return this.url + `?layers=${this.id}`;
+      }else {
+        return this.url
       }
     },
   },
   watch: {
     getZnztParams(newVal) {
-      this.urlParams = `?webmap=${newVal.id}`
       console.log('智能制图参数'+newVal)
     },
   },
   mounted() {
+    this.id = this.znztDetailsParams.id;
+    this.queryType = this.znztDetailsParams.queryType;
     this.$nextTick(() => {
       window.addEventListener('message',event =>{
         let data = event.data;
@@ -77,6 +81,27 @@ export default {
           });
           window.open(routeData.href, '_blank');
         }
+        // 智能制图页面跳转
+        if (data.cmd == 'mapviewurl'){
+          console.log(data);
+          switch (data.params.queryType) {
+            case 'webmap':
+              this.queryType = 'webmap';
+              this.$store.commit("setZnztIdParams", data.params.id);
+              this.id = data.params.id;
+              break;
+           case 'layers':
+              this.queryType = 'layers';
+              this.$store.commit("setZnztIdParams", data.params.id);
+              this.id = data.params.id;
+              break;
+            default:
+              this.queryType = '';
+              this.$store.commit("setZnztIdParams", '');
+              this.id = '';
+              break;
+          }
+        }
       })
     })
   },

src/pages/workbench/yygl/deploy_app_detail.vue

@@ -172,7 +172,16 @@
                 </nor-card>
 
                 <nor-card title="服务设置" flag="true" v-show="is_current_user">
-                  <div class="addimage">多版本回滚</div>
+                  <div class="addimage">
+                    <el-select v-model="mesh_value" placeholder="请选择">
+                      <el-option
+                        v-for="item in mesh_options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </div>
                   <p class="imagebox">
                     <span
                       @click="image_select = index;getImageInfo()"
@@ -191,7 +200,7 @@
                     :key="index+7000"
                     v-show="image_select == index"
                     stripe
-                    height="300"
+                    height="376"
                     style="width: 100%">
                     <el-table-column
                       prop="tag"
@@ -301,6 +310,21 @@ export default {
   },
   data() {
     return {
+      mesh_value:0,
+      mesh_options:[
+        {
+          value:0,
+          label:'多版本回滚'
+        },
+        {
+          value:1,
+          label:'AB测试'
+        },
+        {
+          value:2,
+          label:'权重管理'
+        },
+      ],
       now_user: 0, //0：普通用户，1：组织管理员，2：超级管理员
       buy_style: 0,
       image_select: 0,
@@ -1008,6 +1032,17 @@ background-color:cyan;
 background:khaki;
 }
 
+.addimage .el-input__inner{
+  width: 110px;
+  height: 28px;
+  line-height: 28px;
+  font-size: 12px;
+  color: #707693;
+}
+.addimage .el-input__icon{
+  line-height: 28px;
+}
+
 </style>
 <style scoped>
 .info_contain >>> .apass_dialog .el-dialog__footer{
@@ -1087,19 +1122,9 @@ background:khaki;
   color: #58617a;
 }
 .addimage {
-  display: inline-block;
-  color: #f8f9fd;
-  font-size: 16px;
-  width: 124px;
-  height: 44px;
-  line-height: 44px;
-  text-align: center;
-  background-color: #0f2683;
-  border-radius: 8px;
-  margin-top: 20px;
-  margin-bottom: 30px;
-  margin-left: 40px;
-  cursor: pointer;
+  position: absolute;
+  right:20px;
+  top:-36px;
 }
 .use_know p {
   height: 44px;
@@ -1187,12 +1212,12 @@ background:khaki;
   color: #58617a;
 }
 .imagebox {
+  padding-top: 20px;
   overflow: hidden;
   margin-bottom: 20px;
   padding-left: 40px;
 }
 .imagebox span {
-  width: 165px;
   height: 34px;
   padding: 0 10px;
   line-height: 34px;

src/store/index.js

@@ -21,6 +21,12 @@ const store = new Vuex.Store({
     menuCartState: 0, //购物车操作都要修改这个值，menu监听这个值的变化实时获取购物车列表
     znztParams: null, //智能制图传入过来的数据
     appBuilderParams: null, //应用程序传入过来的数据
+    znztIdParams: '', //智能制图服务id
+    znztDetailsParams: {
+      type: '',
+      queryType: '',
+      id: '',
+    }, //智能制图服务详情id
   },
   getters: {
     // 1：超管 2：组织管理员 3：普通用户 4：开发者
@@ -60,6 +66,12 @@ const store = new Vuex.Store({
     setAppBuilderParams(state, newValue) {
       state.appBuilderParams = newValue;
     },
+    setZnztIdParams(state, newValue) {
+      state.znztIdParams = newValue;
+    },
+    setZnztDetailsParams(state, newValue) {
+      state.znztDetailsParams = newValue;
+    },
   },
 });