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

src/components/order-list/order-list-cell.vue

@@ -10,7 +10,7 @@
       >删除</div>
     </div>
     <el-row class="cell_row">
-      <el-col :span="10" class="cell_msg">
+      <el-col :span="8" class="cell_msg">
         <img v-if="cellItem.order_type != 3" :src="cellItem.cover" class="cell_msg_img" />
         <img v-else :src="require('@/assets/imgs/img_yunziyuan.png')" class="cell_msg_img" />
         <div class="cell_msg_right">
@@ -39,7 +39,7 @@
           </div>
         </div>
       </el-col>
-      <el-col :span="6" class="cell_specification">
+      <el-col :span="5" class="cell_specification">
         <div v-if="cellItem.order_type == 1">
           <el-tooltip class="item" effect="dark" placement="right">
             <div slot="content" class="gg">
@@ -100,7 +100,129 @@
           >单个容器组：CPU最高 {{ cellItem.one_cpu_max }}核，默认 {{ cellItem.one_cpu_min }}核；内存最高 {{ cellItem.one_memory_max }}GB，默认 {{ cellItem.one_memory_min }}GB；</div>
         </div>
       </el-col>
-      <el-col :span="4" class="approval_status">
+      <el-col :span="3" class="cell_specification">
+        <div v-if="cellItem.order_type == 1">
+          <el-tooltip class="item" effect="dark" placement="right">
+            <div slot="content" class="gg">
+              规格：
+              <br />
+              日访问次数：{{cellItem.spec_svc_count}}次，日访问量：{{cellItem.spec_svc_pv }}
+            </div>
+            <div>规格：日访问次数：{{ cellItem.spec_svc_count }}次，日访问量：{{ cellItem.spec_svc_pv }}</div>
+          </el-tooltip>
+          <div
+            class="cell_specification_type"
+          >申请方式：{{ cellItem.duration_unit == 1 ? $t('lang.by_month') : $t('lang.by_year') }}</div>
+        </div>
+        <div v-else-if="cellItem.order_type == 2">
+          <el-tooltip class="item" effect="dark" placement="right">
+            <div slot="content" class="gg">
+              规格：
+              <br />
+              {{ cellItem.spec_app == 0 ? '申请获取应用镜像部署权限' : '申请获取应用镜像开发权限' }}
+            </div>
+            <div>规格：{{ cellItem.spec_app == 0 ? "申请获取应用镜像部署权限" : "申请获取应用镜像开发权限" }}</div>
+          </el-tooltip>
+        </div>
+        <div v-else-if="cellItem.order_type == 3">
+          <el-tooltip v-if="cellItem.apply_type == 0" class="item" effect="dark" placement="right">
+            <div slot="content" class="gg">
+              规格：
+              <br />
+              CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
+              <br />
+              数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB；
+            </div>
+            <div class="specification_item">
+              规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
+              <span
+                v-if="cellItem.disk_num != 0"
+              >数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB；</span>
+            </div>
+          </el-tooltip>
+          <el-tooltip v-else class="item" effect="dark" placement="right">
+            <div slot="content" class="gg">
+              规格：
+              <br />
+              CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
+              <span
+                class="gg_span"
+                v-for="(item, index) in cellItem.adjust_disk"
+                :key="'sjj' + index"
+              >数据盘 {{item.disk_num}}块，每块数据盘容量 {{item.disk_cap}}GB；</span>
+            </div>
+            <div class="specification_item">
+              规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
+              <span>{{ thisDisks }}</span>
+            </div>
+          </el-tooltip>
+          <div
+            class="cell_specification_type"
+          >单个容器组：CPU最高 {{ cellItem.one_cpu_max }}核，默认 {{ cellItem.one_cpu_min }}核；内存最高 {{ cellItem.one_memory_max }}GB，默认 {{ cellItem.one_memory_min }}GB；</div>
+        </div>
+      </el-col>
+      <el-col :span="3" class="cell_specification">
+        <div v-if="cellItem.order_type == 1">
+          <el-tooltip class="item" effect="dark" placement="right">
+            <div slot="content" class="gg">
+              规格：
+              <br />
+              日访问次数：{{cellItem.spec_svc_count}}次，日访问量：{{cellItem.spec_svc_pv }}
+            </div>
+            <div>规格：日访问次数：{{ cellItem.spec_svc_count }}次，日访问量：{{ cellItem.spec_svc_pv }}</div>
+          </el-tooltip>
+          <div
+            class="cell_specification_type"
+          >申请方式：{{ cellItem.duration_unit == 1 ? $t('lang.by_month') : $t('lang.by_year') }}</div>
+        </div>
+        <div v-else-if="cellItem.order_type == 2">
+          <el-tooltip class="item" effect="dark" placement="right">
+            <div slot="content" class="gg">
+              规格：
+              <br />
+              {{ cellItem.spec_app == 0 ? '申请获取应用镜像部署权限' : '申请获取应用镜像开发权限' }}
+            </div>
+            <div>规格：{{ cellItem.spec_app == 0 ? "申请获取应用镜像部署权限" : "申请获取应用镜像开发权限" }}</div>
+          </el-tooltip>
+        </div>
+        <div v-else-if="cellItem.order_type == 3">
+          <el-tooltip v-if="cellItem.apply_type == 0" class="item" effect="dark" placement="right">
+            <div slot="content" class="gg">
+              规格：
+              <br />
+              CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
+              <br />
+              数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB；
+            </div>
+            <div class="specification_item">
+              规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
+              <span
+                v-if="cellItem.disk_num != 0"
+              >数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB；</span>
+            </div>
+          </el-tooltip>
+          <el-tooltip v-else class="item" effect="dark" placement="right">
+            <div slot="content" class="gg">
+              规格：
+              <br />
+              CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
+              <span
+                class="gg_span"
+                v-for="(item, index) in cellItem.adjust_disk"
+                :key="'sjj' + index"
+              >数据盘 {{item.disk_num}}块，每块数据盘容量 {{item.disk_cap}}GB；</span>
+            </div>
+            <div class="specification_item">
+              规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
+              <span>{{ thisDisks }}</span>
+            </div>
+          </el-tooltip>
+          <div
+            class="cell_specification_type"
+          >单个容器组：CPU最高 {{ cellItem.one_cpu_max }}核，默认 {{ cellItem.one_cpu_min }}核；内存最高 {{ cellItem.one_memory_max }}GB，默认 {{ cellItem.one_memory_min }}GB；</div>
+        </div>
+      </el-col>
+      <el-col :span="2" class="approval_status">
         <div>
           <div v-if="cellItem.approval_first_level == 0 &&  cellItem.pay_status != -1">待审核</div>
           <div
