From 725e7438b1bb155ab3b1210c2a73a46d0689d6cc Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 10 五月 2024 09:53:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-sample/detail.vue | 12
src/components/view/b1-report-preparation.vue | 1
src/components/view/b1-inspect-order-plan.vue | 2
src/components/view/b1-sample.vue | 534 +++-------------------------------------
static/js/menu.js | 9
src/components/view/b3-classes.vue | 48 ++
src/components/view/b1-unpass.vue | 127 +++++++++
src/assets/api/controller.js | 4
8 files changed, 231 insertions(+), 506 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 2e611f1..068184a 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -23,6 +23,7 @@
sealScope,
informationNotification,
performanceShift,
+ unPass,
}
}
@@ -263,3 +264,6 @@
update:"/performanceShift/update/",//缁╂晥绠＄悊-鐝-鐝鐘舵�佷慨鏀�
}
+const unPass = {
+ pageInsUnPass:"/unPass/pageInsUnPass", // 鏌ヨ涓嶅悎鏍兼牱鍝佹暟鎹�
+}
diff --git a/src/components/do/b1-sample/detail.vue b/src/components/do/b1-sample/detail.vue
index 5a07876..cd913d4 100644
--- a/src/components/do/b1-sample/detail.vue
+++ b/src/components/do/b1-sample/detail.vue
@@ -69,7 +69,11 @@
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」鍒嗙被" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="laboratory" label="瀹為獙瀹�" min-min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="unit" label="鍗曚綅" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="equipValue" label="璁惧" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="equipName" label="璁惧" min-width="100" show-overflow-tooltip>
+ <template slot-scope="scope">
+ {{handleData(scope.row.equipName)}}
+ </template>
+ </el-table-column>
<el-table-column prop="entrustCode" label="濮旀墭缂栧彿" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="updateUserName" label="妫�楠屼汉" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="updateTime" label="妫�楠屾椂闂�" min-width="100" show-overflow-tooltip></el-table-column>
@@ -129,6 +133,12 @@
this.histories = histories;
this.products = products;
})
+ },
+ handleData(e){
+ let info = JSON.parse(e).map(item => {
+ return item.v;
+ }).join(',')
+ return info
}
}
}
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index eb1ea21..56ea018 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -189,7 +189,7 @@
<script>
import ValueTable from '../tool/value-table.vue'
- import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
+ import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
import {
getYearAndMonthAndDays
} from '../../util/date'
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index 5ffc79a..3a85cb3 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -356,7 +356,6 @@
.replace(/ /g, " ");
this.claimVisible = true;
}
-
}).catch(error => {
console.error(error)
})
diff --git a/src/components/view/b1-sample.vue b/src/components/view/b1-sample.vue
index c5feab2..4e4bf7e 100644
--- a/src/components/view/b1-sample.vue
+++ b/src/components/view/b1-sample.vue
@@ -156,6 +156,9 @@
.custom-tree-node:hover .el-button {
opacity: 1;
}
+ >>>.el-loading-mask {
+ z-index: 10;
+ }
</style>
<template>
@@ -209,7 +212,7 @@
</div>
</div>
<div class="table" v-loading="tableLoading">
- <table border="1" class="tables" cellpadding="10" style="table-layout:fixed;">
+ <table border="1" class="tables" cellpadding="10" style="table-layout:fixed;" v-if="tableList.length>0">
<tbody>
<tr v-for="(item,index) in tableList" :key="index">
<td v-for="(m,i) in item" :key="i" class="content">
@@ -239,14 +242,15 @@
</tr>
</tbody>
</table>
+ <span v-else style="color: rgb(144, 147, 153);display: inline-block;position: absolute;top: 60%;left: 50%;transform: translate(-50%,-50%);">鏆傛棤鏁版嵁</span>
</div>
</div>
<Detail v-else @hanldeBack="isDetail=false" :id="currentId" />
<el-dialog title="鏍峰搧鍏ュ簱" :visible.sync="storageVisible" width="350px">
- <div class="shaoma">
+ <!-- <div class="shaoma">
<img src="../../../static/img/鎵爜.svg" alt="" style="margin-right: 5px;">
<span>鎵爜鍏ュ簱</span>
- </div>
+ </div> -->
<el-row>
<el-col class="search_thing" :span="24">
<div class="search_label"><span class="required-span">* </span>鏍峰搧缂栧彿锛�</div>
@@ -275,10 +279,10 @@
</span>
</el-dialog>
<el-dialog title="鏍峰搧鍑哄簱" :visible.sync="exportVisible" width="350px">
- <div class="shaoma">
+ <!-- <div class="shaoma">
<img src="../../../static/img/鎵爜.svg" alt="" style="margin-right: 5px;">
<span>鎵爜鍑哄簱</span>
- </div>
+ </div> -->
<el-row>
<el-col class="search_thing" :span="24">
<div class="search_label"><span class="required-span">* </span>鏍峰搧缂栧彿锛�</div>
@@ -315,7 +319,7 @@
</el-tree>
<span slot="footer" class="dialog-footer">
<el-button @click="keepVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="confirmKeep" :loading="upLoadKeep">纭� 瀹�</el-button>
+ <el-button type="primary" @click="keepVisible = false" >纭� 瀹�</el-button>
</span>
</el-dialog>
<el-dialog :title="isEdit?'浠撳簱淇敼':'浠撳簱鏂板'" :visible.sync="warehouseVisible" width="350px">
@@ -387,463 +391,9 @@
shelvesVisible: false,
upLoadStorage: false,
upLoadExport: false,
- upLoadKeep: false,
upLoadWarehouse: false,
upLoadShelves: false,
- tableList: [
- [{
- title: '1-1-4',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-2-4',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-3-4',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-4-4',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-5-4',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-6-4',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-7-4',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- ],
- [{
- title: '1-1-3',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-2-3',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-3-3',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-4-3',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-5-3',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-6-3',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-7-3',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- ],
- [{
- title: '1-1-2',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-2-2',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-3-2',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-4-2',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-5-2',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-6-2',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-7-2',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- ],
- [{
- title: '1-1-1',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-2-1',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-3-1',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-4-1',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-5-1',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-6-1',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-7-1',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- ]
- ],
+ tableList: [],
rowList: [],
value: '',
name:'',
@@ -866,6 +416,11 @@
selectList() {
this.$axios.get(this.$api.warehouse.selectWarehouse).then(res => {
this.warehouse = res.data
+ if(res.data.length==0){
+ this.entity.warehouseId = '';
+ this.entity.shelfId = '';
+ this.tableList = []
+ }
this.storageList = this.HaveJson(res.data).map(item=>{
item.warehouseShelfList&&item.warehouseShelfList.length>0&&item.warehouseShelfList.map(m=>{
let warehouseShelfList = [];
@@ -894,12 +449,16 @@
if(this.shelf.length>0){
this.entity.shelfId = this.shelf[0].id
this.handleShelf(this.entity.shelfId)
+ }else{
+ this.tableList = []
}
}else if(this.warehouse.length>0){
this.warehouseChange(this.entity.warehouseId)
if(this.shelf.length>0){
this.entity.shelfId = this.shelf[0].id
this.handleShelf(this.entity.shelfId)
+ }else{
+ this.tableList = []
}
}
})
@@ -961,10 +520,6 @@
this.$message.success('鍑哄簱鎴愬姛')
this.handleShelf(this.entity.shelfId)
})
- },
- // 缁存姢
- confirmKeep() {
- this.upLoadKeep = true;
},
// 娣诲姞/淇敼浠撳簱
confirmWarehouse() {
@@ -1145,6 +700,7 @@
this.isDetail = true;
},
warehouseChange(val) {
+ this.tableList = []
let map = this.warehouse.find(a => {
return a.id === val ? a : null
})
@@ -1152,33 +708,37 @@
this.entity.shelfId = '';
},
handleShelf(e){
- this.tableLoading = true;
- this.$axios.get(this.$api.warehouse.getWarehouse+'?shelfId='+e).then(res => {
- let data = res.data;
- let set =new Set()
- this.tableList = [];
- let arr = []
- data.forEach(m=>{
- set.add(m.col)
- if(arr.length>0){
- if(arr.find(n=>n.row==m.row)){
- arr.push(m)
+ if(e){
+ this.tableLoading = true;
+ this.$axios.get(this.$api.warehouse.getWarehouse+'?shelfId='+e).then(res => {
+ this.tableLoading = false;
+ let data = res.data;
+ let set =new Set()
+ this.tableList = [];
+ let arr = []
+ data.forEach(m=>{
+ set.add(m.col)
+ if(arr.length>0){
+ if(arr.find(n=>n.row==m.row)){
+ arr.push(m)
+ }else{
+ this.tableList.push(arr)
+ arr = []
+ arr.push(m)
+ }
}else{
- this.tableList.push(arr)
- arr = []
arr.push(m)
}
- }else{
- arr.push(m)
+ })
+ this.tableList.push(arr)
+ this.rowList = [];
+ for(let i=0;i<set.size;i++){
+ this.rowList.push(`${i+1} 鍒梎)
}
+ }).catch(e=>{
+ this.tableLoading = false;
})
- this.tableList.push(arr)
- this.rowList = [];
- for(let i=0;i<set.size;i++){
- this.rowList.push(`${i+1} 鍒梎)
- }
- this.tableLoading = false;
- })
+ }
},
handleSearch(){
if(!this.searchSampleCode){
diff --git a/src/components/view/b1-unpass.vue b/src/components/view/b1-unpass.vue
new file mode 100644
index 0000000..dd63b44
--- /dev/null
+++ b/src/components/view/b1-unpass.vue
@@ -0,0 +1,127 @@
+<style scoped>
+ .title {
+ height: 60px;
+ line-height: 60px;
+ }
+
+ .search {
+ background-color: #fff;
+ height: 80px;
+ display: flex;
+ align-items: center;
+ }
+ .search_thing {
+ display: flex;
+ align-items: center;
+ height: 50px;
+ }
+ .search_label {
+ width: 120px;
+ font-size: 14px;
+ text-align: right;
+ }
+
+ .search_input {
+ width: calc(100% - 120px);
+ }
+ .table {
+ margin-top: 10px;
+ background-color: #fff;
+ width: calc(100% - 40px);
+ height: calc(100% - 60px - 80px - 10px - 40px);
+ padding: 20px;
+ }
+
+</style>
+<template>
+ <div class="below-standard-main">
+ <div style="width: 100%;height: 100%;">
+ <div>
+ <el-row class="title">
+ <el-col :span="12" style="padding-left: 20px;">涓嶅悎鏍肩鐞�</el-col>
+ </el-row>
+ </div>
+ <div class="search">
+ <div class="search_thing">
+ <div class="search_label">瑙勬牸鍨嬪彿锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.model" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">鏍峰搧鍚嶇О锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.sample"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </div>
+ </div>
+ <div class="search_thing" style="padding-left: 30px;">
+ <el-button size="small" @click="refresh()">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
+ </div>
+ </div>
+ <div class="table">
+ <ValueTable ref="ValueTable" :url="$api.unPass.pageInsUnPass" :componentData="componentData"
+ :key="upIndex" />
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+ import ValueTable from '../tool/value-table.vue'
+ import Word from '../tool/word.vue'
+ import file from '../../util/file';
+ import {
+ convertToHtml
+ } from 'mammoth';
+export default {
+ components: {
+ ValueTable,
+ Word,
+ },
+ data() {
+ return {
+ componentData: {
+ entity: {
+ sample: null,
+ model: null,
+ },
+ isIndex: true,
+ showSelect: false,
+ select: false,
+ do: [
+ ],
+ linkEvent: {
+ // code: {
+ // method: 'selectAllByOne'
+ // }
+ },
+
+ },
+ entityCopy: {},
+ upIndex: 0,
+ statusList: [],
+
+ }
+ },
+ mounted() {
+ this.entityCopy = this.HaveJson(this.componentData.entity)
+ this.getPower()
+ },
+ methods :{
+ refreshTable() {
+ this.$refs['ValueTable'].selectList()
+ },
+ refresh() {
+ this.componentData.entity = this.HaveJson(this.entityCopy)
+ this.upIndex++
+ },
+ // 鏉冮檺鍒嗛厤
+ getPower(radio) {
+ let power = JSON.parse(sessionStorage.getItem('power'))
+ },
+ }
+}
+</script>
+
diff --git a/src/components/view/b3-classes.vue b/src/components/view/b3-classes.vue
index 3a2d9af..c931dfe 100644
--- a/src/components/view/b3-classes.vue
+++ b/src/components/view/b3-classes.vue
@@ -47,7 +47,7 @@
</div>
<div class="center" v-loading="pageLoading">
<scroll-pagination @load="init" :finishLoding="finishLoding">
- <div>
+ <div class="clearfix">
<div class="fixed-left">
<div class="content-title" style="padding-left: 16px;box-sizing: border-box;">
浜哄憳鍚嶇О
@@ -57,7 +57,7 @@
<div class="user-pic">{{ item.name.charAt(0) }}</div>
<div class="user-info">
<p style="font-size: 14px;color: #3A7BFA;line-height: 24px;">{{ item.name }}</p>
- <p style="color: #999999;font-size: 12px;transform: scale(0.8) translateX(-20px);white-space: nowrap;width: 150px;overflow-x: show;">鏃�: {{ item.day0 }}锛屼腑: {{ item.day1 }}锛屽: {{ item.day2 }}锛屼紤: {{ item.day3 }}锛屽亣: {{ item.day4 }}</p>
+ <p style="color: #999999;font-size: 12px;transform: scale(0.8) translateX(-20px);white-space: nowrap;width: 150px;overflow-x: show;">鏃�: {{ item.day0 }}, 涓�: {{ item.day1 }}, 澶�: {{ item.day2 }}, 浼�: {{ item.day3 }}, 鍋�: {{ item.day4 }}</p>
<p style="margin-top: 4px;"><span style="color: #999999;font-size: 12px;display: inline-block;transform: scale(0.8) translateX(-10px);">鍚堣鍑哄嫟: </span><span style="font-size: 16px;
color: #FF4902;">{{ item.totalAttendance }}澶�</span></p>
</div>
@@ -73,9 +73,9 @@
</div>
</div>
<div class="content-body" v-for="(item,index) in list" :key="'c'+index"
- :class="{hoverType:currentUserIndex==index}"v-on:mouseenter="onMouseEnter(index)"
+ 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">
+ <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',}">
<div class="work-box-left">
<span>{{ getShiftByDic(m.shift) }}</span>
@@ -568,19 +568,27 @@
width: 100%;
height: calc(100% - 40px );
background-color: #fff;
- position: relative;
overflow-y: auto;
+ display: flex;
+}
+>>>.scroll-pagination{
+ overflow-y: scroll;
+ scrollbar-width: none; /* 瀵逛簬 Firefox 鍜� IE 鐨勫吋瀹瑰啓娉� */
+}
+>>>.scroll-pagination::-webkit-scrollbar {
+ display: none; /* 瀵逛簬 Chrome, Safari 鍜� Opera 鐨勫啓娉� */
}
.fixed-left {
- position: absolute;
- left: 0;
- top: 0;
+ float: left;
width: 220px; /* 宸﹁竟鍖哄煙瀹藉害 */
- /* min-height: calc(100% - 10px); 瑙嗗彛楂樺害 */
background-color: #fff;
box-shadow: 2px -2px 5px rgba(51,51,51,0.12); /* 宸﹁竟闃村奖 */
}
-
+.clearfix::after {
+ content: "";
+ display: table;
+ clear: both;
+}
.scroll-right {
width: calc(100% - 220px); /* 鍑忓幓宸﹁竟鍖哄煙瀹藉害 */
min-height: calc(100% - 10px); /* 瑙嗗彛楂樺害 */
@@ -590,7 +598,6 @@
.content {
min-height: calc(100% - 10px); /* 瑙嗗彛楂樺害 */
- /* min-width: 2000px; */
}
.content-title{
height: 52px;
@@ -598,7 +605,6 @@
border-bottom: 1px solid #EEEEEE;
}
.content-title-right{
- /* min-width: 2000px; */
display: flex;
align-items: center;
}
@@ -676,6 +682,24 @@
background: #FDE2E2;
color: #F56C6C;
}
+.el-icon-arrow-down::before{
+ color: #c6c4c4;
+}
+.type0 .el-icon-arrow-down::before{
+ color: #fff;
+}
+.type1 .el-icon-arrow-down::before{
+ color: #fff;
+}
+.type2 .el-icon-arrow-down::before{
+ color: #fff;
+}
+.type3 .el-icon-arrow-down::before{
+ color: #fff;
+}
+.type4 .el-icon-arrow-down::before{
+ color: #fff;
+}
.work-box-left{
display: flex;
justify-content: center;
diff --git a/static/js/menu.js b/static/js/menu.js
index 98b2997..65f08ed 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -13,7 +13,7 @@
{
v: "涓氬姟绠＄悊",
i: "font icon-kexueyanjiuheshiyankaifa",
- p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport",
+ p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport pageInsUnPass",
c: [{
v: "妫�楠屼笅鍗�",
i: "font icon-erjidaohang",
@@ -39,12 +39,13 @@
i: "font icon-erjidaohang",
u: "b1-sample",
p: "selectWarehouse"
- }, {
+ },{
v: "涓嶅悎鏍肩鐞�",
i: "font icon-erjidaohang",
- u: "",
+ u: "b1-unpass",
p: ""
- }]
+ }
+ ]
},
{
v: "鏍囧噯闆�",
--
Gitblit v1.9.3