样式fixed

src/assets/css/index.css

@@ -574,7 +574,7 @@ border-radius:8px;
 .apaas_button .el-button--warning {
   background-color: #e56600;
   border-color: #e56600;
-  color: #fff;
+  color: #fcefd6;
 }
 .apaas_button .el-button.is-disabled,
 .apaas_button .el-button.is-disabled:focus,

src/components/organization-list/organization-card.vue

@@ -9,6 +9,7 @@
         :size="56"
         fit="cover"
         :src="data.picture_path"
+        style="border: 3px solid #f6f7fb;border-radius: 8px;"
       />
     </div>
     <div class="organization_card-info">
@@ -20,21 +21,21 @@
     </div>
     <p class="organization_card-text">
       <span>
-        <i class="el-icon-setting"></i>
+        <img src="../../assets/imgs/ic_xitong.png" />
         <span>业务系统数</span>
       </span>
       <span class="text_clip" v-text="data.systemUser"></span>
     </p>
     <p class="organization_card-text">
       <span>
-        <i class="el-icon-user"></i>
+        <img src="../../assets/imgs/ic_guanliyuan.png" />
         <span>组织管理员</span>
       </span>
       <span class="text_clip" v-text="data.orgAdmin"></span>
     </p>
     <p class="organization_card-text">
       <span>
-        <i class="el-icon-time"></i>
+        <img src="../../assets/imgs/icon_shijian.png" />
         <span>创建时间</span>
       </span>
       <span class="text_clip" v-text="data.create_date"></span>
