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

src/components/apass-list.vue

@@ -69,6 +69,10 @@
         @filter-change="filterChange"
       ></list-filter>
 
+      <div class="main_top_container" v-if="$slots['main-top']">
+        <slot name="main-top"></slot>
+      </div>
+
       <div class="cross_line" v-if="!hideHeader"></div>
 
       <div class="list-container" v-if="$slots.list">
@@ -149,18 +153,28 @@ export default {
     pageSizes: [10, 20, 50],
     selectFilter: [],
   }),
+  watch: {
+    otherFilter: {
+      handler() {
+        this.initOtherFilter();
+      },
+      deep: true,
+    },
+  },
   methods: {
     initOtherFilter() {
-      this.otherFilter.forEach((item) => {
-        this.$set(this.filter, item.prop, item.default);
+      if (this.otherFilter && this.otherFilter.length > 0) {
+        this.otherFilter.forEach((item) => {
+          this.$set(this.filter, item.prop, item.default);
 
-        this.selectFilter.push({
-          name: item.name,
-          prop: item.prop,
-          value: item.default,
-          options: item.options,
+          this.selectFilter.push({
+            name: item.name,
+            prop: item.prop,
+            value: item.default,
+            options: item.options,
+          });
         });
-      });
+      }
     },
     searchAction(value) {
       this.listAction();
@@ -201,10 +215,7 @@ export default {
     },
   },
   mounted() {
-    if (this.otherFilter && this.otherFilter.length > 0) {
-      this.initOtherFilter();
-    }
-
+    this.initOtherFilter();
     this.listAction();
   },
 };

src/pages/workbench/fwgl/approveWorkspace.vue

@@ -57,7 +57,25 @@ export default {
   computed: {},
   methods: {
     init(filter) {
-      console.log(filter);
+      // console.log(filter);
+
+      this.$http
+        .get("/apaas/service/v3/resource/user/apply/list", {
+          params: {
+            search: filter.keyword,
+            page: filter.page,
+            limit: filter.size,
+            depart: "",
+            state1: filter.state1,
+          },
+        })
+        .then(({ data }) => {
+          this.listTotal = data.total;
+          this.listData = data.data.cloud_apply_list;
+        })
+        .catch((error) => {
+          console.log(error);
+        });
     },
     showDialog() {
       this.$refs.dialog.show();
@@ -76,10 +94,12 @@ export default {
     this.level = parseInt(this.$route.params.level);
     this.type = parseInt(this.$route.params.type);
 
+    let warnFlag = this.$route.query.warn || false;
+
     this.otherFilter = [
       {
         name: "审批状态",
-        prop: "approve_state",
+        prop: "state1",
         default: "",
         options: [
           {
@@ -187,7 +207,7 @@ export default {
             label: "审批",
             callback: this.approveAction,
             disabledRule(item) {
-              return item.approve_state != 0;
+              return item.approve_state != 0 || warnFlag;
             },
           },
           {
@@ -198,7 +218,6 @@ export default {
         ],
       },
     ];
-    this.listData = [{}, {}, {}];
   },
 };
 </script>

src/pages/workbench/fwgl/fwglList.vue

@@ -123,7 +123,6 @@ import helper from "@/services/helper.js";
 import apassList from "@/components/apass-list";
 import apassDialog from "@/components/apass-dialog";
 import allotInfoConfirm from "@/components/allot-info-confirm";
-import Dashboard from "@/components/e-charts/dashboard";
 import organizationList from "@/components/organization-list/organization-list";
 
 export default {
@@ -131,7 +130,6 @@ export default {
     apassList,
     apassDialog,
     allotInfoConfirm,
-    Dashboard,
     organizationList,
   },
   data: () => ({
@@ -489,7 +487,7 @@ export default {
             align: "center",
             type: "image",
             getImage(item) {
-              return item.state == 0
+              return item.state == 1
                 ? require("@/assets/imgs/ic_true.png")
                 : require("@/assets/imgs/ic_failed.png");
             },
@@ -828,7 +826,7 @@ export default {
             align: "center",
             type: "image",
             getImage(item) {
-              return item.state == 0
+              return item.state == 1
                 ? require("@/assets/imgs/ic_true.png")
                 : require("@/assets/imgs/ic_failed.png");
             },
@@ -1214,7 +1212,7 @@ export default {
                 count_zy: cloud.count_zy,
                 dashboard_list: [
                   {
-                    name: "cpu使用量",
+                    name: "CPU使用量",
                     value: cloud.cpu_use,
                     total: cloud.cpu_total,
                     unit: "（核）",
@@ -1243,7 +1241,7 @@ export default {
               this.cloud_admin = {
                 dashboard_list: [
                   {
-                    name: "cpu使用量",
+                    name: "CPU使用量",
                     value: cloud.cpu_use,
                     total: cloud.cpu_total,
                     unit: "（核）",
@@ -1995,11 +1993,12 @@ export default {
       }
     },
     approveWorkspace() {
-      /* if (this.cloud_admin_warn) {
-        console.log("告警 ---");
-      } else { */
-      this.$router.push(`/fwgl/${this.level}/${this.type}/approveWorkspace`);
-      // }
+      this.$router.push({
+        path: `/fwgl/${this.level}/${this.type}/approveWorkspace`,
+        query: {
+          warn: this.cloud_admin_warn,
+        },
+      });
     },
   },
   created() {