From d365829b14ca4256d39694b9cdcd43bad0ad8595 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期五, 11 二月 2022 18:18:39 +0800
Subject: [PATCH] bug修复
---
src/pages/library/components/baseList.vue | 161 ++++++++++++++++-------------------------------------
1 files changed, 48 insertions(+), 113 deletions(-)
diff --git a/src/pages/library/components/baseList.vue b/src/pages/library/components/baseList.vue
index 66c485b..106d8ce 100644
--- a/src/pages/library/components/baseList.vue
+++ b/src/pages/library/components/baseList.vue
@@ -6,16 +6,15 @@
<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
+ <el-tooltip
+ content="娣诲姞鍚屾搴�"
+ placement="top"
+ >
+ <!-- popper-class="atooltip" -->
+ <span
class="iconfont icontianjiaku-09"
style="
font-size: 22px;
@@ -26,6 +25,8 @@
@click.stop="add('sync')"
v-if="isShow('library:set')"
></span>
+ </el-tooltip>
+
</template>
<div class="max-height">
@@ -62,6 +63,7 @@
<div
class="status-dot"
+ :class="item.enable == 1 ?'status-dot-active':''"
:style="item.enable == 1 ? { background: '#4E94FF' } : {}"
></div>
</el-col>
@@ -85,9 +87,14 @@
</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
+ <el-tooltip
+ content="娣诲姞鍚屾搴�"
+ placement="top"
+
+ >
+ <span
class="iconfont icontianjiaku-09"
style="
font-size: 22px;
@@ -98,6 +105,8 @@
@click.stop="add('local')"
v-if="isShow('library:set')"
></span>
+ </el-tooltip>
+
</template>
<div class="max-height">
<el-row
@@ -131,6 +140,7 @@
<div
class="status-dot"
+ :class="item.enable == 1 ?'status-dot-active':''"
:style="item.enable == 1 ? { background: '#4E94FF' } : {}"
></div>
</el-col>
@@ -148,9 +158,6 @@
<div class="time-end">
{{ item.endTime ? item.endTime : "姘镐箙鏈夋晥" }}
</div>
- <!-- {{ item.startTime }}~{{
- item.endTime ? item.endTime : "姘镐箙鏈夋晥"
- }} -->
</el-col>
</el-row>
</div>
@@ -189,13 +196,9 @@
},
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() {
await this.BaseManageData.querySyncTables();
@@ -205,85 +208,14 @@
this.localTableList = this.BaseManageData.localTables;
this.defaultShow();
},
- handleChange(val) {},
- async setEnable(item) {
- let res = await updateDbTableStatus({
- id: item.id,
- enable: item.enable,
- });
- if (res.success === true) {
- this.$notify({
- type: "success",
- message: "搴曞簱鎴愬姛鍙樻洿鐢熸晥鐘舵�侊紒",
- });
- } else {
- this.$notify({
- type: "error",
- message: "搴曞簱鍙樻洿鐢熸晥鐘舵�佸け璐ワ紒",
- });
- }
- },
add(type) {
this.$emit("changeShow", null, type);
- },
- isDisabled(item) {
- var flag = true;
- if (this.isShow("library:set")) {
- if (item.endTime == "") {
- flag = false;
- } else {
- flag = !this.$moment(new Date()).isBetween(
- item.startTime,
- item.endTime
- );
- }
- }
- return flag;
},
clickCategory(index, type, item) {
this.categoryIndex = type + index;
// 璋冪敤鍒囨崲鍙充晶闈㈡澘鐨勫嚱鏁板苟涓斿垏鎹㈢埗缁勪欢涓璱sSelected鐨勫�艰鍙︿竴涓粍浠舵竻闄よ閫変腑鐘舵��
this.clickBase = item;
this.$emit("getList", item, type);
- },
- edit(item, type) {
- this.$emit("changeShow", item, type);
- },
- deleteBase(id) {
- let token =
- sessionStorage.getItem("loginedInfo") &&
- JSON.parse(sessionStorage.getItem("loginedInfo")).access_token;
- this.$confirm("鎻愮ず锛氱‘瀹氬垹闄ゅ簳搴擄紵", {
- center: true,
- cancelButtonClass: "comfirm-class-cancle",
- confirmButtonClass: "comfirm-class-sure",
- }).then(() => {
- fetch(`/data/api-v/dbtable/deleteDBtablesById?id=${id}`, {
- method: "GET",
- headers: {
- "Content-Type": "application/json",
- Authorization: token,
- },
- })
- .then((res) => {
- return res.json();
- })
- .then((res) => {
- if (res.success) {
- this.$notify({
- type: "success",
- message: "搴曞簱鍒犻櫎鎴愬姛锛�",
- });
- }
- this.init();
- })
- .catch((err) => {
- this.$notify({
- type: "error",
- message: err,
- });
- });
- });
},
// 榛樿鏄剧ず绗竴涓簱鐨勬暟鎹�
defaultShow() {
@@ -317,25 +249,25 @@
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;
- }
- },
+ // 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: {
@@ -401,7 +333,10 @@
font-size: 14px;
}
.out-div {
- max-height: 100%;
+ max-height: 100%; height: 100%;
+ .el-collapse-item__header{
+ position:relative;
+ }
.el-collapse-item__wrap {
will-change: height;
background-color: #fff;
@@ -435,7 +370,7 @@
.time-end {
color: #e9e9e9;
}
- .status-dot {
+ .status-dot-active {
background: #fff !important;
}
}
--
Gitblit v1.8.0