@@ -107,6 +108,7 @@ export default {
 }
 .organization_card-info > .organization_card-name {
   font-size: 18px;
+  font-weight: 600;
   line-height: 32px;
   color: #0d1847;
   cursor: pointer;
@@ -129,6 +131,12 @@ export default {
 .organization_card-text > span:nth-child(1) {
   flex-shrink: 0;
   color: #8890a7;
+  display: inline-flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+.organization_card-text > span:nth-child(1) > img {
+  margin-right: 5px;
 }
 </style>
 

src/components/service-info/app-info.vue

@@ -214,6 +214,7 @@ export default {
 }
 .commodity_information > .btn_container > .el-button {
   margin: 0 30px 15px 0;
+  border-width: 2px;
 }
 .commodity_action {
   margin-top: 50px;
@@ -222,6 +223,7 @@ export default {
 .commodity_action > .el-button {
   width: 220px;
   margin-left: 20px;
+  font-size: 16px;
 }
 </style>
 
@@ -231,4 +233,23 @@ export default {
   background-color: #515fe7;
   border-color: #515fe7;
 }
+.application_info .el-input-number .el-input-number__decrease {
+  top: 2px;
+  left: 2px;
+  width: 38px;
+  line-height: 36px;
+  border-radius: 8px 0 0 8px;
+  border-right-width: 2px;
+}
+.application_info .el-input-number .el-input-number__increase {
+  top: 2px;
+  right: 2px;
+  width: 38px;
+  line-height: 36px;
+  border-radius: 0 8px 8px 0;
+  border-left-width: 2px;
+}
+.application_info .el-input-number .el-input__inner {
+  border-width: 2px;
+}
 </style>

src/components/service-info/service-info.vue

@@ -386,6 +386,9 @@ export default {
 .commodity_information > .btn_container {
   margin-bottom: -15px;
 }
+.commodity_information > .btn_container > .el-button {
+  border-width: 2px;
+}
 .commodity_information > .btn_container > .el-button,
 .commodity_information > .btn_container > .el-input-number {
   margin: 0 20px 15px 0;
@@ -397,6 +400,7 @@ export default {
 .commodity_action > .el-button {
   width: 220px;
   margin-left: 20px;
+  font-size: 16px;
 }
 </style>
 
@@ -406,4 +410,23 @@ export default {
   background-color: #515fe7;
   border-color: #515fe7;
 }
+.service_info .el-input-number .el-input-number__decrease {
+  top: 2px;
+  left: 2px;
+  width: 38px;
+  line-height: 36px;
+  border-radius: 8px 0 0 8px;
+  border-right-width: 2px;
+}
+.service_info .el-input-number .el-input-number__increase {
+  top: 2px;
+  right: 2px;
+  width: 38px;
+  line-height: 36px;
+  border-radius: 0 8px 8px 0;
+  border-left-width: 2px;
+}
+.service_info .el-input-number .el-input__inner {
+  border-width: 2px;
+}
 </style>

src/pages/authority/organization/organizationdetail.vue

@@ -120,9 +120,6 @@ export default {
     getCurrentUser() {
       this.$api.user.getNowUser().then(({ data }) => {
         if (data.success == 1) {
-          console.log("--- user info ---");
-          console.log(data.data);
-          console.log("--- user info ---");
           this.$store.commit("userInfofun", data.data);
           this.now_user = this.level
         } else {

src/pages/authority/user/organizationuser.vue

@@ -337,9 +337,6 @@ export default {
     getCurrentUser() {
       this.$api.user.getNowUser().then(({ data }) => {
         if (data.success == 1) {
-          console.log("--- user info ---");
-          console.log(data.data);
-          console.log("--- user info ---");
           this.$store.commit("userInfofun", data.data);
           this.now_user = this.level;
           console.log(this.level);

src/pages/user/notice/notice.vue

@@ -45,6 +45,9 @@
       <ul class="notice_list">
         <li
           class="notice_item"
+          :class="{
+            gray: item.readed === 1,
+          }"
           v-for="(item, index) in list"
           :key="'item_' + index"
         >
@@ -203,11 +206,12 @@ export default {
     refreshList() {
       this.initList(); // 刷新列表
 
-      if (!this.unread) {
-        this.getMessage({
-          unread: true,
-        });
-      }
+      this.getMessage({
+        unread: true,
+      });
+      this.getMessage({
+        unread: false,
+      });
     },
     readAction(ids) {
       this.$http
@@ -306,8 +310,9 @@ export default {
 }
 .notice_header a {
   font-size: 14px;
+  font-weight: 600;
   line-height: 24px;
-  color: #8890a7;
+  color: #58617a;
   cursor: pointer;
 }
 .notice_header > div > * + * {
@@ -387,6 +392,7 @@ export default {
   color: #242c43;
 }
 .notice_item > .notice_detail .notice_type {
+  font-weight: 600;
   color: #58617a;
   margin-bottom: 10px;
 }
@@ -399,6 +405,9 @@ export default {
 .notice_item:hover {
   background-color: #f8f9fd;
 }
+.notice_content a {
+  color: #515fe7;
+}
 .notice_action {
   position: absolute;
   top: 0;
@@ -423,6 +432,10 @@ export default {
 .notice_item:hover .notice_action {
   display: flex;
 }
+.notice_item.gray > .notice_detail .notice_type,
+.notice_item.gray > .notice_detail .notice_content {
+  color: #8890a7;
+}
 .set_notice_btn {
   position: relative;
 }

src/pages/workbench/fwgl/approval_service_detail.vue

@@ -287,9 +287,6 @@ export default {
     getCurrentUser() {
       this.$api.user.getNowUser().then(({ data }) => {
         if (data.success == 1) {
-          console.log("--- user info ---");
-          console.log(data.data);
-          console.log("--- user info ---");
           this.$store.commit("userInfofun", data.data);
           this.now_user = this.level
           this.get_service_info()

src/pages/workbench/fwgl/fwglList.vue

@@ -73,7 +73,12 @@
             </div>
           </div>
           <div class="admin_preview-right apaas_button">
-            <el-button type="primary" size="mini" @click="approveWorkspace">
+            <el-button
+              type="primary"
+              size="mini"
+              @click="approveWorkspace"
+              style="background-color: #515fe7;border-color: #515fe7;"
+            >
               工作区域审批（{{ cloud_admin.unapprove }}）
             </el-button>
             <histogramScroll
@@ -396,6 +401,7 @@ export default {
             actionList: [
               {
                 label: "删除",
+                class: "warn",
                 callback: this.deleteItem,
                 disabledRule(item) {
                   return item.service_apply_info.approval_status === 1;
@@ -1337,28 +1343,28 @@ export default {
                     name: "CPU使用量",
                     value: cloud.cpu_use,
                     total: cloud.cpu_total,
-                    unit: "（核）",
+                    unit: "核",
                   },
                   {
                     name: "内存使用量",
                     value: cloud.memory_use,
                     total: cloud.memory_total,
-                    unit: "（GB）",
+                    unit: "GB",
                   },
                   /* {
                     name: "数据盘使用量",
                     value: cloud.disk_use,
                     total: cloud.disk_total,
-                    unit: "（GB）",
+                    unit: "GB",
                   }, */
                   {
                     name: "容器组使用量",
                     value: cloud.containers_use,
                     total: cloud.containers_total,
-                    unit: "（个）",
+                    unit: "个",
                   },
                 ],
-                cloumn: cloud.cloumn, // TODO: 柱状图
+                cloumn: cloud.cloumn, // 柱状图
                 unapprove: cloud.unapprove, // 审批数量
               };
             }
@@ -1618,22 +1624,28 @@ export default {
       return {
         title: [
           {
-            text: percent + "%",
+            text: percent + "{a|%}",
             x: "center",
-            y: "28%",
+            y: "30%",
             textStyle: {
-              fontSize: 34,
-              fontWeight: "100",
+              fontSize: 36,
+              fontWeight: "lighter",
               color: ["#0d1847"],
+              rich: {
+                a: {
+                  fontSize: 14,
+                  padding: [0, 0, 4, 0],
+                },
+              },
             },
           },
           {
             text: item.name,
             x: "center",
-            y: "55%",
+            y: "58%",
             textStyle: {
               fontSize: 12,
-              fontWeight: "100",
+              fontWeight: "normal",
               color: "#707693",
             },
           },
@@ -1700,7 +1712,7 @@ export default {
             barMaxWidth: 10,
             name: "C",
             roundCap: true,
-            color: "#ddd",
+            color: "#f4f4f5",
             barGap: "-100%",
           },
           {
@@ -1717,7 +1729,7 @@ export default {
             axisLine: {
               show: true,
               lineStyle: {
-                width: 0.5,
+                width: 1,
                 color: [[1, "rgba(0,0,0,0)"]],
               },
             }, //仪表盘轴线
@@ -1728,17 +1740,16 @@ export default {
               show: true,
               splitNumber: 5,
               lineStyle: {
-                color: "#e3e4ea",
-                width: 0.5,
+                color: "#c9cee0",
+                width: 1,
               },
-              length: 3,
+              length: 4,
             }, //刻度样式
             splitLine: {
               show: true,
-              length: 4,
+              length: 6,
               lineStyle: {
-                color: "#e3e4ea",
-                width: 0.5,
+                color: "#c9cee0",
               },
             }, //分隔线样式
             detail: {
@@ -1762,7 +1773,6 @@ export default {
                 color: "#fff",
               },
             },
-
             data: [, percent],
           },
         ],
@@ -1808,7 +1818,8 @@ export default {
   min-width: 1200px;
 }
 .cloud_title {
-  margin-top: 15px;
+  margin-top: 10px;
+  font-weight: 600;
 }
 .cloud_title > span,
 .cloud_title > span::before {
@@ -1876,7 +1887,7 @@ export default {
 .admin_preview {
   display: flex;
   justify-content: space-between;
-  align-items: center;
+  align-items: flex-start;
 }
 .admin_preview > * {
   width: calc(50% - 10px);
@@ -1896,3 +1907,15 @@ export default {
   z-index: 9;
 }
 </style>
+
+<style>
+.service_management_list .cross_line {
+  display: none;
+}
+.service_management_list .organization_list {
+  padding: 20px 0 0;
+}
+.service_management_list .header-container .cloud_title {
+  margin-top: 0;
+}
+</style>

src/pages/workbench/fwgl/organizationCloudResource.vue

@@ -110,25 +110,25 @@ export default {
               name: "CPU使用量",
               value: cloud.cpu_use,
               total: cloud.cpu_total,
-              unit: "（核）",
+              unit: "核",
             },
             {
               name: "内存使用量",
               value: cloud.memory_use,
               total: cloud.memory_total,
-              unit: "（GB）",
+              unit: "GB",
             },
             /* {
               name: "数据盘使用量",
               value: cloud.disk_use,
               total: cloud.disk_total,
-              unit: "（GB）",
+              unit: "GB",
             }, */
             {
               name: "容器组使用量",
               value: cloud.containers_use,
               total: cloud.containers_total,
-              unit: "（个）",
+              unit: "个",
             },
           ];
         })
@@ -164,31 +164,50 @@ export default {
       let percent = parseFloat(
         ((item.value / item.total) * 100 || 0).toFixed(1)
       );
-      let colors = ["#515fe7", "#e7ecfd"];
+      let colors = [];
 
-      if (percent >= 80) {
-        colors = ["#e3606d", "#f6d0d0"];
+      if (this.level == 2) {
+        if (percent >= 80) {
+          colors = ["#e3606d", "#f6d0d0"];
+        } else {
+          colors = ["#515fe7", "#e7ecfd"];
+        }
+      } else {
+        if (percent >= 80) {
+          colors = ["#e3606d", "#f6d0d0"];
+          this.cloud_admin_warn = true;
+        } else if (percent >= 60) {
+          colors = ["#ef9535", "#fcefd8"];
+        } else {
+          colors = ["#515fe7", "#e7ecfd"];
+        }
       }
 
       return {
         title: [
           {
-            text: percent + "%",
+            text: percent + "{a|%}",
             x: "center",
-            y: "28%",
+            y: "30%",
             textStyle: {
-              fontSize: 34,
-              fontWeight: "100",
+              fontSize: 36,
+              fontWeight: "lighter",
               color: ["#0d1847"],
+              rich: {
+                a: {
+                  fontSize: 14,
+                  padding: [0, 0, 4, 0],
+                },
+              },
             },
           },
           {
             text: item.name,
             x: "center",
-            y: "55%",
+            y: "58%",
             textStyle: {
               fontSize: 12,
-              fontWeight: "100",
+              fontWeight: "normal",
               color: "#707693",
             },
           },
@@ -255,7 +274,7 @@ export default {
             barMaxWidth: 10,
             name: "C",
             roundCap: true,
-            color: "#ddd",
+            color: "#f4f4f5",
             barGap: "-100%",
           },
           {
@@ -272,7 +291,7 @@ export default {
             axisLine: {
               show: true,
               lineStyle: {
-                width: 0.5,
+                width: 1,
                 color: [[1, "rgba(0,0,0,0)"]],
               },
             }, //仪表盘轴线
@@ -283,17 +302,16 @@ export default {
               show: true,
               splitNumber: 5,
               lineStyle: {
-                color: "#e3e4ea",
-                width: 0.5,
+                color: "#c9cee0",
+                width: 1,
               },
-              length: 3,
+              length: 4,
             }, //刻度样式
             splitLine: {
               show: true,
-              length: 4,
+              length: 6,
               lineStyle: {
-                color: "#e3e4ea",
-                width: 0.5,
+                color: "#c9cee0",
               },
             }, //分隔线样式
             detail: {
@@ -317,7 +335,6 @@ export default {
                 color: "#fff",
               },
             },
-
             data: [, percent],
           },
         ],

src/pages/workbench/fwgl/serviceDetail.vue

@@ -604,9 +604,6 @@ export default {
     getCurrentUser() {
       this.$api.user.getNowUser().then(({ data }) => {
         if (data.success == 1) {
-          console.log("--- user info ---");
-          console.log(data.data);
-          console.log("--- user info ---");
           this.$store.commit("userInfofun", data.data);
           this.now_user = this.level;
           console.log(this.level);

src/pages/workbench/fwgl/serviceEdit.vue

@@ -244,9 +244,6 @@ export default {
     getCurrentUser() {
       this.$api.user.getNowUser().then(({ data }) => {
         if (data.success == 1) {
-          console.log("--- user info ---");
-          console.log(data.data);
-          console.log("--- user info ---");
           this.$store.commit("userInfofun", data.data);
           this.now_user = this.level
            console.log(this.level);

src/pages/workbench/workPlace.vue

@@ -1325,9 +1325,6 @@ export default {
     getCurrentUser() {
       this.$api.user.getNowUser().then(({ data }) => {
         if (data.success == 1) {
-          console.log("--- user info ---");
-          console.log(data.data);
-          console.log("--- user info ---");
           this.$store.commit("userInfofun", data.data);
           this.now_user = this.level;
           this.manage_arr[0].url = data.data.department_id;

src/pages/workbench/yygl/app_detail.vue

@@ -426,9 +426,6 @@ export default {
     getCurrentUser() {
       this.$api.user.getNowUser().then(({ data }) => {
         if (data.success == 1) {
-          console.log("--- user info ---");
-          console.log(data.data);
-          console.log("--- user info ---");
           this.$store.commit("userInfofun", data.data);
           this.now_user = this.level;
           this.getServiceInfo();

src/pages/workbench/yygl/approval_app_detail.vue

@@ -271,9 +271,6 @@ export default {
     getCurrentUser() {
       this.$api.user.getNowUser().then(({ data }) => {
         if (data.success == 1) {
-          console.log("--- user info ---");
-          console.log(data.data);
-          console.log("--- user info ---");
           this.$store.commit("userInfofun", data.data);
           this.now_user = this.level
           this.getheaderinfo();

src/pages/workbench/yygl/deploy_app_detail.vue

@@ -630,9 +630,6 @@ export default {
     getCurrentUser() {
       this.$api.user.getNowUser().then(({ data }) => {
         if (data.success == 1) {
-          console.log("--- user info ---");
-          console.log(data.data);
-          console.log("--- user info ---");
           this.$store.commit("userInfofun", data.data);
           this.now_user = this.level;
           console.log(this.level);