From 901b68695fcdab7e3ff1d5df3df88bd5001b0181 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期四, 25 一月 2024 09:17:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/da/tileMatchRules/index.vue | 74 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 17 deletions(-)
diff --git a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
index a086a42..fa51d6d 100644
--- a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
+++ b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
@@ -174,10 +174,10 @@
<el-table-column label="浜у搧绯诲垪" align="center" prop="productSeries">
</el-table-column>
- <el-table-column label="鎵爜瀵硅薄1" align="center" prop="scanObject1">
+ <el-table-column label="鎵爜瀵硅薄1" align="center" prop="scanObject1" width="100">
</el-table-column>
- <el-table-column label="鎵爜瀵硅薄2" align="center" prop="scanObject2">
+ <el-table-column label="鎵爜瀵硅薄2" align="center" prop="scanObject2" width="100">
</el-table-column>
<el-table-column label="杞村悕绉�" align="center" prop="axisName">
@@ -189,10 +189,10 @@
<el-table-column label="鐡﹀悕绉�" align="center" prop="tileName">
</el-table-column>
- <el-table-column label="杞村弬浣嶇疆" align="center" prop="axisParameterNoPosition" width="160">
+ <el-table-column label="杞村弬鏁颁綅缃�" align="center" prop="axisParameterNoPosition" width="100">
</el-table-column>
- <el-table-column label="棰堝弬鏁颁綅缃�" align="center" prop="neckParameterPosition" width="160">
+ <el-table-column label="棰堝弬鏁颁綅缃�" align="center" prop="neckParameterPosition" width="100">
</el-table-column>
<el-table-column label="杞村��" align="center" prop="axisValue">
@@ -211,7 +211,9 @@
<!-- </el-table-column>-->
<el-table-column label="鐘舵��" align="center" prop="state">
-
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.state"/>
+ </template>
</el-table-column>
<el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -247,12 +249,12 @@
/>
<!-- 娣诲姞鎴栦慨鏀归厤鐡﹁鍒欏璇濇 -->
- <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
+ <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="650px" append-to-body>
<span slot="title">
<i class="el-icon-s-order"></i>
{{titleName}}
</span>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" inline :model="form" :rules="rules" label-width="80px">
<el-form-item label="浜у搧绯诲垪" prop="productSeries">
<el-input v-model="form.productSeries" placeholder="璇疯緭鍏ヤ骇鍝佺郴鍒�" />
</el-form-item>
@@ -271,10 +273,10 @@
<el-form-item label="鐡﹀悕绉�" prop="tileName">
<el-input v-model="form.tileName" placeholder="璇疯緭鍏ョ摝鍚嶇О" />
</el-form-item>
- <el-form-item label="杞村弬鏁颁綅缃�" prop="axisParameterNoPosition">
- <el-input v-model="form.axisParameterNoPosition" placeholder="璇疯緭鍏ヨ酱鍙傛暟浣嶇疆" />
+ <el-form-item label="杞村弬鏁颁綅缃�" prop="axisParameterNoPosition" label-width="120">
+ <el-input v-model="form.axisParameterNoPosition" placeholder="璇疯緭鍏ヨ酱鍙傛暟浣嶇疆" />
</el-form-item>
- <el-form-item label="棰堝弬鏁颁綅缃�" prop="neckParameterPosition">
+ <el-form-item label="棰堝弬鏁颁綅缃�" prop="neckParameterPosition" label-width="120">
<el-input v-model="form.neckParameterPosition" placeholder="璇疯緭鍏ラ鍙傛暟浣嶇疆" />
</el-form-item>
<el-form-item label="杞村��" prop="axisValue">
@@ -286,14 +288,21 @@
<el-form-item label="鐡﹂鑹�" prop="tileColor">
<el-input v-model="form.tileColor" placeholder="璇疯緭鍏ョ摝棰滆壊" />
</el-form-item>
- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">
- <el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ垱寤虹敤鎴�" />
- </el-form-item>
- <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">
- <el-input v-model="form.updateUser" placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�" />
- </el-form-item>
+<!-- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
+<!-- <el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ垱寤虹敤鎴�" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">-->
+<!-- <el-input v-model="form.updateUser" placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�" />-->
+<!-- </el-form-item>-->
<el-form-item label="鐘舵��" prop="state">
- <el-input v-model="form.state" placeholder="璇疯緭鍏ョ姸鎬�" />
+ <el-select v-model="form.state" placeholder="璇烽�夋嫨鐘舵��" >
+ <el-option
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -309,6 +318,7 @@
export default {
name: "TileMatchRules",
+ dicts: ['subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable'],
data() {
return {
// 閬僵灞�
@@ -356,6 +366,36 @@
id: [
{ required: true, message: "涓婚敭id涓嶈兘涓虹┖", trigger: "blur" }
],
+ productSeries: [
+ { required: true, message: "浜у搧绯诲垪涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ axisName: [
+ { required: true, message: "杞村悕绉颁笉鑳戒负绌�", trigger: "blur" }
+ ],
+ neckName: [
+ { required: true, message: "棰堝悕绉颁笉鑳戒负绌�", trigger: "blur" }
+ ],
+ tileName: [
+ { required: true, message: "鐡﹀悕绉颁笉鑳戒负绌�", trigger: "blur" }
+ ],
+ axisParameterNoPosition: [
+ { required: true, message: "杞村弬鏁颁綅缃笉鑳戒负绌�", trigger: "blur" }
+ ],
+ neckParameterPosition: [
+ { required: true, message: "棰堝弬鏁颁綅缃笉鑳戒负绌�", trigger: "blur" }
+ ],
+ axisValue: [
+ { required: true, message: "杞村�间笉鑳戒负绌�", trigger: "blur" }
+ ],
+ neckValue: [
+ { required: true, message: "棰堝�间笉鑳戒负绌�", trigger: "blur" }
+ ],
+ tileColor: [
+ { required: true, message: "鐡﹀�间笉鑳戒负绌�", trigger: "blur" }
+ ],
+ state: [
+ { required: true, message: "鐘舵�佷笉鑳戒负绌�", trigger: "blur" }
+ ]
}
};
},
--
Gitblit v1.9.3