相关提交

src/layout/components/Sidebar-custom/index.vue

@@ -60,7 +60,7 @@ const activeMenu = computed(() => {
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
 .title {
 .title {
-  font-weight: bold;
+  font-weight: bolder !important;
   font-size: 18px;
   font-size: 18px;
   color: #303233;
   color: #303233;
   padding: 20px;
   padding: 20px;

src/layout/user-layout.vue

@@ -202,13 +202,13 @@ function logout() {
 
 
     .el-sub-menu, .el-menu-item {
     .el-sub-menu, .el-menu-item {
       &.is-active {
       &.is-active {
-        font-weight: bold;
+        font-weight: bolder;
         font-size: 18px !important;
         font-size: 18px !important;
       }
       }
     }
     }
 
 
     .el-sub-menu__title, .el-menu-item {
     .el-sub-menu__title, .el-menu-item {
-      font-weight: 500;
+      font-weight: bolder;
       font-size: 18px !important;
       font-size: 18px !important;
       color: #4e5051;
       color: #4e5051;
     }
     }
@@ -229,7 +229,7 @@ function logout() {
     }
     }
 
 
     .user-name, .console {
     .user-name, .console {
-      font-weight: 400;
+      font-weight: bolder;
       font-size: 18px;
       font-size: 18px;
       color: #303233;
       color: #303233;
     }
     }

src/views/computingResource/shoppingCart.vue

@@ -15,10 +15,10 @@
 
 
     <div class="page-main">
     <div class="page-main">
       <div class="detail-info">
       <div class="detail-info">
-        <el-table :data="tableData" v-if="tableData.length !== 0" row-key="id" @selection-change="tableSelectionChange">
+        <el-table :data="tableData" v-if="tableData.length !== 0" row-key="id" @selection-change="tableSelectionChange" align="center">
           <el-table-column type="selection" reserve-selection/>
           <el-table-column type="selection" reserve-selection/>
           <el-table-column label="资源型号" prop="model"/>
           <el-table-column label="资源型号" prop="model"/>
-          <el-table-column label="配置详情" width="150px">
+          <el-table-column label="配置详情" width="210px">
             <template #default="{row}">
             <template #default="{row}">
               <p>CPU：{{ row.cpu }}</p>
               <p>CPU：{{ row.cpu }}</p>
               <p>GPU：{{ row.gpu }}</p>
               <p>GPU：{{ row.gpu }}</p>
@@ -33,14 +33,22 @@
           <!--              {{ param[scope.$index][index]['valueName'] }}-->
           <!--              {{ param[scope.$index][index]['valueName'] }}-->
           <!--            </template>-->
           <!--            </template>-->
           <!--          </el-table-column>-->
           <!--          </el-table-column>-->
-          <el-table-column v-for="(i, index) in headers" :key="index" :label="i.name" :prop="i.name"
-                           :width="i?.name?.length >= 8 ? '150px':''">
+          <!--          <el-table-column v-for="(i, index) in headers" :key="index" :label="i.name" :prop="i.name"-->
+          <!--                           :width="i?.name?.length >= 8 ? '150px':''">-->
+          <!--            <template v-slot="scope">-->
+          <!--              {{ getCellValue(scope.row.param, i.name) || '-' }}-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+
+          <el-table-column label="配置参数" width="300px">
             <template v-slot="scope">
             <template v-slot="scope">
-              {{ getCellValue(scope.row.param, i.name) || '-' }}
+              <div v-for="(item, index) in JSON.parse(scope.row.param)" :key="index">
+                {{ item.name }}：{{ item.valueName }}
+              </div>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
 
 
-          <el-table-column label="申请数量" prop="useNum" width="95px">
+          <el-table-column label="申请数量" prop="useNum">
             <template #default="{row}">
             <template #default="{row}">
               <el-input-number
               <el-input-number
                   v-model="row.useNum"
                   v-model="row.useNum"

src/views/index-copy.vue

@@ -29,7 +29,7 @@
           <div class="particulars" v-if="index !== 2">
           <div class="particulars" v-if="index !== 2">
             <el-row :gutter="24">
             <el-row :gutter="24">
               <el-col class="resource-col" :span="8" v-for="x in i.assemblyData" :key="i"
               <el-col class="resource-col" :span="8" v-for="x in i.assemblyData" :key="i"
-                      @click="i.id === 1? $router.push(x.router):openAssembly(x)"
+                      @click="i.id === 1? $router.push('/computingResource/resourceList?type=' + x.category):openAssembly(x)"
               >
               >
                 <!--                style="background: url("@/assets/images/indexImg/resource1.png") no-repeat center center / 100%;"-->
                 <!--                style="background: url("@/assets/images/indexImg/resource1.png") no-repeat center center / 100%;"-->
                 <div class="resource-box" :style="{background: `url(${index === 0 ?baseUrl+x.image:baseUrl+x.homeImage}) no-repeat center center / 100%`}">
                 <div class="resource-box" :style="{background: `url(${index === 0 ?baseUrl+x.image:baseUrl+x.homeImage}) no-repeat center center / 100%`}">
@@ -211,6 +211,7 @@ function getAassemblyList() {
 function getResource() {
 function getResource() {
   informationResourceList().then(res => {
   informationResourceList().then(res => {
     list.value[0].assemblyData = res.data.length > 3 ? res.data.slice(0, 3) : res.data
     list.value[0].assemblyData = res.data.length > 3 ? res.data.slice(0, 3) : res.data
+    console.log(list.value[0].assemblyData, 'list.value[0].assemblyData')
   })
   })
 }
 }