From 7c86df822b4b8d06ee89388ea75ad5f47a89373e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 14 九月 2023 17:38:43 +0800
Subject: [PATCH] modified: src/App.vue modified: src/assets/api/controller.js modified: src/components/view/rawInsDetail.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 modified: src/components/view/standard.vue modified: src/components/view/rawInsDetail.vue
---
src/components/view/standard-table/technology.vue | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/src/components/view/standard-table/technology.vue b/src/components/view/standard-table/technology.vue
index 166d41a..d9cb1e6 100644
--- a/src/components/view/standard-table/technology.vue
+++ b/src/components/view/standard-table/technology.vue
@@ -10,7 +10,7 @@
</el-table-column>
<el-table-column type="index" width="60" label="搴忓彿" :resizable="false">
</el-table-column>
- <el-table-column prop="father" label="宸ュ簭" :resizable="false">
+ <el-table-column prop="father" label="宸ュ簭" width="200" :resizable="false">
<template slot-scope="scope">
<el-tag class="tag" v-if="scope.row.children" type="primary">01</el-tag>
<span style="color: black">
@@ -18,17 +18,17 @@
</span>
</template>
</el-table-column>
- <el-table-column sortable label="宸ヨ壓鍚嶇О" :resizable="false">
+ <el-table-column label="宸ヨ壓鍚嶇О" width="200" :resizable="false">
<template slot-scope="scope">
<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="璁惧缁�" :resizable="false">
+ <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>
@@ -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,7 +69,12 @@
data() {
return {
deviceGroupDialog:false,
+ formData:{
+ deviceGroup:''
+ },
+ row:{},
selects: [],
+ deviceList:[],
isAllSelect:false,
}
},
@@ -69,6 +83,32 @@
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=>{
+
+ })
+ },
// 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
// 鍏ㄩ��/鍙栨秷閫夋搷浣�
//閫夋嫨鏌愯
@@ -133,9 +173,6 @@
}
},
// 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆 缁撴潫
- showDialog(){
- this.deviceGroupDialog = true
- },
updatePq(row){
this.$axios.post(this.$api.url.technologyWrite,{
id : row.id,
--
Gitblit v1.9.3