From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug
---
src/pages/library/components/baseList.vue | 138 +++++++++++++++++++++++-----------------------
1 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/src/pages/library/components/baseList.vue b/src/pages/library/components/baseList.vue
index d834691..9a70af5 100644
--- a/src/pages/library/components/baseList.vue
+++ b/src/pages/library/components/baseList.vue
@@ -6,27 +6,28 @@
<el-collapse v-model="activeNames">
<el-collapse-item name="1" class="el-collapse-item__wrap">
<template slot="title">
- <span
- :class="
- title === '鍚屾搴�'
- ? 'iconfont icontongbuku_v'
- : 'iconfont iconbendiku_v'
- "
- style="font-size: 32px"
- ></span>
+ <img
+ v-if="title === '鍚屾搴�'"
+ src="/images/library/鍚屾搴�2.png"
+ alt=""
+ srcset=""
+ />
+ <img v-else src="/images/library/鏈湴搴�2.png" alt="" srcset="" />
<span class="m5">{{ title }}</span>
- <span
- class="iconfont icontianjiaku-09"
- style="
- font-size: 22px;
- color: #666666;
- position: absolute;
- right: 10px;
- "
- @click.stop="add('sync')"
- v-if="isShow('library:set')"
- ></span>
-
+ <el-tooltip content="娣诲姞鍚屾搴�" placement="top">
+ <!-- popper-class="atooltip" -->
+ <span
+ class="iconfont icontianjiaku-09"
+ style="
+ font-size: 22px;
+ color: #666666;
+ position: absolute;
+ right: 10px;
+ "
+ @click.stop="add('sync')"
+ v-if="isShow('library:set')"
+ ></span>
+ </el-tooltip>
</template>
<div class="max-height">
<el-row
@@ -59,9 +60,9 @@
</p>
</el-col>
<el-col :span="10" :offset="1">
-
<div
class="status-dot"
+ :class="item.enable == 1 ? 'status-dot-active' : ''"
:style="item.enable == 1 ? { background: '#4E94FF' } : {}"
></div>
</el-col>
@@ -85,19 +86,21 @@
</el-collapse-item>
<el-collapse-item name="2" class="el-collapse-item__wrap">
<template slot="title">
- <span class="iconfont iconbendiku_v" style="font-size: 32px"></span>
+ <img src="/images/library/鏈湴搴�2.png" alt="" srcset="" />
<span class="m5">{{ titleB }}</span>
- <span
- class="iconfont icontianjiaku-09"
- style="
- font-size: 22px;
- color: #666666;
- position: absolute;
- right: 10px;
- "
- @click.stop="add('local')"
- v-if="isShow('library:set')"
- ></span>
+ <el-tooltip content="娣诲姞鍚屾搴�" placement="top">
+ <span
+ class="iconfont icontianjiaku-09"
+ style="
+ font-size: 22px;
+ color: #666666;
+ position: absolute;
+ right: 10px;
+ "
+ @click.stop="add('local')"
+ v-if="isShow('library:set')"
+ ></span>
+ </el-tooltip>
</template>
<div class="max-height">
<el-row
@@ -128,9 +131,9 @@
</p>
</el-col>
<el-col :span="10" :offset="1">
-
<div
class="status-dot"
+ :class="item.enable == 1 ? 'status-dot-active' : ''"
:style="item.enable == 1 ? { background: '#4E94FF' } : {}"
></div>
</el-col>
@@ -148,9 +151,6 @@
<div class="time-end">
{{ item.endTime ? item.endTime : "姘镐箙鏈夋晥" }}
</div>
- <!-- {{ item.startTime }}~{{
- item.endTime ? item.endTime : "姘镐箙鏈夋晥"
- }} -->
</el-col>
</el-row>
</div>
@@ -189,24 +189,38 @@
},
methods: {
isShow(authority) {
- if (this.isAdmin) {
- return true;
- } else if (this.buttonAuthority.indexOf("," + authority + ",") > -1) {
- return true;
- } else {
- return false;
- }
+ return (
+ this.isAdmin || this.buttonAuthority.indexOf("," + authority + ",") > -1
+ );
},
- async init() {
+ async init(typ) {
await this.BaseManageData.querySyncTables();
this.syncTableList = this.BaseManageData.syncTables;
- this.defaultShow();
+ if (typ) {
+ this.$emit("getList");
+ } else {
+ this.defaultShow();
+ }
await this.BaseManageData.queryLocalTables();
this.localTableList = this.BaseManageData.localTables;
- this.defaultShow();
+ if (typ) {
+ this.$emit("getList");
+ } else {
+ this.defaultShow();
+ }
},
add(type) {
this.$emit("changeShow", null, type);
+ },
+ clickLast(type) {
+ // this.$nextTick(() => {
+
+ // });
+ this.clickCategory(
+ this.syncTableList.length - 1,
+ type,
+ this.syncTableList[this.syncTableList.length - 1]
+ );
},
clickCategory(index, type, item) {
this.categoryIndex = type + index;
@@ -246,25 +260,6 @@
return false;
}
},
- // dateCompare(dateString, compareDateString) {
- // // dateString:褰撳墠鏃堕棿
- // // compareDateString:闇�瑕佹瘮杈冪殑鏃堕棿
- // if (this.isEmpty(dateString)) {
- // return;
- // }
- // if (this.isEmpty(compareDateString)) {
- // return 1;
- // }
- // var dateTime = this.dateParse(dateString).getTime();
- // var compareDateTime = this.dateParse(compareDateString).getTime();
- // if (compareDateTime > dateTime) {
- // return 1;
- // } else if (compareDateTime === dateTime) {
- // return 0;
- // } else {
- // return -1;
- // }
- // },
},
props: {
listWidth: {
@@ -330,7 +325,11 @@
font-size: 14px;
}
.out-div {
- max-height: 100%; height: 100%;
+ max-height: 100%;
+ height: 100%;
+ .el-collapse-item__header {
+ position: relative;
+ }
.el-collapse-item__wrap {
will-change: height;
background-color: #fff;
@@ -345,7 +344,8 @@
.el-row {
border-radius: 9px;
background: rgba(239, 241, 245, 0.35);
- margin-bottom: 4px; min-height: 72px;
+ margin-bottom: 4px;
+ min-height: 72px;
box-sizing: border-box;
padding: 10px 5px;
}
@@ -364,7 +364,7 @@
.time-end {
color: #e9e9e9;
}
- .status-dot {
+ .status-dot-active {
background: #fff !important;
}
}
--
Gitblit v1.8.0