From ebf004b96bf6066f0bb78cec13ad638ca9c35b2a Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期一, 29 一月 2024 12:58:59 +0800
Subject: [PATCH] 更新采集参数配置工序编号下拉选项
---
jcdm-ui/src/views/main/da/tileMatchRules/index.vue | 23 ++-----
jcdm-ui/src/views/main/sc/stationConf/index.vue | 9 +++
jcdm-ui/src/views/main/da/collectionParamConf/index.vue | 96 ++++++++++++++++++++++++++++----
3 files changed, 99 insertions(+), 29 deletions(-)
diff --git a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
index e927a1d..9358e02 100644
--- a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
+++ b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
@@ -160,14 +160,14 @@
<el-table-column label="澶囨敞" align="center" width="160" prop="remarks">
</el-table-column>
- <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">
- </el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" width="160" prop="createTime">
- </el-table-column>
- <el-table-column label="鏇存敼鐢ㄦ埛" align="center" prop="updateUser">
- </el-table-column>
- <el-table-column label="鏇存敼鏃堕棿" align="center" width="160" prop="updateTime">
- </el-table-column>
+<!-- <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="鍒涘缓鏃堕棿" align="center" width="160" prop="createTime">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="鏇存敼鐢ㄦ埛" align="center" prop="updateUser">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="鏇存敼鏃堕棿" align="center" width="160" prop="updateTime">-->
+<!-- </el-table-column>-->
<el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -202,14 +202,21 @@
/>
<!-- 娣诲姞鎴栦慨鏀归噰闆嗗弬鏁伴厤缃璇濇 -->
- <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="700px" append-to-body>
+ <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="800px" append-to-body>
<span slot="title">
<i class="el-icon-s-order"></i>
{{titleName}}
</span>
<el-form ref="form" inline :model="form" :rules="rules" label-width="120px">
<el-form-item label="宸ュ簭缂栧彿" prop="processesCode">
- <el-input v-model="form.processesCode" placeholder="璇疯緭鍏ュ伐搴忕紪鍙�" />
+ <el-select style="width: 100%" @change="handleSelectChangeprocessesCode(form.processesCode)" v-model="form.processesCode" placeholder="璇烽�夋嫨宸ュ簭缂栧彿">
+ <el-option
+ v-for="item in options"
+ :key="item.processesCode"
+ :label="item.processesCode"
+ :value="item.processesCode">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item label="鍙傛暟闆嗙紪鐮�" prop="parameterSetCode">
<el-input v-model="form.parameterSetCode" placeholder="璇疯緭鍏ュ弬鏁伴泦缂栫爜" />
@@ -223,9 +230,18 @@
<el-form-item label="閲囬泦鍙傛暟鍚嶇О" prop="collectParameterName">
<el-input v-model="form.collectParameterName" placeholder="璇疯緭鍏ラ噰闆嗗弬鏁板悕绉�" />
</el-form-item>
- <el-form-item label="鏄惁浣滀负瀵规瘮鍙傛暟" label-width="140" prop="contrastParameterFlag">
- <el-input v-model="form.contrastParameterFlag" placeholder="璇疯緭鍏ユ槸鍚︿綔涓哄姣斿弬鏁�" />
+ <el-form-item label="鏄惁浣滀负瀵规瘮鍙傛暟" prop="contrastParameterFlag" label-width="120">
+<!-- <el-select v-model="form.contrastParameterFlag" placeholder="璇烽�夋嫨鏄惁浣滀负瀵规瘮鍙傛暟">-->
+<!-- <el-option-->
+<!-- v-for="dict in dict.type.sys_yes_no"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.label"-->
+<!-- :value="dict.value"-->
+<!-- ></el-option>-->
+<!-- </el-select>-->
</el-form-item>
+
+
<!-- <el-form-item label="閲囬泦鍙傛暟绫诲瀷" prop="collectParameterType">-->
<!-- <el-select v-model="form.collectParameterType" placeholder="璇烽�夋嫨閲囬泦鍙傛暟绫诲瀷">-->
<!-- <el-option-->
@@ -274,11 +290,13 @@
<script>
import { listCollectionParamConf, getCollectionParamConf, delCollectionParamConf, addCollectionParamConf, updateCollectionParamConf } from "@/api/main/da/collectionParamConf/collectionParamConf";
+import {listProcesses} from "@/api/main/bs/processes/processes";
export default {
name: "CollectionParamConf",
data() {
return {
+ options: [],
// 閬僵灞�
loading: true,
titleName: "",
@@ -311,6 +329,22 @@
collectParameterType: null,
productCode: null,
},
+
+ processesCodeQueryParams:{
+ pageNum: 1,
+ pageSize: 10,
+ processesCode: null,
+ processesName: null,
+ processesType: null,
+ ipAddress: null,
+ spareField1: null,
+ spareField2: null,
+ spareField3: null,
+ spareField4: null,
+ createUser: null,
+ updateUser: null,
+ remarks: null
+ },
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
@@ -318,13 +352,51 @@
id: [
{ required: true, message: "涓婚敭id涓嶈兘涓虹┖", trigger: "blur" }
],
+ processesCode: [
+ { required: true, message: "宸ュ簭缂栧彿涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ parameterSetCode: [
+ { required: true, message: "鍙傛暟闆嗙紪鐮佷笉鑳戒负绌�", trigger: "blur" }
+ ],
+ parameterSetName: [
+ { required: true, message: "鍙傛暟闆嗗悕绉颁笉鑳戒负绌�", trigger: "blur" }
+ ],
+ collectParameterId: [
+ { required: true, message: "閲囬泦鍙傛暟ID涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ collectParameterName: [
+ { required: true, message: "閲囬泦鍙傛暟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ collectParameterUnit: [
+ { required: true, message: "閲囬泦鍙傛暟鍗曚綅涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ gatherAddress: [
+ { required: true, message: "閲囬泦鍦板潃涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ gatherSequence: [
+ { required: true, message: "閲囬泦椤哄簭涓嶈兘涓虹┖", trigger: "blur" }
+ ],
}
};
},
created() {
this.getList();
+ this.initProcesses()
},
methods: {
+
+
+ handleSelectChangeprocessesCode(selectedOption) {
+ this.processesCodeQueryParams.processesCode = selectedOption;
+ listProcesses(this.processesCodeQueryParams).then(response => {
+ this.form.collectParameterName = response.rows[0].collectParameterName;
+ });
+ },
+ initProcesses(){
+ listProcesses(this.queryParams).then(response => {
+ this.options = response.rows;
+ });
+ },
/** 鏌ヨ閲囬泦鍙傛暟閰嶇疆鍒楄〃 */
getList() {
this.loading = true;
diff --git a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
index c7e7eb5..e748cbf 100644
--- a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
+++ b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
@@ -96,38 +96,27 @@
<el-table border v-loading="loading" :data="tileMatchRulesList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="涓婚敭id" align="center" prop="id" />-->
- <el-table-column label="浜у搧绯诲垪" align="center" prop="productSeries">
-
+ <el-table-column label="浜у搧绯诲垪" align="center" prop="productSeries" width="90">
</el-table-column>
- <el-table-column label="鎵爜瀵硅薄1" align="center" prop="scanObject1" width="100">
-
+ <el-table-column label="鎵爜瀵硅薄1" align="center" prop="scanObject1" width="90">
</el-table-column>
- <el-table-column label="鎵爜瀵硅薄2" align="center" prop="scanObject2" width="100">
-
+ <el-table-column label="鎵爜瀵硅薄2" align="center" prop="scanObject2" width="90">
</el-table-column>
<el-table-column label="杞村悕绉�" align="center" prop="axisName">
-
</el-table-column>
<el-table-column label="棰堝悕绉�" align="center" prop="neckName">
-
</el-table-column>
<el-table-column label="鐡﹀悕绉�" align="center" prop="tileName">
-
</el-table-column>
- <el-table-column label="杞村弬鏁颁綅缃�" align="center" prop="axisParameterNoPosition" width="100">
-
+ <el-table-column label="杞村弬鏁颁綅缃�" align="center" prop="axisParameterNoPosition" width="90">
</el-table-column>
- <el-table-column label="棰堝弬鏁颁綅缃�" align="center" prop="neckParameterPosition" width="100">
-
+ <el-table-column label="棰堝弬鏁颁綅缃�" align="center" prop="neckParameterPosition" width="90">
</el-table-column>
<el-table-column label="杞村��" align="center" prop="axisValue">
-
</el-table-column>
<el-table-column label="棰堝��" align="center" prop="neckValue">
-
</el-table-column>
<el-table-column label="鐡﹂鑹�" align="center" prop="tileColor">
-
</el-table-column>
<!-- <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">-->
@@ -174,7 +163,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀归厤鐡﹁鍒欏璇濇 -->
- <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="650px" append-to-body>
+ <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="700px" append-to-body>
<span slot="title">
<i class="el-icon-s-order"></i>
{{titleName}}
diff --git a/jcdm-ui/src/views/main/sc/stationConf/index.vue b/jcdm-ui/src/views/main/sc/stationConf/index.vue
index e267c11..fff04d0 100644
--- a/jcdm-ui/src/views/main/sc/stationConf/index.vue
+++ b/jcdm-ui/src/views/main/sc/stationConf/index.vue
@@ -232,6 +232,15 @@
id: [
{ required: true, message: "涓婚敭id涓嶈兘涓虹┖", trigger: "blur" }
],
+ processesCode: [
+ { required: true, message: "宸ュ簭缂栧彿涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ ipAddress: [
+ { required: true, message: "IP鍦板潃涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ macAddress: [
+ { required: true, message: "缃戝崱鍦板潃涓嶈兘涓虹┖", trigger: "blur" }
+ ],
}
};
},
--
Gitblit v1.9.3