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

.beagle-arm.yml

@@ -27,12 +27,12 @@ pipeline:
       - ./yarn.lock
     volumes:
       - /data/cache:/cache
-  docker-dev:
+  docker:
     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
-    repo: wod/apaas/apaas-ui-arm64
+    repo: wod/apaas-ui-arm64
     version: "v3.0.0"
     channel: alpha
     registry: registry.cn-qingdao.aliyuncs.com
@@ -43,12 +43,12 @@ pipeline:
         target: REGISTRY_PASSWORD
     when:
       branch: dev
-  docker-master:
+  harbor:
     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
-    repo: wod/apaas/apaas-ui-arm64
+    repo: wod/apaas-ui-arm64
     version: "v3.0.0"
     registry: registry.cn-qingdao.aliyuncs.com
     secrets:
@@ -58,5 +58,20 @@ pipeline:
         target: REGISTRY_PASSWORD
     when:
       branch: master
+  latest:
+    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
+    repo: wod/apaas-ui-arm64
+    version: "v3.0"
+    registry: registry.cn-qingdao.aliyuncs.com
+    secrets:
+      - source: REGISTRY_USER_ALIYUN
+        target: REGISTRY_USER
+      - source: REGISTRY_PASSWORD_ALIYUN
+        target: REGISTRY_PASSWORD
+    when:
+      branch: master
 
 branches: [master,dev]

.beagle.yml

@@ -30,25 +30,50 @@ pipeline:
       - ./yarn.lock
     volumes:
       - /data/cache:/cache
-  docker-dev:
+  docker:
     image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
     base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0
-    repo: apaas/apaas-ui
+    repo: wod/apaas-ui
     version: "v3.0.0"
     channel: alpha
-    registry: hub.wodcloud.com
+    registry: registry.cn-qingdao.aliyuncs.com
+    secrets:
+      - source: REGISTRY_USER_ALIYUN
+        target: REGISTRY_USER
+      - source: REGISTRY_PASSWORD_ALIYUN
+        target: REGISTRY_PASSWORD
     when:
       branch: dev
-  docker-master:
+  harbor:
     image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
     base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0
-    repo: apaas/apaas-ui
+    repo: wod/apaas-ui
     version: "v3.0.0"
-    registry: hub.wodcloud.com
+    registry: registry.cn-qingdao.aliyuncs.com
+    secrets:
+      - source: REGISTRY_USER_ALIYUN
+        target: REGISTRY_USER
+      - source: REGISTRY_PASSWORD_ALIYUN
+        target: REGISTRY_PASSWORD
+    when:
+      branch: master 
+  latest:
+    image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock    
+    base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0
+    repo: wod/apaas-ui
+    version: "v3.0"
+    registry: registry.cn-qingdao.aliyuncs.com
+    secrets:
+      - source: REGISTRY_USER_ALIYUN
+        target: REGISTRY_USER
+      - source: REGISTRY_PASSWORD_ALIYUN
+        target: REGISTRY_PASSWORD
     when:
       branch: master  
   deploy:
@@ -56,6 +81,9 @@ pipeline:
     namespace: apaas-v3
     deployment: apaas-ui
     container: apaas-ui
-    registry: hub.wodcloud.com
-
+    secrets:
+      - source: REGISTRY_USER_ALIYUN
+        target: REGISTRY_USER
+      - source: REGISTRY_PASSWORD_ALIYUN
+        target: REGISTRY_PASSWORD
 branches: [master,dev]

src/assets/css/index.css

@@ -588,6 +588,11 @@ width: 620px!important;
 .apass_table .el-table__row:nth-child(odd) td {
   background-color: #f8f9fd;
 }
+.apass_table .table_html a {
+  font-size: 14px;
+  color: #0f2683;
+  cursor: pointer;
+}
 .apass_table .row_action {
   user-select: none;
 }

src/components/apass-table.vue

@@ -188,6 +188,13 @@
           >
             <span></span>
           </span>
