From 039d01c3ee6217e18ef3bcaec263fd2ad59e6f68 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 20 九月 2023 16:19:51 +0800
Subject: [PATCH] modified: src/components/view/equipmentmaintain.vue modified: src/components/view/standard-table/material.vue modified: src/components/view/standard-table/product.vue modified: src/components/view/standard-table/target.vue modified: src/components/view/standard-table/technology.vue
---
src/components/view/standard-table/technology.vue | 120 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 93 insertions(+), 27 deletions(-)
diff --git a/src/components/view/standard-table/technology.vue b/src/components/view/standard-table/technology.vue
index a550804..7883cd9 100644
--- a/src/components/view/standard-table/technology.vue
+++ b/src/components/view/standard-table/technology.vue
@@ -1,41 +1,41 @@
<template>
<div class="standard">
- <div>
- <el-table :data="tableData" max-height="675" row-key="rowId" border
+ <div style="width: 100%;height: 68vh;overflow-x: auto;">
+ <el-table :data="tableData" row-key="rowId" border height="calc(90vh - 200px)"
@select-all="selectAll" @select="selectTr" ref="multipleTable"
:header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
@selection-change="handleSelectionChange" default-expand-all
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column type="selection" width="55">
</el-table-column>
- <el-table-column type="index" width="60" label="搴忓彿">
+ <el-table-column type="index" width="60" label="搴忓彿" :resizable="false">
</el-table-column>
- <el-table-column prop="father" label="宸ュ簭" sortable width="200px">
+ <el-table-column prop="father" label="宸ュ簭" width="200" :resizable="false">
<template slot-scope="scope">
- <el-tag v-if="scope.row.children" type="primary">01</el-tag>
+ <el-tag class="tag" v-if="scope.row.children" type="primary">01</el-tag>
<span style="color: black">
{{ scope.row.father }}
</span>
</template>
</el-table-column>
- <el-table-column sortable label="宸ヨ壓鍚嶇О">
+ <el-table-column label="宸ヨ壓鍚嶇О" width="200" :resizable="false">
<template slot-scope="scope">
- <el-tag type="success" v-if="!scope.row.children">02</el-tag>
+ <el-tag class="tag" type="success" v-if="!scope.row.children">02</el-tag>
<span style="color: black">{{ scope.row.name }}</span>
</template>
</el-table-column>
- <el-table-column prop="dg" label="璁惧缁�">
+ <el-table-column prop="dg" label="璁惧缁�" width="200" :resizable="false">
<template slot-scope="scope">
<div class="showDiv">
<span>{{scope.row.dg}}</span>
- <div @click="showDialog">閫夋嫨</div>
+ <div @click="showDialog(scope.row)">閫夋嫨</div>
</div>
</template>
</el-table-column>
- <el-table-column prop="pq" label="鐢熶骇瀹氶(涓�/澶�)">
+ <el-table-column prop="pq" label="鐢熶骇瀹氶(涓�/澶�)" :resizable="false">
<template slot-scope="scope">
<el-input v-model="scope.row.pq"
- v-if="scope.row.dg != null"
+ v-if="scope.row.dg != null" size="small"
@blur="updatePq(scope.row)"
></el-input>
</template>
@@ -46,9 +46,18 @@
title="閫夋嫨璁惧缁�"
:visible.sync="deviceGroupDialog"
width="30%">
- <span>杩欐槸涓�娈典俊鎭�</span>
+ <el-form :model="formData">
+ <el-form-item prop="deviceGroup" label="璁惧缁勶細"
+ :rules="{required:true,message:'璁惧缁勪笉鑳戒负绌�',trigger:'change'}">
+ <el-select placeholder="璇烽�夋嫨璁惧缁�" size="small"
+ v-model="formData.deviceGroup">
+ <el-option :value="item.father"
+ v-for="(item,index) in deviceList" :key="index" :label="item.father"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="deviceGroupDialog = false">纭� 瀹�</el-button>
+ <el-button type="primary" @click="confirmUpdate()">纭� 瀹�</el-button>
<el-button @click="deviceGroupDialog = false">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -60,23 +69,48 @@
data() {
return {
deviceGroupDialog:false,
+ formData:{
+ deviceGroup:''
+ },
+ row:{},
selects: [],
+ deviceList:[],
isAllSelect:false,
}
},
props:['tableData','tableType'],
created() {},
mounted() {
-
},
methods: {
+ //宸ヨ壓璺嚎--鑾峰彇璁惧缁勫垪琛�
+ getDeviceList(){
+ this.$axios.get(this.$api.url.chooseDevice).then(res=>{
+ this.deviceList = res.data;
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
+ },
+ showDialog(row){
+ this.getDeviceList();
+ this.formData.deviceGroup = row.dg;
+ this.row = row;
+ this.deviceGroupDialog = true
+ },
+ confirmUpdate(){
+ this.$axios.post(this.$api.url.writeDevice,{
+ id : this.row.id,
+ deviceGroup : this.formData.deviceGroup
+ }).then(res=>{
+ this.$emit("updateDevice",true);
+ this.$message.success(res.message);
+ this.deviceGroupDialog = false
+ }).catch(error=>{
+
+ })
+ },
// 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
// 鍏ㄩ��/鍙栨秷閫夋搷浣�
- selectAll(val) {
- this.isAllSelect = !this.isAllSelect;
- let data = this.tableData;
- this.toggleSelect(data, this.isAllSelect, "all");
- },
//閫夋嫨鏌愯
selectTr(selection, row) {
this.$set(row, "isChecked", !row.isChecked);
@@ -106,18 +140,39 @@
}
}
},
- handleSelectionChange(val) {
- this.deleteList = [];
- val.forEach((v) => {
- if (v.id !== undefined) {
- this.deleteList.push(v.id);
+ //鏀瑰彉閫変腑
+ toggleSelection(row, flag) {
+ this.$set(row, "isChecked", flag);
+ this.$nextTick(() => {
+ if (flag) {
+ this.$refs.multipleTable.toggleRowSelection(row, flag);
+ } else {
+ this.$refs.multipleTable.clearSelection();
}
});
},
- // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆 缁撴潫
- showDialog(){
- this.deviceGroupDialog = true
+ selectAll(val) {
+ this.isAllSelect = !this.isAllSelect;
+ let data = this.tableData;
+ this.toggleSelect(data, this.isAllSelect, "all");
},
+ handleSelectionChange(val) {
+ this.deleteList = [];
+ val.forEach((v) => {
+ this.searchIdFun(v);
+ });
+ this.$emit("childData",this.deleteList);
+ },
+ //閫掑綊鏌ユ壘閫変腑鏁版嵁id
+ searchIdFun(data){
+ let obj = data;
+ if(obj.children != undefined){
+ this.searchIdFun(obj.children);
+ }else{
+ this.deleteList.push(obj.id);
+ }
+ },
+ // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆 缁撴潫
updatePq(row){
this.$axios.post(this.$api.url.technologyWrite,{
id : row.id,
@@ -137,6 +192,17 @@
width: 100%;
height: 100%;
}
+ .tag{
+ line-height:24px;
+ text-align:center;
+ width:36px;
+ height:24px;
+
+ border-radius:12px;
+ }
+ .tag:nth-child(1){
+ margin-left:20px;
+ }
.standard .showDiv{
cursor: pointer;
}
--
Gitblit v1.9.3