diff --git a/src/bg-ui/bg-btns.vue b/src/bg-ui/bg-btns.vue
index abe7773ca111c268d723ba8a15604c357940c972..11405052586b870905ef76329973550e44b5e635 100644
--- a/src/bg-ui/bg-btns.vue
+++ b/src/bg-ui/bg-btns.vue
@@ -15,24 +15,21 @@
-
diff --git a/src/bg-ui/bg-card.vue b/src/bg-ui/bg-card.vue
index a473955adee775df43958cdcdd577bad0bb2f39c..c34605e6256d72a01e6bc522f8269c73912c609f 100644
--- a/src/bg-ui/bg-card.vue
+++ b/src/bg-ui/bg-card.vue
@@ -1,29 +1,58 @@
-
-
-
-
- {{ title }}
-
+
-
+
+
\ No newline at end of file
diff --git a/src/bg-ui/bg-detail-table.vue b/src/bg-ui/bg-detail-table.vue
index da685d3321e5609526d11968a198e0b9c0a13f82..ab0af920f619697f369a0f220e0ac513268d0959 100644
--- a/src/bg-ui/bg-detail-table.vue
+++ b/src/bg-ui/bg-detail-table.vue
@@ -1,102 +1,105 @@
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
- {{item.info}}
-
- {{helper.downloadFileFormatNew(it)}}、
-
-
-
-
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+ {{ item.info }}
+
+ {{ helper.downloadFileFormatNew(it) }}、
+
+
+
+
-
diff --git a/src/bg-ui/bg-detail-table2.vue b/src/bg-ui/bg-detail-table2.vue
index 19757d2c791f8bf66616ba116ee5ffe58b75878b..fe1fd13a2cb479a5e08ccede18ec9100ee6465a0 100644
--- a/src/bg-ui/bg-detail-table2.vue
+++ b/src/bg-ui/bg-detail-table2.vue
@@ -1,94 +1,69 @@
-
-
-
- {{item.label}}
- {{item.value}}
-
-
-
-
-
-
-
-
+
+
+
+ {{ item.label }}
+ {{ item.value }}
+
+
+
+
+
+
+
+
-
diff --git a/src/bg-ui/bg-detail.vue b/src/bg-ui/bg-detail.vue
index 8ea63e135f6d9ac15cef7f423e93d505faa30cd8..2dd720232abe69428c89301b02f5c0ba29c5ae88 100644
--- a/src/bg-ui/bg-detail.vue
+++ b/src/bg-ui/bg-detail.vue
@@ -1,5 +1,5 @@
-
-
diff --git a/src/bg-ui/bg-list.vue b/src/bg-ui/bg-list.vue
index f896beb670633aecfcd0b9d9d82a8e3d8e2477a7..6ce311d9a8422fbe1fc8e54a44e1b6b8cfcd1732 100644
--- a/src/bg-ui/bg-list.vue
+++ b/src/bg-ui/bg-list.vue
@@ -30,10 +30,7 @@
-
+
@@ -41,12 +38,8 @@
-
- 查询
-
-
- 重置
-
+
查询
+
重置
@@ -73,22 +66,19 @@
-
diff --git a/src/bg-ui/bg-nav-list.vue b/src/bg-ui/bg-nav-list.vue
index 97ff048a93dd8a8401eb7bfd1ea269680c9fa985..bde6ff9ed6a092a2965e746eabdc8fd861bb02e5 100644
--- a/src/bg-ui/bg-nav-list.vue
+++ b/src/bg-ui/bg-nav-list.vue
@@ -1,18 +1,23 @@
-
- -
-
+
+
+
diff --git a/src/bg-ui/bg-nav.vue b/src/bg-ui/bg-nav.vue
index e23ba7836c829e2d75ed637318df06d93b700399..d7726a63a49b51b2c46313b51fd174a74b327802 100644
--- a/src/bg-ui/bg-nav.vue
+++ b/src/bg-ui/bg-nav.vue
@@ -3,36 +3,30 @@
{{ title }}
-
-
diff --git a/src/bg-ui/bg-pagination.vue b/src/bg-ui/bg-pagination.vue
index 8397bd6f39d7b6df44fc4b9f028dcece8da537b0..260e40361f6260f9aa6246ef4a17d4dec09656cc 100644
--- a/src/bg-ui/bg-pagination.vue
+++ b/src/bg-ui/bg-pagination.vue
@@ -1,63 +1,63 @@
-
\ No newline at end of file
+
diff --git a/src/bg-ui/bg-rich-text.vue b/src/bg-ui/bg-rich-text.vue
index a0f717243352425f5c102255571bc9ee0ac81139..d1bac2a5cb3f2cb0999bcf9327220acde312a7a7 100644
--- a/src/bg-ui/bg-rich-text.vue
+++ b/src/bg-ui/bg-rich-text.vue
@@ -1,169 +1,118 @@
-
-
\ No newline at end of file
+
diff --git a/src/bg-ui/bg-step.vue b/src/bg-ui/bg-step.vue
deleted file mode 100644
index c757568e87f82036adf2c05db81364c5771fb258..0000000000000000000000000000000000000000
--- a/src/bg-ui/bg-step.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
diff --git a/src/bg-ui/bg-steps.vue b/src/bg-ui/bg-steps.vue
deleted file mode 100644
index a17dfa2d6489878a25237a670669fe6cef9982b6..0000000000000000000000000000000000000000
--- a/src/bg-ui/bg-steps.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
-
- -
-
-
-
-
-
![]()
-
-
-
- {{ item.title || "完成" }}
-
-
-
- 已完成
-
-
- 进行中
-
-
- 未进行
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/bg-ui/bg-switch.vue b/src/bg-ui/bg-switch.vue
index 62c03cd44c95e545cf2ce235d981c101ab37532f..282b67b6fe02cd740550342e9d07c4e78e22720c 100644
--- a/src/bg-ui/bg-switch.vue
+++ b/src/bg-ui/bg-switch.vue
@@ -1,11 +1,5 @@
-
+
{{ labels[now_index] }}
@@ -15,87 +9,84 @@
-
diff --git a/src/bg-ui/bg-tab.vue b/src/bg-ui/bg-tab.vue
index 36a6b54546d74cedd0e46030d9a0b4e4748b5ff0..618e9a189829fcf974382be77e8f143e5867defb 100644
--- a/src/bg-ui/bg-tab.vue
+++ b/src/bg-ui/bg-tab.vue
@@ -9,51 +9,47 @@
-
diff --git a/src/bg-ui/bg-table-btn.vue b/src/bg-ui/bg-table-btn.vue
index e2e218151788236783cb2ed88cdb4be83aadef44..7a80ba022ffe42f4c356e086b8f9a628efb0240b 100644
--- a/src/bg-ui/bg-table-btn.vue
+++ b/src/bg-ui/bg-table-btn.vue
@@ -4,30 +4,27 @@
-
diff --git a/src/bg-ui/bg-table-btns.vue b/src/bg-ui/bg-table-btns.vue
index f2adb807ce35e18bf1029c136af180a803201c2f..c0e2ec4223138f689bb741a65211c089b17af710 100644
--- a/src/bg-ui/bg-table-btns.vue
+++ b/src/bg-ui/bg-table-btns.vue
@@ -11,7 +11,7 @@
@@ -19,7 +19,7 @@
@@ -78,7 +78,7 @@ export default {
return name;
}
},
- showMOreBtns() {
+ showMoreBtns() {
if (this.timer) clearTimeout(this.timer);
this.showMore = true;
diff --git a/src/bg-ui/bg-table-btns2.vue b/src/bg-ui/bg-table-btns2.vue
new file mode 100644
index 0000000000000000000000000000000000000000..7b95478258fd1f797c210a2426e53c7cdbffaf95
--- /dev/null
+++ b/src/bg-ui/bg-table-btns2.vue
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
diff --git a/src/bg-ui/bg-table-pro.vue b/src/bg-ui/bg-table-pro.vue
index b46b7ffb439cfa1b17808468ec2187988d798ab5..958144ff4faaa673d8c6ad5f7cc308785d58ff6f 100644
--- a/src/bg-ui/bg-table-pro.vue
+++ b/src/bg-ui/bg-table-pro.vue
@@ -3,14 +3,13 @@
ref="table"
class="bg-table bg-table-pro"
:class="{ 'bg-table-tree': !!rowKey }"
- v-bind="$attrs"
+ v-bind="attrs"
:data="data"
:row-key="rowKey"
:tree-props="treeProps"
@selection-change="selectionChange"
- :default-expand-all="defaultExpandAll"
tooltip-effect="light"
- >
+ :default-expand-all="defaultExpandAll">
序号
@@ -19,13 +18,7 @@
{{ $index + 1 }}
-
+
+ :fixed="header.fixed">
@@ -63,135 +55,132 @@
-
-
-
\ No newline at end of file
diff --git a/src/bg-ui/bg-table.vue b/src/bg-ui/bg-table.vue
index 0230c48ab059fad1bee2d54b41bf27d84c3711cc..637531a2f2e262549d296d9367385affbebb8c0f 100644
--- a/src/bg-ui/bg-table.vue
+++ b/src/bg-ui/bg-table.vue
@@ -1,5 +1,6 @@
+ tooltip-effect="light">
-

-
- 暂无数据
-
+

+
暂无数据
-
-
+
+
-
+
+
+
+ 排名
+
+
+
+
+
+
+ {{ $index + 1 }}
+
+
+
+ show-overflow-tooltip>
@@ -59,137 +54,166 @@
+
- {{ row[header.prop] }}
-
diff --git a/src/bg-ui/bg-tabs.vue b/src/bg-ui/bg-tabs.vue
index 8099a58c268f43e541465a42eb17a51568f797d2..ff7881c95c7435846a959b12ae6c375a02109ac6 100644
--- a/src/bg-ui/bg-tabs.vue
+++ b/src/bg-ui/bg-tabs.vue
@@ -26,51 +26,39 @@
-
diff --git a/src/bg-ui/bg-tags.vue b/src/bg-ui/bg-tags.vue
index 5a6ba1a4ba0b6cac328405921380ac00a89b4f35..6cf00b06d87eec4af6e6f65b6a3dd24a7693f1d0 100644
--- a/src/bg-ui/bg-tags.vue
+++ b/src/bg-ui/bg-tags.vue
@@ -10,67 +10,51 @@
-
- 新增
-
+ 新增
-
diff --git a/src/bg-ui/bg-upload-image.vue b/src/bg-ui/bg-upload-image.vue
index 346e20eff96ad586e1e81ad2ced43e23c38acb91..ca99f4fdb217eb5095111be9d024e760576e22c5 100644
--- a/src/bg-ui/bg-upload-image.vue
+++ b/src/bg-ui/bg-upload-image.vue
@@ -1,13 +1,13 @@
+ :multiple="multiple">
@@ -28,215 +27,213 @@
-
+
上传到服务器
-
- {{ customTips||tips }}
+
+ {{ customTips || tips }}
-
+
-
diff --git a/src/bg-ui/bg-upload.vue b/src/bg-ui/bg-upload.vue
index 07d5b4307a5a0a4a26f8c3ef63e1b5ff6fd379fd..8e7ecea50112e27541b182d59584aa79a9fe4238 100644
--- a/src/bg-ui/bg-upload.vue
+++ b/src/bg-ui/bg-upload.vue
@@ -1,8 +1,5 @@
-
+
+ multiple>
-
+
{{ triggerText }}
@@ -50,7 +42,7 @@
-
+
{{ otherInfo }}
@@ -58,165 +50,138 @@
-
diff --git a/src/bg-ui/index.js b/src/bg-ui/index.js
index 710a6f794fd4761871c7939c35577a26bdb59fe7..f4455e765eabfbae1a92134b34fc8a0881945b80 100644
--- a/src/bg-ui/index.js
+++ b/src/bg-ui/index.js
@@ -14,8 +14,6 @@
import BgLayoutCard from './bg-layout-card.vue'
import BgCard from './bg-card.vue'
import BgInfo from './bg-info.vue'
- import BgSteps from './bg-steps.vue'
- import BgStep from './bg-step.vue'
import BgBtns from './bg-btns.vue'
import BgUpload from './bg-upload.vue'
import BgUploadImage from './bg-upload-image.vue'
@@ -34,6 +32,7 @@
import BgInnerTabs from './bg-inner-tabs.vue'
import BgFilterGroup from './bg-filter-group.vue'
import BgTableBtns from './bg-table-btns.vue'
+ import BgTableBtns2 from './bg-table-btns2.vue'
const components = {
BgIcon,//字体图标
@@ -49,8 +48,6 @@ const components = {
BgLayoutCard, // 带标题的卡片
BgCard, // 详情卡片
BgInfo, // 表格信息
- BgSteps, // 步骤条
- BgStep, // 步骤条
BgBtns, // 按钮组
BgUpload, // 上传附件
BgUploadImage, // 上传单张图片
@@ -69,6 +66,7 @@ const components = {
BgInnerTabs,//内部tab
BgFilterGroup,//列表按钮及筛选
BgTableBtns,// 表格按钮组
+ BgTableBtns2,
};
const install = (Vue) => {
diff --git a/src/bg-ui/index.scss b/src/bg-ui/index.scss
index a84eb253498cc9894597b1ec9b8789b46802afef..7fa5a383faf36936fc94362ccfc6476037661b00 100644
--- a/src/bg-ui/index.scss
+++ b/src/bg-ui/index.scss
@@ -265,17 +265,17 @@ a {
padding: 0 10px;
> * {
- height: 36px !important;
+ height: 32px !important;
background-color: transparent !important;
font-size: 14px;
- line-height: 36px !important;
+ line-height: 32px !important;
color: #404a62;
}
> .el-pager > li {
- height: 36px !important;
+ height: 32px !important;
background-color: transparent !important;
- line-height: 36px !important;
+ line-height: 32px !important;
color: #404a62 !important;
&.active {
@@ -522,7 +522,7 @@ a {
}
> .bg-nav-list {
- height: calc(100% - 135px);
+ height: calc(100% - 10px);
box-sizing: border-box;
ul.nav-list {
@@ -644,17 +644,20 @@ a {
&::before {
display: none;
}
- .empty_container {
- height: 500px;
- padding-top: 247px;
- img {
- width: 257px;
- height: 145px;
- }
- .text {
- font-size: 16px;
- color: #616f94;
- line-height: 1;
+ .el-table__empty-block {
+ height: 500px!important;
+ .empty_container {
+ height: 500px;
+ padding-top: 247px;
+ img {
+ width: 257px;
+ height: 145px;
+ }
+ .text {
+ font-size: 16px;
+ color: #616f94;
+ line-height: 1;
+ }
}
}
th,
@@ -746,7 +749,7 @@ a {
max-width: 388px;
padding: 15px 12px;
color: #202531;
- box-shadow: 0px 4px 12px 0px
+ box-shadow: 0px 4px 12px 0px
rgba(18, 30, 63, 0.1);
border: solid 1px #e6e9ef;
font-size: 14px;
@@ -760,12 +763,26 @@ a {
> .cell {
padding: 0 10px !important;
overflow: unset;
- display: flex;
+ display: flex!important;
justify-content: flex-start;
align-items: center;
}
}
+ .el-table-column--selection{
+ border-left: 1px solid #e6e9ef;
+ > .cell {
+ justify-content: center
+ }
+ }
+
+ th.el-table-column--selection{
+ > .cell {
+ display: flex;
+ justify-content: center
+ }
+ }
+
&.el-table--border {
@@ -804,7 +821,12 @@ a {
display: inline;
color: #3759be;
cursor: pointer;
-
+ &:hover {
+ color: #738bd2
+ }
+ &:active {
+ color: #2c4798;
+ }
&.disabled {
cursor: not-allowed;
color: #a9b1c7;
@@ -1495,7 +1517,7 @@ a {
border-left: 1px solid #e3e5ef;
color: #404a62;
position: relative;
-
+
> .copy-btn {
position: absolute;
top: 50%;
@@ -1512,6 +1534,16 @@ a {
color: #2b4695;
}
}
+ > .copy-btn-dis {
+ color: #dce0e8;
+ cursor: not-allowed!important;
+ &:hover {
+ color: #dce0e8;
+ }
+ &:active {
+ color: #dce0e8;
+ }
+ }
}
}
@@ -1819,7 +1851,7 @@ a {
> .el-upload-list {
margin: 0 0 0 16px;
-
+
> .el-upload-list__item {
margin: 0;
@@ -2337,6 +2369,9 @@ a {
height: 32px;
margin-top: 16px;
float: right;
+ .el-input {
+ --el-input-height: 32px;
+ }
.el-pagination {
text-align: center;
margin: 0 auto;
@@ -2356,7 +2391,7 @@ a {
li:hover {
color: #3759be;
}
- }
+ }
.el-input__wrapper {
background-color: #fff;
}
@@ -2373,14 +2408,20 @@ a {
.bg-card {
background-color: #ffffff;
- box-shadow: 0px 1px 4px 0px
+ box-shadow: 0px 1px 4px 0px
rgba(0, 7, 101, 0.15);
border-radius: 6px;
margin-bottom: 16px;
+ .card-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ border-bottom: 1px solid #ebedf2;
+ }
+
.card-title {
padding: 16px 16px;
- border-bottom: 1px solid #ebedf2;
font-weight: bold;
display: flex;
justify-content: flex-start;
@@ -2517,7 +2558,7 @@ a {
background-color: #f2f3f7;
color: #202531;
}
-
+
&.disabled {
color: #a9b1c7;
}
@@ -2534,4 +2575,4 @@ a {
height: 10px;
width: 100%;
}
-}
\ No newline at end of file
+}