From 062175c7c625ef7763b694dd5dfba8bc7e5e76cd Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 14 六月 2023 15:38:04 +0800
Subject: [PATCH] 1.角色清单、安灯设置引入分车间概念
---
src/views/deviceManager/deviceList.vue | 266 +++++++++++++++++++++++++----------------------------
1 files changed, 126 insertions(+), 140 deletions(-)
diff --git a/src/views/deviceManager/deviceList.vue b/src/views/deviceManager/deviceList.vue
index 7936d4c..c863468 100644
--- a/src/views/deviceManager/deviceList.vue
+++ b/src/views/deviceManager/deviceList.vue
@@ -5,10 +5,9 @@
<div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<div style="display: flex">
- <el-button v-waves icon="el-icon-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
- <el-button v-waves icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
+ <!-- <el-button v-waves icon="el-icon-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>-->
+ <!-- <el-button v-waves icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>-->
<el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>
-
</div>
<!-- <el-button v-waves type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
@@ -62,41 +61,41 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" filterable label="璁惧绫诲瀷" style="display: flex;">
- <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"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
- <el-form-item v-show="isExpandForm" label="璁惧缁�" style=" display: flex;">
- <el-select
- v-model="form.DeviceGroup"
- filterable
- :popper-append-to-body="false"
- :disabled="form.DeviceType===''"
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in DeviceGroupArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
+ <!-- <el-form-item v-show="isExpandForm" filterable label="璁惧绫诲瀷" style="display: flex;">-->
+ <!-- <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"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item v-show="isExpandForm" label="璁惧缁�" style=" display: flex;">-->
+ <!-- <el-select-->
+ <!-- v-model="form.DeviceGroup"-->
+ <!-- filterable-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- :disabled="form.DeviceType===''"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in DeviceGroupArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
</div>
<div
class="bodySearchReset"
@@ -108,24 +107,10 @@
</el-form>
<div
class="bodyTopFormExpand"
- >
- <svg-icon
- v-show="mouseHoverType==='mouseout'"
- style="cursor: pointer"
- :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
- @mouseenter="mouseHoverType=$event.type"
- />
- <svg-icon
- v-show="mouseHoverType==='mouseenter'"
- style="cursor: pointer"
- :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
- @click="isExpandForm=!isExpandForm"
- @mouseout="mouseHoverType=$event.type"
- />
- </div>
+ />
</div>
- <div class="elTableDiv" style="margin-top: 0;">
+ <div class="elTableDiv">
<TableColumnSettings
:list1="tableColumnSettingsArray"
@tableColumnUpdate="tableColumnUpdate"
@@ -136,10 +121,10 @@
:data="tableData"
border
class="tableFixed"
- :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
+ :height="tableHeight+'px'"
highlight-current-row
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
+ :style="{width: 100+'%',height:tableHeight+'px'}"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
@@ -303,7 +288,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="total,prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes,jumper"
popper-class="select_bottom"
@pagination="getDeviceMangerSearch"
/>
@@ -326,40 +311,40 @@
<el-form-item label="璁惧鍚嶇О" prop="devicename">
<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: 200px"
- placeholder="璇烽�夋嫨"
- filterable
- @change="devicetypecodeChange"
- >
- <el-option
- v-for="item in DeviceTypeArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </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: 200px"
- filterable
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in DeviceGroupDialogArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
+ <!-- <el-form-item label="璁惧绫诲瀷" prop="devicetypecode">-->
+ <!-- <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"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </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: 200px"-->
+ <!-- filterable-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in DeviceGroupDialogArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
<el-form-item label="鎶曞叆鏃ユ湡" prop="importdate">
<el-date-picker
v-model="dialogForm.importdate"
@@ -693,6 +678,7 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
+import { getCookie } from '@/utils/auth'
export default {
name: 'SBQD',
@@ -710,7 +696,7 @@
DeviceCode: '', // 璁惧缂栫爜
DeviceName: '', // 璁惧鍚嶇О
Status: '', // 浣跨敤鐘舵��
- WorkShop: '', // 鎵�灞炶溅闂�
+ WorkShop: this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 鎵�灞炶溅闂�
DeviceType: '', // 璁惧绫诲瀷
DeviceGroup: '', // 璁惧缁�
prop: 'lm_date', // 鎺掑簭瀛楁
@@ -750,49 +736,49 @@
fixed: false,
sortable: true
},
- {
- minWidth: false,
- width: 130,
- prop: 'eqptype_code',
- label: '璁惧绫诲瀷缂栫爜',
- id: 5,
- show: false,
- fixed: false,
- sortable: true
- },
+ // {
+ // minWidth: false,
+ // width: 130,
+ // prop: 'eqptype_code',
+ // label: '璁惧绫诲瀷缂栫爜',
+ // id: 5,
+ // show: false,
+ // fixed: false,
+ // sortable: true
+ // },
+ // {
+ // minWidth: 110,
+ // width: false,
+ // prop: 'eqptype_name',
+ // label: '璁惧绫诲瀷',
+ // id: 6,
+ // show: true,
+ // fixed: false,
+ // sortable: true
+ // },
+ // {
+ // minWidth: false,
+ // width: 120,
+ // prop: 'eqpgroup_code',
+ // label: '璁惧缁勭紪鐮�',
+ // id: 7,
+ // show: false,
+ // fixed: false,
+ // sortable: true
+ // },
+ // {
+ // minWidth: 110,
+ // width: false,
+ // prop: 'eqpgroup_name',
+ // label: '璁惧缁�',
+ // id: 8,
+ // show: true,
+ // fixed: false,
+ // sortable: true
+ // },
{
minWidth: 110,
width: false,
- prop: 'eqptype_name',
- label: '璁惧绫诲瀷',
- id: 6,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: false,
- width: 120,
- prop: 'eqpgroup_code',
- label: '璁惧缁勭紪鐮�',
- id: 7,
- show: false,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'eqpgroup_name',
- label: '璁惧缁�',
- id: 8,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: false,
- width: 110,
prop: 'enable',
label: '浣跨敤鐘舵��',
id: 9,
@@ -801,8 +787,8 @@
sortable: true
},
{
- minWidth: false,
- width: 110,
+ minWidth: 110,
+ width: false,
prop: 'input_date',
label: '鎶曞叆鏃ユ湡',
id: 10,
@@ -811,8 +797,8 @@
sortable: true
},
{
- minWidth: false,
- width: 130,
+ minWidth: 130,
+ width: false,
prop: 'wksp_code',
label: '鐢熶骇杞﹂棿缂栫爜',
id: 11,
@@ -1015,7 +1001,7 @@
this.form.DeviceCode = ''
this.form.DeviceName = ''
this.form.Status = ''
- this.form.WorkShop = ''
+ this.form.WorkShop = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode')
this.form.DeviceType = ''
this.form.DeviceGroup = ''
this.getDeviceMangerSearch()
@@ -1104,8 +1090,8 @@
id: this.dialogForm.id,
devicecode: this.dialogForm.devicecode,
devicename: this.dialogForm.devicename,
- devicetypecode: this.dialogForm.devicetypecode,
- devicegroupcode: this.dialogForm.devicegroupcode,
+ devicetypecode: '',
+ devicegroupcode: '',
importdate: handleDatetime(this.dialogForm.importdate),
workshopcode: this.dialogForm.workshopcode,
// linecode: this.dialogForm.linecode,
@@ -1131,7 +1117,7 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 245
+ this.tableHeight = this.mainHeight - 195
this.$refs.tableDataRef.doLayout()
// if (window.innerHeight < 769) {
// this.tableHeight = this.tableHeight - 50
--
Gitblit v1.9.3