From ff7e5f562a45f0d4e13fe8336ee8b290643b3ae4 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 20 五月 2024 18:18:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b2-standard.vue | 39 +++++++++++++++++++++++++++++++++++----
src/components/view/b4-daily-business-statistics.vue | 3 ++-
src/components/view/b4-sample-defects.vue | 1 +
src/components/view/b3-classes.vue | 10 +++-------
src/components/view/b4-inspection-item-statistics.vue | 4 ++--
5 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index d80b25e..8249df7 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -400,14 +400,14 @@
<el-table-column type="selection" width="50" >
</el-table-column>
<el-table-column prop="model" label="鍨嬪彿" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip :filter-method="filterHandler" :filters="filters0"></el-table-column>
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140"
- show-overflow-tooltip></el-table-column>
+ show-overflow-tooltip :filter-method="filterHandler" :filters="filters1"></el-table-column>
<el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" width="130" show-overflow-tooltip :filters="filters"
:filter-method="filterHandler"></el-table-column>
<el-table-column prop="ask" label="瑕佹眰鍊�" min-width="200px"></el-table-column>
<el-table-column prop="tell" label="瑕佹眰鎻忚堪" min-width="220px"></el-table-column>
- <el-table-column prop="method" label="璇曢獙鏂规硶" width="200"></el-table-column>
+ <el-table-column prop="methodS" label="璇曢獙鏂规硶" width="200"></el-table-column>
<el-table-column prop="unit" label="璁￠噺鍗曚綅" width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="price" label="鍗曚环(鍏�)" width="120"></el-table-column>
<el-table-column prop="manHour" label="宸ユ椂绯绘暟" width="120"></el-table-column>
@@ -604,7 +604,35 @@
templateId:''
},
methodList:[],
- productTableLoading0:false
+ productTableLoading0:false,
+ filters0:[
+ {
+ text:'娴嬭瘯',
+ value:0,
+ },
+ {
+ text:'娴嬭瘯1',
+ value:1,
+ },
+ {
+ text:'娴嬭瘯2',
+ value:2,
+ }
+ ],
+ filters1:[
+ {
+ text:'娴嬭瘯',
+ value:0,
+ },
+ {
+ text:'娴嬭瘯1',
+ value:1,
+ },
+ {
+ text:'娴嬭瘯2',
+ value:2,
+ }
+ ]
}
},
watch: {
@@ -1102,6 +1130,7 @@
this.addProductDia = false
},
rowClick(row, column, event) {
+ this.currentPage = 1;
this.tableLoad2 = true
this.standardId = row.id
this.$axios.post(this.$api.standardTree.selectStandardProductListByMethodId, {
@@ -1267,6 +1296,7 @@
this.sectionUpDia = false
this.currentPage0 = 1;
this.getList()
+ this.rowClick({id:this.standardId})
})
}
},
@@ -1333,6 +1363,7 @@
this.$message.success('宸蹭繚瀛�')
this.currentPage0 = 1;
this.getList()
+ this.rowClick({id:this.standardId})
// this.moreInfo = {
// ask:'',
// tell:'',
diff --git a/src/components/view/b3-classes.vue b/src/components/view/b3-classes.vue
index 6952c90..bedba01 100644
--- a/src/components/view/b3-classes.vue
+++ b/src/components/view/b3-classes.vue
@@ -83,18 +83,14 @@
v-on:mouseenter="onMouseEnter(index)"
v-on:mouseleave="currentUserIndex=null">
<div class="content-body-item" v-for="(m,i) in item.list" :key="'d'+i" :class="{hoverType:currentUserIndex==index}">
- <div class="work-box" :class="{type0:m.shift==='0',type1:m.shift==='1',type2:m.shift==='2',type3:m.shift==='3',type4:m.shift==='4',type5:m.shift==='5',type6:m.shift==='6'}">
- <!-- <div class="work-box-left">
- <span>{{ getShiftByDic(m.shift) }}</span>
- </div> -->
- <el-dropdown trigger="click" placement="bottom" @command="e=>handleCommand(e,m)" :disabled="!upPower">
- <!-- <i class="el-icon-arrow-down el-icon--right" style="font-size: 20px;color: #fff;cursor: pointer;"></i> -->
+ <el-dropdown trigger="click" placement="bottom" @command="e=>handleCommand(e,m)" :disabled="!upPower">
+ <div class="work-box" :class="{type0:m.shift==='0',type1:m.shift==='1',type2:m.shift==='2',type3:m.shift==='3',type4:m.shift==='4',type5:m.shift==='5',type6:m.shift==='6'}">
<span style="cursor: pointer;" :style="`opacity: ${getShiftByDic(m.shift)=='鏃�'?0:1};`">{{ getShiftByDic(m.shift) }}</span>
+ </div>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(n,j) in classType" :key="'h'+j" :command="n.value">{{ n.label }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
- </div>
</div>
</div>
</div>
diff --git a/src/components/view/b4-daily-business-statistics.vue b/src/components/view/b4-daily-business-statistics.vue
index 5ecb7e5..e0bc0d3 100644
--- a/src/components/view/b4-daily-business-statistics.vue
+++ b/src/components/view/b4-daily-business-statistics.vue
@@ -151,8 +151,9 @@
}
},
mounted(){
+ this.init()
this.timers&&clearInterval(this.timers);
- setInterval(this.init,1000*60*5)
+ setInterval(this.init(),1000*60*5)
},
methods:{
init(){
diff --git a/src/components/view/b4-inspection-item-statistics.vue b/src/components/view/b4-inspection-item-statistics.vue
index 293245b..bc0a983 100644
--- a/src/components/view/b4-inspection-item-statistics.vue
+++ b/src/components/view/b4-inspection-item-statistics.vue
@@ -190,9 +190,9 @@
}
},
mounted(){
- // this.init()
+ this.init()
this.timers&&clearInterval(this.timers);
- setInterval(this.init,1000*60*5)
+ setInterval(this.init(),1000*60*5)
},
methods:{
init(){
diff --git a/src/components/view/b4-sample-defects.vue b/src/components/view/b4-sample-defects.vue
index 5637b5c..ea09b32 100644
--- a/src/components/view/b4-sample-defects.vue
+++ b/src/components/view/b4-sample-defects.vue
@@ -73,6 +73,7 @@
<el-table
:data="tableData"
style="width: 100%;margin-bottom: 10px;height: calc(100% - 40px);"
+ height="calc(100% - 40px)"
row-key="id"
v-loading="loading"
border
--
Gitblit v1.9.3