+          <span
+            v-else-if="item.type === 'html'"
+            class="table_html"
+            v-html="
+              item.getHtml ? item.getHtml(scope.row) : scope.row[item.prop]
+            "
+          ></span>
           <span
             v-else
             v-text="

src/components/general/upload_file.vue

@@ -90,7 +90,7 @@ export default {
     },
     unique: {
       type: Boolean,
-      default: false,
+      default: true,
     },
   },
   watch: {
@@ -112,7 +112,7 @@ export default {
     if (this.directory) {
       this.anotherData = {
         directory: this.directory,
-        "unique-code": this.unique ? "" : false,
+        "unique-code": this.unique ? "" : "false",
       };
     }
   },

src/pages/message-management/banner/banner-list.vue

@@ -33,8 +33,8 @@
               <el-select v-model="topFilter.state" placeholder="请选择">
                 <el-option label="全部" value=""> </el-option>
                 <el-option label="已上架" value="1"> </el-option>
-                <el-option label="已下架" value="0"> </el-option>
-                <el-option label="已过期" value="-1"> </el-option>
+                <el-option label="已下架" value="2"> </el-option>
+                <el-option label="已过期" value="3"> </el-option>
               </el-select>
             </div>
             <div class="filter_item">
@@ -238,10 +238,10 @@ export default {
       this.$http
         .get("/apaas/service/v3/recommend/manage/banners/list", {
           params: {
-            name: filter.keyword,
-            page: filter.page,
-            size: filter.size,
-            state: filter.state,
+            page: fullFilter.page,
+            size: fullFilter.size,
+            state: fullFilter.state,
+            name: fullFilter.name,
             up_time_s: fullFilter.up_time ? fullFilter.up_time[0] : "",
             up_time_e: fullFilter.up_time ? fullFilter.up_time[1] : "",
             down_time_s: fullFilter.down_time ? fullFilter.down_time[0] : "",

src/pages/message-management/directed-push/directed-push-list.vue

@@ -200,6 +200,7 @@ export default {
       },
       {
         label: "消息详情",
+        type: "html",
         prop: "contents",
       },
       {

src/pages/message-management/message-alert/message-alert-list.vue

@@ -199,6 +199,7 @@ export default {
       },
       {
         label: "消息详情",
+        type: "html",
         prop: "contents",
       },
       {

src/pages/message-management/message-template/message-template-list.vue

@@ -31,10 +31,13 @@
             <div class="filter_item">
               <span class="filter_title">模板类型：</span>
               <el-select v-model="topFilter.type" placeholder="请选择">
-                <el-option label="服务推送" value="0"> </el-option>
-                <el-option label="平台维护" value="1"> </el-option>
-                <el-option label="版本更新" value="2"> </el-option>
-                <el-option label="自动消息" value="3"> </el-option>
+                <el-option
+                  v-for="item in types"
+                  :label="item.name"
+                  :value="item.value"
+                  :key="item.value"
+                >
+                </el-option>
               </el-select>
             </div>
             <div class="filter_item">
@@ -190,15 +193,19 @@ export default {
   },
   methods: {
     initList(filter) {
+      let fullFilter = {
+        ...filter,
+        ...this.topFilter,
+      };
       let params = {
-        page: filter.page,
-        size: filter.size,
-        keyword: this.topFilter.name,
-        tpl_type: this.topFilter.type,
+        page: fullFilter.page,
+        size: fullFilter.size,
+        keyword: fullFilter.name,
+        tpl_type: fullFilter.type,
         update_time_s:
-          (this.topFilter.update_time && this.topFilter.update_time[0]) || "",
+          (fullFilter.update_time && fullFilter.update_time[0]) || "",
         update_time_e:
-          (this.topFilter.update_time && this.topFilter.update_time[1]) || "",
+          (fullFilter.update_time && fullFilter.update_time[1]) || "",
       };
 
       // console.log(params);

src/pages/workbench/fwgl/cloud-detail.vue

@@ -142,7 +142,7 @@
               </div>-->
               <div class="params_block_item_in">
                 <span class="params_block_item_title">续期时长：</span>
-                <span class="params_block_item_val">{{ cloudDetailNew.adjust_duration_time }}核</span>
+                <span class="params_block_item_val">{{ cloudDetailNew.adjust_duration_time }}</span>
               </div>
             </div>
             <span class="params_block_title margin_top_20">单个容器组规格：</span>
@@ -642,6 +642,20 @@ export default {
         this.tabShow = false;
         this.activeName = "0";
       }
+
+      /**
+       * 资源调整通过后，"工作区域申请规格"会同步"审批通过后工作区域规格"信息，届时需要隐藏掉"审批通过后工作区域规格"
+       * add by xuym
+       * */ 
+      if (this.apploy_msg.first_level == 1 && this.apploy_msg.second_level == 1) {
+          let index = this.list_arr.findIndex(
+            item => item.title == "审批通过后工作区域规格："
+          );
+          
+          if (index > -1) {
+            this.list_arr.splice(index, 1);
+          }
+      }
     },
     getCloudDetail() {
       let query = {
@@ -702,6 +716,7 @@ export default {
             );
             this.list_arr.splice(index, 1);
           }
+
           this.cloudDteail.containers = data.containers;
           this.cloudDteail.cpu = data.cpu;
           this.cloudDteail.disk = data.disk;
@@ -711,6 +726,7 @@ export default {
           this.cloudDteail.one_cpu_min = data.one_cpu_min;
           this.cloudDteail.one_memory_max = data.one_memory_max;
           this.cloudDteail.one_memory_min = data.one_memory_min;
+
           this.cloudDetailNew.adjust_containers = data.adjust_containers;
           this.cloudDetailNew.adjust_cpu = data.adjust_cpu;
           this.cloudDetailNew.adjust_disk = data.adjust_disk;
@@ -720,8 +736,10 @@ export default {
           this.cloudDetailNew.adjust_one_cpu_min = data.adjust_one_cpu_min;
           this.cloudDetailNew.adjust_one_memory_max = data.adjust_one_memory_max;
           this.cloudDetailNew.adjust_one_memory_min = data.adjust_one_memory_min;
+
           this.apploy_msg.first_level = data.first_level;
           this.apploy_msg.second_level = data.second_level;
+
           this.cloudData.namespace = data.namespace;
           this.cloudData.workplace = data.workplace;
           this.cloudData.user_name = data.user_name;
@@ -729,6 +747,7 @@ export default {
           this.cloudData.apply_time = data.apply_time;
           this.cloudData.system_name = data.system_name;
         }
+
         if (this.use_uid != "") {
           this.getCloudApplication();
         }

src/pages/workbench/intelligent_drawing.vue

@@ -8,7 +8,7 @@
     </div>
 
     <div class="main-container">
-      <iframe ref="intelligent_drawing_iframe" width="100%" height="100%" scrolling="no" src="https://apaasgis.wodcloud.com/portal/apaasplat/viewer/mapViewer.html" frameborder="0"></iframe>
+      <iframe ref="intelligent_drawing_iframe" width="100%" height="100%" scrolling="no" :src="url" frameborder="0"></iframe>
     </div>
   </div>
 </template>
@@ -16,7 +16,9 @@
 <script>
 export default {
   data() {
-    return {};
+    return {
+      url:'https://apaasgis.wodcloud.com/portal/apaasplat/viewer/mapViewer.html'
+    };
   },
   mounted() {
     // window.addEventListener('message',event =>{
@@ -43,7 +45,10 @@ export default {
   height: calc(100vh - 150px - 43px);
   border-radius: 12px;
   background-color: #fff;
-  padding: 20px;
+  padding: 0px;
+}
+.intelligent_drawing-container .main-container iframe {
+  border-radius: 12px;
 }
 </style>