@@ -153,7 +275,7 @@
           >收起评价</div>
         </div>
       </el-col>
-      <el-col :span="4" class="cell_option">
+      <el-col :span="3" class="cell_option">
         <div>
           <el-button
             size="madium"

src/components/order-list/order-list-com.vue

@@ -13,9 +13,10 @@
         <span
           v-for="(item, index) in buttonList"
           :key="'btn' + index"
-          :class="item.state ? 'btn_default btn_actice':'btn_default'"
+          :class="item.state ? 'btn_default btn_actice' : 'btn_default'"
           @click="btnClick(index)"
-        >{{ item.name }}</span>
+          >{{ item.name }}</span
+        >
       </div>
       <div class="input_right">
         <el-input
@@ -58,7 +59,10 @@
             :disabled="pagination.page == 1"
           ></el-button>
           &nbsp;&nbsp;第{{ pagination.page }}页 / 共{{
-          Math.ceil((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
+            Math.ceil(
+              (pagination.total == 0 ? 1 : pagination.total) /
+                pagination.rowsPerPage
+            )
           }}页
           <el-button
             icon="el-icon-arrow-right"
@@ -66,9 +70,12 @@
             size="mini"
             @click="handleCurrentChange(1)"
             :disabled="
-            pagination.page >=
-              Math.ceil((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
-          "
+              pagination.page >=
+              Math.ceil(
+                (pagination.total == 0 ? 1 : pagination.total) /
+                  pagination.rowsPerPage
+              )
+            "
           ></el-button>
         </div>
       </div>
@@ -304,11 +311,12 @@ export default {
   border-right-color: #dcdfe6;
   border-left-color: #dcdfe6;
   border-top: 4px solid #e56600;
-  height: 48px;
+  height: 50px !important;
 }
 .order_block .el-tabs--border-card > .el-tabs__header .el-tabs__item {
   border-top: 4px solid transparent;
-  height: 48px;
+  height: 50px !important;
+  line-height: 46px !important;
 }
 .order_block .el-tabs--border-card > .el-tabs__header .el-tabs__item:hover {
   color: #e56600;

src/components/order-list/order-list-list.vue

@@ -2,10 +2,12 @@
   <div class="order_list">
     <div class="order_th_pad">
       <el-row class="order_th">
-        <el-col :span="10">服务信息</el-col>
-        <el-col :span="6">规格</el-col>
-        <el-col :span="4">申请状态</el-col>
-        <el-col :span="4">操作</el-col>
+        <el-col :span="8">服务信息</el-col>
+        <el-col :span="5">规格</el-col>
+        <el-col :span="3">购买时长</el-col>
+        <el-col :span="3">总价</el-col>
+        <el-col :span="2">申请状态</el-col>
+        <el-col :span="3">操作</el-col>
       </el-row>
     </div>
     <order-cell v-for="item in datas" :key="item.id" :cellItem="item" @updateList="updateList"></order-cell>

src/pages/authority/user/money.vue

+<template>
+    <div class="users_list">
+        <el-breadcrumb separator="/" slot="breadcrumb">
+            <el-breadcrumb-item to="/authority">权限管理</el-breadcrumb-item>
+            <el-breadcrumb-item to="/authority/users">用户管理</el-breadcrumb-item>
+            <el-breadcrumb-item>充值</el-breadcrumb-item>
+        </el-breadcrumb>
+    </div>
+</template>
+
+<script>
+import apassDialog from "@/components/apass-dialog";
+export default {
+    props: [],
+    components: {
+        apassDialog
+    },
+    data() {
+        return {
+
+        };
+    },
+    watch: {
+
+    },
+    computed: {
+
+    },
+    created() {
+
+    },
+    mounted() {
+
+    },
+    methods: {
+
+    },
+};
+</script>
+
+<style scoped>
+.users_list{
+    padding: 15px 20px;
+}
+</style>

src/pages/authority/user/users.vue

@@ -22,7 +22,11 @@
           <el-table-column label="" width="40"></el-table-column>
           <el-table-column label="账号" width="160">
             <template slot-scope="scope">
-              <span v-text="scope.row.user_id"></span>
+              <div class="row_action">
+                <a class="btn" v-text="scope.row.user_id" @click="
+                    $router.push(`/authority/users/detail/${scope.row.user_id}`)
+                  "></a>
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="业务系统名称">
@@ -62,19 +66,19 @@
                 <a
                   class="btn"
                   @click="
-                    $router.push(`/authority/users/detail/${scope.row.user_id}`)
+                    $router.push(`/authority/users/roles/${scope.row.user_id}`)
                   "
                 >
-                  详情
+                  分配角色
                 </a>
                 <span class="interval_line">|</span>
                 <a
-                  class="btn"
+                  :class="{btn:true,disabled:![3,4].includes(scope.row.is_admin)}"
                   @click="
-                    $router.push(`/authority/users/roles/${scope.row.user_id}`)
+                    goto_give_money(scope.row.user_id,scope.row.is_admin)
                   "
                 >
-                  分配角色
+                  充值
                 </a>
                 <span class="interval_line">|</span>
                 <a
@@ -126,6 +130,11 @@ export default {
           console.log(error);
         });
     },
+    goto_give_money(id,type){
+      if(type==3||type==4){
+        this.$router.push(`/authority/users/money/${id}`)
+      }
+    },
     changeState(item) {
       console.log(item);
 

src/router/index.js

@@ -561,6 +561,12 @@ export default new Router({
               component: () =>
                 import("@/pages/authority/user/organizationuser"),
             },
+            {
+              path: "/authority/users/money/:id", // 用户管理-充值
+              name: "usersmoney",
+              component: () =>
+                import("@/pages/authority/user/money"),
+            },
             {
               path: "/authority/users/permission", // 用户管理页 - 权限审批
               name: "users",