From cf49fa32aad9c0089a3b48c4d0445528fb5cc445 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 30 九月 2024 12:55:52 +0800
Subject: [PATCH] Merge branch 'master' into release
---
src/views/console/soam/oss-system.vue | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/views/console/soam/oss-system.vue b/src/views/console/soam/oss-system.vue
index efb9007..deb4a79 100644
--- a/src/views/console/soam/oss-system.vue
+++ b/src/views/console/soam/oss-system.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-05-08 16:28:34
+ * @LastEditTime: 2024-09-30 10:10:59
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -36,7 +36,7 @@
</el-row>
</el-form>
</el-tab-pane>
- <el-tab-pane label="浼佷笟LOGO">
+ <!-- <el-tab-pane label="浼佷笟LOGO">
<div class="tabTitle">浼佷笟LOGO</div>
<span class="logotitle">涓婁紶logo</span>
<div class="logo1">
@@ -59,8 +59,8 @@
<ul class="show-list">
<li :class="{active: active.isA}" @click="changeLi('isA')">
<div class="edit" @click="editBtn('isA')">缂栬緫</div>
- <div class="logo">
- <img src="http://116.63.155.153:83/api/static/images/cps.png">
+ <div class="logo" style="background-color: seagreen;">
+ CPS
</div>
<div class="content">
<div class="name">CPS</div>
@@ -69,8 +69,8 @@
</li>
<li :class="{active: active.isB}" @click="changeLi('isB')">
<div class="edit" @click="editBtn('isB')">缂栬緫</div>
- <div class="logo">
- <img src="http://116.63.155.153:83/api/static/images/vision.png">
+ <div class="logo" style="background-color: dodgerblue;">
+ 澶у睆
</div>
<div class="content">
<div class="name">澶у睆</div>
@@ -79,8 +79,8 @@
</li>
<li :class="{active: active.isC}" @click="changeLi('isC')">
<div class="edit" @click="editBtn('isC')">缂栬緫</div>
- <div class="logo">
- <img src="http://116.63.155.153:83/api/static/images/hmi.png">
+ <div class="logo" style="background-color: darkgoldenrod;">
+ HMI
</div>
<div class="content">
<div class="name">HMI</div>
@@ -128,7 +128,7 @@
</el-form-item>
</el-form>
</el-card>
- </el-tab-pane>
+ </el-tab-pane> -->
<el-tab-pane label="鎺堟潈">
<div class="tabTitle">鎺堟潈</div>
<div class="license-detail">
@@ -139,7 +139,7 @@
<div><span class="left">璁惧鏍囪瘑锛�</span><span class="licenseCopy" @click="licenseCopy">澶嶅埗</span></div>
</div>
</el-tab-pane>
- <el-tab-pane label="鏈嶅姟闆嗘垚">
+ <!-- <el-tab-pane label="鏈嶅姟闆嗘垚">
<div class="tabTitle">鏈嶅姟闆嗘垚</div>
<div class="card">
<div class="top">
@@ -193,8 +193,8 @@
</div>
</div>
</div>
- </el-tab-pane>
- <el-tab-pane label="DMP鏃ュ織">
+ </el-tab-pane> -->
+ <!-- <el-tab-pane label="DMP鏃ュ織">
<div class="tabTitle">DMP鏃ュ織</div>
<el-form :inline="true" :model="DMPsearchData" label-width="80px">
<el-row>
@@ -236,7 +236,7 @@
<el-table-column prop="test" label="绫诲瀷"></el-table-column>
<el-table-column fixed="right" label="鎿嶄綔">
<template #default="scope">
- <!-- <el-button text type="primary" size="small" @click="showDrawer(scope.row, scope.$index)">锛燂紵</el-button> -->
+ <el-button text type="primary" size="small" @click="showDrawer(scope.row, scope.$index)">锛燂紵</el-button>
</template>
</el-table-column>
</el-table>
@@ -251,7 +251,7 @@
layout="total, sizes, prev, pager, next, jumper"
:total="DMPsearchData.total">
</el-pagination>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="addOssSuccess" @closed="dialog.save=false"></save-dialog>
<!-- 瑙ｇ粦 -->
@@ -653,10 +653,12 @@
width: 66px;
height: 66px;
margin-right: 14px;
-}
-.show-list li .logo img{
- width: 66px;
- height: 66px;
+ color: #fff;
+ font-size: 18px;
+ text-align: center;
+ line-height: 66px;
+ border-radius: 6px;
+ font-weight: 800;
}
.show-list li .lcontent .name{
font-weight: 700;
--
Gitblit v1.9.3