From 25d10ee678644a6283454ca486d74a938eeccfd1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 05 十二月 2024 16:50:45 +0800
Subject: [PATCH] Merge branch 'cnas' into master
---
src/components/view/index-index.vue | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/src/components/view/index-index.vue b/src/components/view/index-index.vue
index 288e95b..f6fc701 100644
--- a/src/components/view/index-index.vue
+++ b/src/components/view/index-index.vue
@@ -212,6 +212,7 @@
border-radius: 16px;
overflow: hidden;
margin-bottom: 8px;
+ cursor: pointer;
}
.body-item.color0{
background: #70A090;
@@ -266,6 +267,9 @@
background: #3A7BFA !important;
color: #fff !important;
}
+ >>>.el-tag--dark{
+ border: 0;
+ }
</style>
<template>
@@ -285,12 +289,23 @@
<div class="left-item-title">
<span style="font-size: 18px;">{{ item }}</span>
<span style="font-size: 14px;color: #999999;">{{ weekdays[index] }}</span>
+ <el-tag style="margin-top: 6px;" size="small">{{workList[index].length}} 鏉�</el-tag>
</div>
<div class="left-item-body">
- <div class="body-item" v-for="(m,i) in workList[index]" :key="i" :class="{color0:m.type==0,color1:m.type==1,color2:m.type==2}">
+ <div class="body-item" v-for="(m,i) in workList[index]" :key="i" :class="{color0:m.type==0,color1:m.type==1,color2:m.type==2}" @click="goAddList(m)">
<div>
- <span style="font-size: 12px;margin-bottom: 17px;">{{ m.text }}</span>
- <span style="display: inline-block;height: 24px;width: 24px;border-radius: 50%;line-height: 24px;text-align: center;background: #C0C4CC;color: #fff;">{{ m.name.charAt(0) }}</span>
+ <span style="font-size: 12px;margin-bottom: 8px;">{{ m.text }}</span>
+ <div class="tags" style="display: flex;align-items: end;flex-wrap: wrap;margin-bottom: 8px;">
+ <el-tooltip class="item" effect="dark" :content="item" placement="top" v-for="(item,index) in m.sample?m.sample.split(','):[]"
+ :key="index">
+ <el-tag
+ :color="m.type==0?'#70A090':(m.type==1?'#EBD476':'#FF3838')"
+ effect="dark" size="mini" style="margin: 2px;" class="single-line-ellipsis">
+ {{ item }}
+ </el-tag>
+ </el-tooltip>
+ </div>
+ <span style="display: inline-block;height: 22px;width: 70px;border-radius: 10px;line-height: 22px;text-align: center;background: #C0C4CC;color: #fff;font-size: 14px;">{{ m.name }}</span>
</div>
</div>
</div>
@@ -378,7 +393,7 @@
<div class="tab-item" style="cursor: pointer;" :class="{active:currentIndex==5}" @click="currentIndex=5">閫氱煡閫氬憡</div>
</div>
<div class="right-3-list" v-loading="listLoading">
- <scroll-pagination @load="getList" :finishLoding="finishLoding" :list="list" v-if="list.length>1||listLoading">
+ <scroll-pagination @load="getList" :finishLoding="finishLoding" :list="list" v-if="list.length>0||listLoading">
<div class="list3-item" v-for="(m,i) in list" :key="i">
<div class="list3-item-title">
<img src="../../../static/img/index-tip.svg" alt="">
@@ -732,18 +747,31 @@
})
},
goNoticeDetail(row){
- this.$axios.put(this.$api.informationNotification.triggerModificationStatusToRead+'/'+row.id).then(res => {
- row.num = Math.random(100);
+ this.$axios.put(this.$api.informationNotification.triggerModificationStatusToRead+'/'+row.id).then(res => {
+ row.num = Math.random(100);
+ this.$bus.$emit("change", JSON.stringify(row));
+ this.$parent.addTab({
+ v: "娑堟伅璇︽儏",
+ i: "el-icon-s-tools",
+ u: "notice-detail",
+ k:35,
+ p: "abcd"
+ },29);
+ })
+ },
+ goAddList(row){
this.$bus.$emit("change", JSON.stringify(row));
- this.$parent.addTab({
- v: "娑堟伅璇︽儏",
- i: "el-icon-s-tools",
- u: "notice-detail",
- k:35,
- p: "abcd"
- },29);
- })
- },
+ this.$parent.addTab({
+ v: "妫�楠屼笅鍗�",
+ i: "font icon-erjidaohang",
+ u: "b1-inspection-order",
+ k:3,
+ p: "selectInsOrderParameter",
+ param:{
+ text:row.text
+ }
+ },1);
+ }
},
deactivated(){
this.timer&&clearInterval(this.timer)
--
Gitblit v1.9.3