From 7319ab1ce998a7d13f0192a4ccaf92d4a02929f8 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 11 十二月 2024 14:33:43 +0800
Subject: [PATCH] 电路试验上传文件报错
---
src/components/view/index-index.vue | 147 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 116 insertions(+), 31 deletions(-)
diff --git a/src/components/view/index-index.vue b/src/components/view/index-index.vue
index 9c462d6..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;
@@ -241,7 +242,34 @@
text-align: left;
margin-bottom: 10px;
}
-
+ >>>.el-calendar-day span{
+ display: inline-block;
+ width: 30px;
+ height: 30px;
+ line-height: 30px;
+ text-align: center;
+ border-radius: 4px;
+ }
+ >>>.is-selected{
+ background: transparent !important;
+ }
+ >>>.is-selected .el-calendar-day{
+ background: transparent !important;
+ }
+ >>>.is-selected .el-calendar-day span{
+ background: #3A7BFA !important;
+ color: #fff !important;
+ }
+ >>>.el-calendar-day:hover{
+ background: transparent;
+ }
+ >>>.el-calendar-day span:hover{
+ background: #3A7BFA !important;
+ color: #fff !important;
+ }
+ >>>.el-tag--dark{
+ border: 0;
+ }
</style>
<template>
@@ -261,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>
@@ -280,8 +319,8 @@
<img src="../../../static/img/index-0.svg" alt="">
</div>
<div class="mun">
- <p style="font-size: 20px;">254</p>
- <p style="font-size: 14px;margin-bottom: 10px;">鎴戠殑浠ｅ姙</p>
+ <p style="font-size: 20px;">{{getNumberFourTypes.totalNumberOfMessages}}</p>
+ <p style="font-size: 14px;margin-bottom: 10px;">鎴戠殑寰呭姙</p>
</div>
</div>
<div class="right-1-item">
@@ -289,7 +328,7 @@
<img src="../../../static/img/index-1.svg" alt="">
</div>
<div class="mun">
- <p style="font-size: 20px;">254</p>
+ <p style="font-size: 20px;">{{ getNumberFourTypes.totalNumberOfReadMessages }}</p>
<p style="font-size: 14px;margin-bottom: 10px;">宸插姙浜嬪疁</p>
</div>
</div>
@@ -298,7 +337,7 @@
<img src="../../../static/img/index-2.svg" alt="">
</div>
<div class="mun">
- <p style="font-size: 20px;">254</p>
+ <p style="font-size: 20px;">{{ getNumberFourTypes.remainingToDo }}</p>
<p style="font-size: 14px;margin-bottom: 10px;">鍓╀綑寰呭姙</p>
</div>
</div>
@@ -307,7 +346,7 @@
<img src="../../../static/img/index-3.svg" alt="">
</div>
<div class="mun">
- <p style="font-size: 20px;">254</p>
+ <p style="font-size: 20px;">{{ getNumberFourTypes.totalNumberOfMessagesInThePastSevenDays }}</p>
<p style="font-size: 14px;margin-bottom: 10px;">杩戞湡浜嬪疁</p>
</div>
</div>
@@ -332,8 +371,8 @@
<span>
{{ data.day.split('-').slice(2)+'' }}
</span>
- <el-badge v-if="data.isSelected" is-dot class="item">
- </el-badge>
+ <!-- <el-badge v-if="data.isSelected" is-dot class="item">
+ </el-badge> -->
</template>
</el-calendar>
</div>
@@ -344,7 +383,7 @@
<p class="ellipsis-multiline" >{{ m.text }}</p>
</el-tooltip>
</div>
- <span style="color:rgb(153, 153, 153);font-size: 12px;text-align: center;margin: 120px 0;display: inline-block;width: 100%;" v-if="listScheduleByMe.length==0">鏆傛棤</span>
+ <span style="color:rgb(144, 147, 153);font-size: 14px;text-align: center;margin: 120px 0;display: inline-block;width: 100%;" v-if="listScheduleByMe.length==0">鏆傛棤鏁版嵁</span>
</div>
</div>
</div>
@@ -354,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">
+ <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="">
@@ -378,7 +417,7 @@
<div class="body" style="max-height: 60vh;">
<el-row>
<el-col class="search_thing" :span="22">
- <div class="search_label">鏃堕棿锛�</div>
+ <div class="search_label"><span style="color: red;margin-right: 4px;">*</span>鏃堕棿锛�</div>
<div class="search_input">
<el-date-picker
v-model="query.time"
@@ -390,9 +429,10 @@
</div>
</el-col>
<el-col class="search_thing" :span="22">
- <div class="search_label">鍐呭锛�</div>
+ <div class="search_label"><span style="color: red;margin-right: 4px;">*</span>鍐呭锛�</div>
<div class="search_input">
- <el-input v-model="query.text" size="small" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+ <el-input v-model="query.text" type="textarea"
+ :rows="2" size="small" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
</div>
</el-col>
</el-row>
@@ -439,7 +479,10 @@
pageSize: 8, // 涓�椤�7鏉�
total: null,
listLoading: true, // 缁勪欢loading鐨勫睍绀�,榛樿涓簍rue
- finishLoding: false // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
+ finishLoding: false, // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
+ timer:null,
+ keyMap:{},
+ getNumberFourTypes: {},
}
},
watch:{
@@ -447,6 +490,7 @@
this.getScheduleByMe()
},
currentIndex(){
+ this.keyMap = {}
this.currentPage = 1;
this.list = [];
this.getList();
@@ -458,15 +502,39 @@
setInterval(() => {
this.nowTime()
}, 1000)
- this.init();
this.weekdays = this.getWeekdaysForNextWeek()
- this.getScheduleByMe()
+ this.init();
this.currentPage = 1;
+ this.keyMap = {}
this.list = [];
this.getList();
+ this.getScheduleByMe()
+ this.timer&&clearInterval(this.timer)
+ this.timer = setInterval(() => {
+ this.init();
+ this.currentPage = 1;
+ this.keyMap = {}
+ this.list = [];
+ this.getList();
+ this.getScheduleByMe()
+ },1000*60*10)
+ this.getNumberFourTypesFun()
},
methods: {
+ getNumberFourTypesFun() {
+ this.$axios.get(this.$api.informationNotification.getNumberFourTypesMessagesHomePage).then(res => {
+ this.getNumberFourTypes = res.data
+ })
+ },
getList(){
+ const key = `_${this.currentPage}`
+ const value = this.keyMap[key]
+ // 濡傛灉value瀛樺湪锛岃〃绀虹紦瀛樻湁鍊硷紝閭ｄ箞闃绘璇锋眰
+ if(value) {
+ return
+ }
+ // value涓嶅瓨鍦紝琛ㄧず绗竴娆¤姹�,璁剧疆鍗犱綅
+ this.keyMap[key] = 'temp'
if(this.currentPage==1){
this.listLoading = true
}
@@ -623,10 +691,11 @@
let weekdays = [];
for (let i = 0; i < 7; i++) {
let date = new Date();
- date.setDate(date.getDate() + i); // 浠婂ぉ涔嬪悗鐨勬棩瀛�
+ date.setDate(date.getDate() - i); // 浠婂ぉ涔嬪悗鐨勬棩瀛�
let day = date.getDay(); // 0-6 浠ｈ〃鏄熸湡鏃ュ埌鏄熸湡鍏�
weekdays.push(day);
}
+ weekdays.reverse()
weekdays = weekdays.map(m=>{
let day =''
switch (m) {
@@ -678,18 +747,34 @@
})
},
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)
+ }
}
</script>
--
Gitblit v1.9.3