From 458f6714f335938fce80690c037ffca0ccfaa50c Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 03 八月 2022 16:31:52 +0800
Subject: [PATCH] 1.综合看板渲染数据，完成一个版本
---
src/views/sbgl/sbqd.vue | 227 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 159 insertions(+), 68 deletions(-)
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 5532429..c1cff22 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -17,7 +17,13 @@
<el-input v-model="form.DeviceName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浣跨敤鐘舵��" style=" display: flex;">
- <el-select v-model="form.Status" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.Status"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in StatusArr"
:key="item.value"
@@ -27,7 +33,14 @@
</el-select>
</el-form-item>
<el-form-item label="鎵�灞炶溅闂�" style=" display: flex;">
- <el-select v-model="form.WorkShop" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.WorkShop"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <!-- @focus="getWorkShopSelect"-->
<el-option
v-for="item in WorkShopArr"
:key="item.code"
@@ -37,7 +50,16 @@
</el-select>
</el-form-item>
<el-form-item filterable label="璁惧绫诲瀷" style="display: flex;">
- <el-select v-model="form.DeviceType" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨" @change="deviceTypeChange">
+ <el-select
+ v-model="form.DeviceType"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ filterable
+ placeholder="璇烽�夋嫨"
+
+ @change="deviceTypeChange"
+ >
+ <!-- @focus="getDeviceTypeSelect"-->
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -49,6 +71,7 @@
<el-form-item label="璁惧缁�" style=" display: flex;">
<el-select
v-model="form.DeviceGroup"
+ filterable
:popper-append-to-body="false"
:disabled="form.DeviceType===''"
style="width: 200px"
@@ -74,14 +97,14 @@
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
<el-button type="primary" icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
<el-table
:data="tableData"
border
- :height="tableHeight"
+ :height="tableHeight+'px'"
stripe
highlight-current-row
:style="{width: 100+'%',height:(tableHeight-50)+'px'}"
@@ -97,25 +120,30 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="code"
label="璁惧缂栫爜"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="name"
label="璁惧鍚嶇О"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="eqptype_name"
label="璁惧绫诲瀷"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="eqpgroup_name"
label="璁惧缁�"
+ min-width="110"
sortable="custom"
/>
<el-table-column
@@ -143,12 +171,13 @@
prop="wksp_name"
label="鐢熶骇杞﹂棿"
sortable="custom"
+ min-width="120"
/>
- <el-table-column
- prop="Line_name"
- label="鎵�灞炰骇绾�"
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="Line_name"-->
+ <!-- label="鎵�灞炰骇绾�"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
prop="operation_ration"
label="绋煎姩鐜�"
@@ -167,16 +196,18 @@
/>
<el-table-column
prop="lm_date"
+ width="160"
label="鍒涘缓鏃堕棿"
sortable="custom"
/>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
width="100"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+ <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
<el-button type="text" @click="del(row)">鍒犻櫎</el-button>
</div>
</template>
@@ -198,22 +229,29 @@
<!--璁惧娓呭崟鏂板缂栬緫-->
<el-dialog
:close-on-click-modal="false"
- :title="operation==='add'?'鏂板':'淇敼'"
+ :title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="50%"
+ width="800px"
top="15vh"
@closed="handleClose"
@close="handleClose"
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
<el-form-item label="璁惧缂栫爜" prop="devicecode">
- <el-input v-model="dialogForm.devicecode" :disabled="operation!=='add'" style="width: 220px" />
+ <el-input v-model="dialogForm.devicecode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
<el-form-item label="璁惧鍚嶇О" prop="devicename">
- <el-input v-model="dialogForm.devicename" style="width: 220px" />
+ <el-input v-model="dialogForm.devicename" style="width: 200px" />
</el-form-item>
<el-form-item label="璁惧绫诲瀷" prop="devicetypecode">
- <el-select v-model="dialogForm.devicetypecode" :popper-append-to-body="false" style="width: 220px" placeholder="璇烽�夋嫨" @change="devicetypecodeChange">
+ <el-select
+ v-model="dialogForm.devicetypecode"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ @change="devicetypecodeChange"
+ >
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -223,7 +261,14 @@
</el-select>
</el-form-item>
<el-form-item label="璁惧缁�" prop="devicegroupcode">
- <el-select v-model="dialogForm.devicegroupcode" :popper-append-to-body="false" :disabled="dialogForm.devicetypecode===''" style="width: 220px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="dialogForm.devicegroupcode"
+ :popper-append-to-body="false"
+ :disabled="dialogForm.devicetypecode===''"
+ style="width: 200px"
+ filterable
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in DeviceGroupDialogArr"
:key="item.code"
@@ -235,14 +280,23 @@
<el-form-item label="鎶曞叆鏃ユ湡" prop="importdate">
<el-date-picker
v-model="dialogForm.importdate"
- style="width: 220px"
+ style="width: 200px"
type="date"
placeholder="閫夋嫨鏃ユ湡"
popper-class="dateStyle"
/>
</el-form-item>
<el-form-item label="鎵�灞炶溅闂�" prop="workshopcode">
- <el-select v-model="dialogForm.workshopcode" :popper-append-to-body="false" style="width: 220px" placeholder="璇烽�夋嫨" @change="workshopcodeChange">
+ <el-select
+ v-model="dialogForm.workshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @change="workshopcodeChange"
+ >
+ <!-- @focus="getWorkShopSelect"-->
+
<el-option
v-for="item in WorkShopArr"
:key="item.code"
@@ -251,18 +305,31 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鎵�灞炰骇绾�" prop="linecode">
- <el-select v-model="dialogForm.linecode" :popper-append-to-body="false" :disabled="dialogForm.workshopcode===''" style="width: 220px" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in WorkLineArr"
- :key="item.linecode"
- :label="item.linename"
- :value="item.linecode"
- />
- </el-select>
- </el-form-item>
+ <!-- <el-form-item label="鎵�灞炰骇绾�" prop="linecode">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.linecode"-->
+ <!-- filterable-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- :disabled="dialogForm.workshopcode===''"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in WorkLineArr"-->
+ <!-- :key="item.linecode"-->
+ <!-- :label="item.linename"-->
+ <!-- :value="item.linecode"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
<el-form-item label="浣跨敤鐘舵��" prop="status">
- <el-select v-model="dialogForm.status" :popper-append-to-body="false" style="width: 220px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="dialogForm.status"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in StatusArr"
:key="item.value"
@@ -272,7 +339,8 @@
</el-select>
</el-form-item>
<el-form-item label="绋煎姩鐜�" prop="ratio">
- <el-input v-model="dialogForm.ratio" style="width: 195px" /><span style="margin-left: 10px">%</span>
+ <el-input v-model="dialogForm.ratio" style="width: 175px" />
+ <span style="margin-left: 10px">%</span>
</el-form-item>
</el-form>
@@ -288,7 +356,7 @@
<el-dialog
title="璁惧绫诲瀷"
:visible.sync="DeviceTypeDialogVisible"
- width="50%"
+ width="800px"
top="15vh"
:close-on-click-modal="false"
class="DeviceTypeDialogVisible"
@@ -301,7 +369,7 @@
<el-table
:data="DeviceTypeArray"
border
- height="400"
+ height="300"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -375,7 +443,7 @@
<el-dialog
title="璁惧缁�"
:visible.sync="DeviceGroupDialogVisible"
- width="70%"
+ width="800px"
:close-on-click-modal="false"
top="15vh"
class="DeviceTypeDialogVisible"
@@ -388,7 +456,7 @@
:data="DeviceGroupArray"
border
highlight-current-row
- height="400"
+ height="300"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChangeOfDeviceGroup"
@@ -424,7 +492,13 @@
sortable="custom"
>
<template slot-scope="{row}">
- <el-select v-if="row.isVisible===1" v-model="row.eqptype_code" :popper-append-to-body="false" placeholder="璇烽�夋嫨">
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.eqptype_code"
+ filterable
+ :popper-append-to-body="false"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -438,7 +512,6 @@
<el-table-column
prop="remark"
label="鍒嗙粍鎻忚堪"
- show-overflow-tooltip
sortable="custom"
>
<template slot-scope="{row}">
@@ -482,7 +555,6 @@
<script>
import Pagination from '@/components/Pagination'
-import { getCookie } from '@/utils/auth'
import {
AddUpdateDeviceGroup, AddUpdateDeviceManger,
AddUpdateDeviceType, DeleteDeviceManger, DeleteDeviceType,
@@ -493,11 +565,11 @@
DeviceTypeSelectGroup,
WorkShopSelect, WorkShopSelectLine
} from '@/api/sbgl'
-import { handleDatatime } from '@/utils/global'
+import { handleDatetime } from '@/utils/global'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'SBQD',
components: {
Pagination
},
@@ -544,10 +616,10 @@
devicename: '',
devicetypecode: '',
devicegroupcode: '',
- importdate: '',
+ importdate: handleDatetime(new Date()),
workshopcode: '',
linecode: '',
- status: '',
+ status: 'Y',
ratio: ''
},
DeviceGroupDialogArr: [], // 璁惧缁勬暟缁�
@@ -572,9 +644,9 @@
workshopcode: [
{ required: true, message: '璇烽�夋嫨鎵�灞炶溅闂�', trigger: ['blur', 'change'] }
],
- linecode: [
- { required: true, message: '璇烽�夋嫨鎵�灞炰骇绾�', trigger: ['blur', 'change'] }
- ],
+ // linecode: [
+ // { required: true, message: '璇烽�夋嫨鎵�灞炰骇绾�', trigger: ['blur', 'change'] }
+ // ],
status: [
{ required: true, message: '璇烽�夋嫨浣跨敤鐘舵��', trigger: ['blur', 'change'] }
]
@@ -687,7 +759,7 @@
this.dialogForm.devicegroupcode = row.eqpgroup_code
this.dialogForm.importdate = row.input_date
this.dialogForm.workshopcode = row.wksp_code
- this.dialogForm.linecode = row.Line_code
+ // this.dialogForm.linecode = row.Line_code
this.dialogForm.status = row.enable
this.dialogForm.ratio = row.operation_ration
})
@@ -716,18 +788,18 @@
this.dialogForm.devicename = ''
this.dialogForm.devicetypecode = ''
this.dialogForm.devicegroupcode = ''
- this.dialogForm.importdate = ''
+ this.dialogForm.importdate = handleDatetime(new Date())
this.dialogForm.workshopcode = ''
- this.dialogForm.linecode = ''
- this.dialogForm.status = ''
+ // this.dialogForm.linecode = ''
+ this.dialogForm.status = 'Y'
this.dialogForm.ratio = ''
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗘墍灞炶溅闂翠笅鎷夐�夋嫨鏀瑰彉鏃�
- async workshopcodeChange(val) {
+ async workshopcodeChange(val) {
const { data: res } = await WorkShopSelectLine({ workshopcode: val })
this.WorkLineArr = res
- this.dialogForm.linecode = ''
+ // this.dialogForm.linecode = ''
},
// 瀵硅瘽妗嗚澶囩被鍨嬩笅鎷夐�夋嫨鏀瑰彉鏃�
async devicetypecodeChange(val) {
@@ -749,9 +821,10 @@
devicename: this.dialogForm.devicename,
devicetypecode: this.dialogForm.devicetypecode,
devicegroupcode: this.dialogForm.devicegroupcode,
- importdate: handleDatatime(this.dialogForm.importdate),
+ importdate: handleDatetime(this.dialogForm.importdate),
workshopcode: this.dialogForm.workshopcode,
- linecode: this.dialogForm.linecode,
+ // linecode: this.dialogForm.linecode,
+ linecode: '',
status: this.dialogForm.status,
ratio: this.dialogForm.ratio,
OperType: this.operation === 'add' ? 'Add' : 'Update'
@@ -773,6 +846,9 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
+ if (window.innerHeight < 800) {
+ this.tableHeight = this.tableHeight - 50
+ }
})
},
@@ -814,7 +890,8 @@
},
// 鏂板鎸夐挳
addDeviceType() {
- const number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
this.DeviceTypeArray.unshift({ code: '', name: '', group: '', remark: '', isVisible: 1, number: number })
},
// 鍒犻櫎
@@ -842,9 +919,9 @@
if (row.name.trim().length < 1) {
return this.$message.info('绫诲瀷鍚嶇О涓嶈兘涓虹┖锛�')
}
- if (row.remark.trim().length < 1) {
- return this.$message.info('绫诲瀷鎻忚堪涓嶈兘涓虹┖锛�')
- }
+ // if (row.remark.trim().length < 1) {
+ // return this.$message.info('绫诲瀷鎻忚堪涓嶈兘涓虹┖锛�')
+ // }
const data = {
'code': row.code,
'name': row.name,
@@ -890,8 +967,17 @@
},
// 鏂板
addDeviceGroup() {
- const number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
- this.DeviceGroupArray.unshift({ code: '', name: '', eqptype_code: '', eqptype_name: '', remark: '', isVisible: 1, number: number })
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+ this.DeviceGroupArray.unshift({
+ code: '',
+ name: '',
+ eqptype_code: '',
+ eqptype_name: '',
+ remark: '',
+ isVisible: 1,
+ number: number
+ })
},
// 鎺掑簭
sortChangeOfDeviceGroup({ column, prop, order }) {
@@ -947,9 +1033,9 @@
if (row.eqptype_code.trim().length < 1) {
return this.$message.info('鎵�灞炶澶囩被鍨嬩笉鑳戒负绌猴紒')
}
- if (row.remark.trim().length < 1) {
- return this.$message.info('鍒嗙粍鎻忚堪涓嶈兘涓虹┖锛�')
- }
+ // if (row.remark.trim().length < 1) {
+ // return this.$message.info('鍒嗙粍鎻忚堪涓嶈兘涓虹┖锛�')
+ // }
const data = {
'code': row.code,
'name': row.name,
@@ -985,9 +1071,11 @@
border: none;
padding: 0 20px;
}
+
::v-deep .el-button--primary:hover {
border: none;
}
+
::v-deep .el-button--info {
//background-color: $main_color !important;
height: 30px;
@@ -1034,6 +1122,7 @@
::v-deep .el-select .el-input .el-select__caret {
display: flex;
align-items: center;
+ justify-content: center;
}
}
@@ -1116,29 +1205,31 @@
margin: 10px 30px 0px 0;
}
-.body ::v-deep .el-divider{
+.body ::v-deep .el-divider {
border: 1px solid #eee;
width: 99%;
margin: 10px auto;
}
-.body ::v-deep .el-form-item{
+
+.body ::v-deep .el-form-item {
margin-bottom: 0;
}
+
::v-deep .el-input__inner:focus {
border-color: $main_color;
}
-::v-deep .el-select .el-input__inner:focus{
+::v-deep .el-select .el-input__inner:focus {
border-color: $main_color;
}
-::v-deep .el-select-dropdown__item.selected{
+::v-deep .el-select-dropdown__item.selected {
color: $main_color;
}
</style>
<style lang="scss">
-.dateStyle{
- .el-date-table td.today span{
+.dateStyle {
+ .el-date-table td.today span {
color: #42b983;
}
}
--
Gitblit v1.9.3