From 29bf5936bf1da2eea81f3abe07dc738f5267c42c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 02 Jan 2023 16:34:16 +0800
Subject: [PATCH] 修改顶部栏
---
src/const/application/application.js | 1
src/const/applicationCarChange/applicationCarChange.js | 1
src/const/enterprise/enterprise.js | 1
src/views/work/start.vue | 1
src/page/index/top/index.vue | 96 ++++++++++++++++----------------
src/const/evaluation/evaluation.js | 1
src/const/applicationDelay/applicationDelay.js | 2
src/page/index/top/top-notice.vue | 46 ++++++++++-----
8 files changed, 86 insertions(+), 63 deletions(-)
diff --git a/src/const/application/application.js b/src/const/application/application.js
index b8eebcd..bde9434 100644
--- a/src/const/application/application.js
+++ b/src/const/application/application.js
@@ -17,6 +17,7 @@
border: true,
index: true,
viewBtn: false,
+ addBtn:false,
delBtn:false,
editBtn:false,
selection: true,
diff --git a/src/const/applicationCarChange/applicationCarChange.js b/src/const/applicationCarChange/applicationCarChange.js
index 691e60d..ac5713c 100644
--- a/src/const/applicationCarChange/applicationCarChange.js
+++ b/src/const/applicationCarChange/applicationCarChange.js
@@ -10,6 +10,7 @@
searchMenuSpan: 6,
border: true,
index: true,
+ addBtn:false,
viewBtn: true,
selection: true,
dialogClickModal: false,
diff --git a/src/const/applicationDelay/applicationDelay.js b/src/const/applicationDelay/applicationDelay.js
index 3b98e83..53f17b4 100644
--- a/src/const/applicationDelay/applicationDelay.js
+++ b/src/const/applicationDelay/applicationDelay.js
@@ -11,6 +11,7 @@
searchMenuSpan: 6,
border: true,
index: true,
+ addBtn:false,
viewBtn: true,
selection: true,
dialogClickModal: false,
@@ -67,6 +68,7 @@
format:'yyyy-MM-dd',
valueFormat:'yyyy-MM-dd',
labelWidth:labelWidth,
+ width:170,
disabled:false,
pickerOptions: {
disabledDate(time) {
diff --git a/src/const/enterprise/enterprise.js b/src/const/enterprise/enterprise.js
index b4cc36b..7b9cabf 100644
--- a/src/const/enterprise/enterprise.js
+++ b/src/const/enterprise/enterprise.js
@@ -17,6 +17,7 @@
viewBtn: true,
selection: true,
dialogClickModal: false,
+ addBtn:false,
group: [
{
label: '联系人信息',
diff --git a/src/const/evaluation/evaluation.js b/src/const/evaluation/evaluation.js
index 689111a..87ebd42 100644
--- a/src/const/evaluation/evaluation.js
+++ b/src/const/evaluation/evaluation.js
@@ -11,6 +11,7 @@
viewBtn: false,
editBtn:false,
delBtn:false,
+ addBtn:false,
selection: true,
dialogClickModal: false,
column: [
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 6b99b79..5108d99 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -19,38 +19,38 @@
</span>
</div>
<div class="top-bar__right">
- <el-tooltip v-if="showColor"
- effect="dark"
- :content="$t('navbar.color')"
- placement="bottom">
- <div class="top-bar__item">
- <top-color></top-color>
- </div>
- </el-tooltip>
- <el-tooltip v-if="showDebug"
- effect="dark"
- :content="logsFlag?$t('navbar.bug'):logsLen+$t('navbar.bugs')"
- placement="bottom">
- <div class="top-bar__item">
- <top-logs></top-logs>
- </div>
- </el-tooltip>
- <el-tooltip v-if="showLock"
- effect="dark"
- :content="$t('navbar.lock')"
- placement="bottom">
- <div class="top-bar__item">
- <top-lock></top-lock>
- </div>
- </el-tooltip>
- <el-tooltip v-if="showTheme"
- effect="dark"
- :content="$t('navbar.theme')"
- placement="bottom">
- <div class="top-bar__item top-bar__item--show">
- <top-theme></top-theme>
- </div>
- </el-tooltip>
+<!-- <el-tooltip v-if="showColor"-->
+<!-- effect="dark"-->
+<!-- :content="$t('navbar.color')"-->
+<!-- placement="bottom">-->
+<!-- <div class="top-bar__item">-->
+<!-- <top-color></top-color>-->
+<!-- </div>-->
+<!-- </el-tooltip>-->
+<!-- <el-tooltip v-if="showDebug"-->
+<!-- effect="dark"-->
+<!-- :content="logsFlag?$t('navbar.bug'):logsLen+$t('navbar.bugs')"-->
+<!-- placement="bottom">-->
+<!-- <div class="top-bar__item">-->
+<!-- <top-logs></top-logs>-->
+<!-- </div>-->
+<!-- </el-tooltip>-->
+<!-- <el-tooltip v-if="showLock"-->
+<!-- effect="dark"-->
+<!-- :content="$t('navbar.lock')"-->
+<!-- placement="bottom">-->
+<!-- <div class="top-bar__item">-->
+<!-- <top-lock></top-lock>-->
+<!-- </div>-->
+<!-- </el-tooltip>-->
+<!-- <el-tooltip v-if="showTheme"-->
+<!-- effect="dark"-->
+<!-- :content="$t('navbar.theme')"-->
+<!-- placement="bottom">-->
+<!-- <div class="top-bar__item top-bar__item--show">-->
+<!-- <top-theme></top-theme>-->
+<!-- </div>-->
+<!-- </el-tooltip>-->
<el-tooltip effect="dark"
:content="$t('navbar.notice')"
placement="bottom">
@@ -58,22 +58,22 @@
<top-notice></top-notice>
</div>
</el-tooltip>
- <el-tooltip effect="dark"
- :content="$t('navbar.language')"
- placement="bottom">
- <div class="top-bar__item top-bar__item--show">
- <top-lang></top-lang>
- </div>
- </el-tooltip>
- <el-tooltip v-if="showFullScren"
- effect="dark"
- :content="isFullScren?$t('navbar.screenfullF'):$t('navbar.screenfull')"
- placement="bottom">
- <div class="top-bar__item">
- <i :class="isFullScren?'icon-tuichuquanping':'icon-quanping'"
- @click="handleScreen"></i>
- </div>
- </el-tooltip>
+<!-- <el-tooltip effect="dark"-->
+<!-- :content="$t('navbar.language')"-->
+<!-- placement="bottom">-->
+<!-- <div class="top-bar__item top-bar__item--show">-->
+<!-- <top-lang></top-lang>-->
+<!-- </div>-->
+<!-- </el-tooltip>-->
+<!-- <el-tooltip v-if="showFullScren"-->
+<!-- effect="dark"-->
+<!-- :content="isFullScren?$t('navbar.screenfullF'):$t('navbar.screenfull')"-->
+<!-- placement="bottom">-->
+<!-- <div class="top-bar__item">-->
+<!-- <i :class="isFullScren?'icon-tuichuquanping':'icon-quanping'"-->
+<!-- @click="handleScreen"></i>-->
+<!-- </div>-->
+<!-- </el-tooltip>-->
<img class="top-bar__img"
:src="userInfo.avatar">
<el-dropdown>
diff --git a/src/page/index/top/top-notice.vue b/src/page/index/top/top-notice.vue
index 5953924..7344143 100644
--- a/src/page/index/top/top-notice.vue
+++ b/src/page/index/top/top-notice.vue
@@ -3,28 +3,32 @@
width="350"
trigger="click">
- <el-tabs v-model="activeName">
- <el-tab-pane label="邮件(1)"
- name="first"></el-tab-pane>
- <el-tab-pane label="消息(2)"
- name="second"></el-tab-pane>
- <el-tab-pane label="通知"
- name="third"></el-tab-pane>
- </el-tabs>
- <el-scrollbar style="height:300px">
- <avue-notice :data="data"
- :option="option"
- @page-change="pageChange"></avue-notice>
- </el-scrollbar>
+<!-- <el-tabs v-model="activeName">-->
+<!-- <el-tab-pane label="邮件(1)"-->
+<!-- name="first"></el-tab-pane>-->
+<!-- <el-tab-pane label="消息(2)"-->
+<!-- name="second"></el-tab-pane>-->
+<!-- <el-tab-pane label="通知"-->
+<!-- name="third"></el-tab-pane>-->
+<!-- </el-tabs>-->
+
+<!-- <el-scrollbar style="height:300px">-->
+<!-- <avue-notice :data="data"-->
+<!-- :option="option"-->
+<!-- @page-change="pageChange"></avue-notice>-->
+<!-- </el-scrollbar>-->
<div slot="reference">
- <el-badge is-dot>
+ <el-badge :is-dot="totalTodoList !='0' ">
<i class="el-icon-bell"></i>
</el-badge>
</div>
+ <span>您共有<a href="#javascript" style="color: #337ab7" @click="goToTodoList()">{{totalTodoList}}</a>条代办</span>
</el-popover>
</template>
<script>
+import {todoList} from "@/api/work/work";
+
let list = [{
img: '/img/bg/vip1.png',
title: '史蒂夫·乔布斯 关注了你',
@@ -65,10 +69,11 @@
},
},
data: list,
+ totalTodoList:"",
}
},
created () {
-
+ this.getTodoList()
},
methods: {
pageChange (page, done) {
@@ -79,6 +84,17 @@
}, 1000)
},
+ //获取代办消息
+ getTodoList(){
+ todoList().then(res => {
+ console.log(res)
+ const data = res.data.data;
+ this.totalTodoList = data.total
+ });
+ },
+ goToTodoList(){
+ this.$router.push("/work/todo")
+ }
}
};
</script>
diff --git a/src/views/work/start.vue b/src/views/work/start.vue
index f70a4b2..61e91ec 100644
--- a/src/views/work/start.vue
+++ b/src/views/work/start.vue
@@ -186,6 +186,7 @@
this.$refs.crud.toggleSelection();
},
handleStart(row) {
+ console.log(row,"7777")
this.$router.push({path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/form/${row.id}`});
},
handleImage(row) {
--
Gitblit v1.9.3