From bc4a6ce5d19f9570bd03d16eac5d6f2f84e98da1 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期三, 24 一月 2024 14:36:02 +0800
Subject: [PATCH] 返修标记
---
jcdm-ui/src/views/main/da/tileMatchRules/index.vue | 216 ++++++++++++++++++++++++++++-------------------------
1 files changed, 113 insertions(+), 103 deletions(-)
diff --git a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
index 64a9a09..03168e7 100644
--- a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
+++ b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
@@ -10,38 +10,38 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎵爜瀵硅薄1" prop="scanObject1">
- <el-input
- v-model="queryParams.scanObject1"
- placeholder="璇疯緭鍏ユ壂鐮佸璞�1"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鎵爜瀵硅薄2" prop="scanObject2">
- <el-input
- v-model="queryParams.scanObject2"
- placeholder="璇疯緭鍏ユ壂鐮佸璞�2"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="杞村悕绉�" prop="axisName">
- <el-input
- v-model="queryParams.axisName"
- placeholder="璇疯緭鍏ヨ酱鍚嶇О"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="棰堝悕绉�" prop="neckName">
- <el-input
- v-model="queryParams.neckName"
- placeholder="璇疯緭鍏ラ鍚嶇О"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
+<!-- <el-form-item label="鎵爜瀵硅薄1" prop="scanObject1">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.scanObject1"-->
+<!-- placeholder="璇疯緭鍏ユ壂鐮佸璞�1"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鎵爜瀵硅薄2" prop="scanObject2">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.scanObject2"-->
+<!-- placeholder="璇疯緭鍏ユ壂鐮佸璞�2"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="杞村悕绉�" prop="axisName">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.axisName"-->
+<!-- placeholder="璇疯緭鍏ヨ酱鍚嶇О"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="棰堝悕绉�" prop="neckName">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.neckName"-->
+<!-- placeholder="璇疯緭鍏ラ鍚嶇О"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
<el-form-item label="鐡﹀悕绉�" prop="tileName">
<el-input
v-model="queryParams.tileName"
@@ -50,62 +50,62 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="杞村弬鏁版暟浣嶇疆" prop="axisParameterNoPosition">
- <el-input
- v-model="queryParams.axisParameterNoPosition"
- placeholder="璇疯緭鍏ヨ酱鍙傛暟鏁颁綅缃�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="棰堝弬鏁版暟浣嶇疆" prop="neckParameterPosition">
- <el-input
- v-model="queryParams.neckParameterPosition"
- placeholder="璇疯緭鍏ラ鍙傛暟鏁颁綅缃�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="杞村��" prop="axisValue">
- <el-input
- v-model="queryParams.axisValue"
- placeholder="璇疯緭鍏ヨ酱鍊�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="棰堝��" prop="neckValue">
- <el-input
- v-model="queryParams.neckValue"
- placeholder="璇疯緭鍏ラ鍊�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鐡﹂鑹�" prop="tileColor">
- <el-input
- v-model="queryParams.tileColor"
- placeholder="璇疯緭鍏ョ摝棰滆壊"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">
- <el-input
- v-model="queryParams.createUser"
- placeholder="璇疯緭鍏ュ垱寤虹敤鎴�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">
- <el-input
- v-model="queryParams.updateUser"
- placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
+<!-- <el-form-item label="杞村弬鏁版暟浣嶇疆" prop="axisParameterNoPosition">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.axisParameterNoPosition"-->
+<!-- placeholder="璇疯緭鍏ヨ酱鍙傛暟鏁颁綅缃�"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="棰堝弬鏁版暟浣嶇疆" prop="neckParameterPosition">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.neckParameterPosition"-->
+<!-- placeholder="璇疯緭鍏ラ鍙傛暟鏁颁綅缃�"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="杞村��" prop="axisValue">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.axisValue"-->
+<!-- placeholder="璇疯緭鍏ヨ酱鍊�"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="棰堝��" prop="neckValue">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.neckValue"-->
+<!-- placeholder="璇疯緭鍏ラ鍊�"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鐡﹂鑹�" prop="tileColor">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.tileColor"-->
+<!-- placeholder="璇疯緭鍏ョ摝棰滆壊"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.createUser"-->
+<!-- placeholder="璇疯緭鍏ュ垱寤虹敤鎴�"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.updateUser"-->
+<!-- placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
<el-form-item label="鐘舵��" prop="state">
<el-input
v-model="queryParams.state"
@@ -170,14 +170,14 @@
<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="涓婚敭id" align="center" prop="id" />-->
<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">
+ <el-table-column label="杞村弬鏁颁綅缃�" align="center" prop="axisParameterNoPosition" width="100">
</el-table-column>
- <el-table-column label="棰堝弬鏁版暟浣嶇疆" align="center" prop="neckParameterPosition">
+ <el-table-column label="棰堝弬鏁颁綅缃�" align="center" prop="neckParameterPosition" width="100">
</el-table-column>
<el-table-column label="杞村��" align="center" prop="axisValue">
@@ -204,14 +204,16 @@
<el-table-column label="鐡﹂鑹�" align="center" prop="tileColor">
</el-table-column>
- <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">
+<!-- <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">-->
- </el-table-column>
- <el-table-column label="鏇存敼鐢ㄦ埛" align="center" prop="updateUser">
+<!-- </el-table-column>-->
+<!-- <el-table-column label="鏇存敼鐢ㄦ埛" align="center" prop="updateUser">-->
- </el-table-column>
+<!-- </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">
@@ -271,11 +273,11 @@
<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">
+ <el-input v-model="form.axisParameterNoPosition" placeholder="璇疯緭鍏ヨ酱鍙傛暟浣嶇疆" />
</el-form-item>
- <el-form-item label="棰堝弬鏁版暟浣嶇疆" prop="neckParameterPosition">
- <el-input v-model="form.neckParameterPosition" placeholder="璇疯緭鍏ラ鍙傛暟鏁颁綅缃�" />
+ <el-form-item label="棰堝弬鏁颁綅缃�" prop="neckParameterPosition">
+ <el-input v-model="form.neckParameterPosition" placeholder="璇疯緭鍏ラ鍙傛暟浣嶇疆" />
</el-form-item>
<el-form-item label="杞村��" prop="axisValue">
<el-input v-model="form.axisValue" placeholder="璇疯緭鍏ヨ酱鍊�" />
@@ -293,7 +295,14 @@
<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="parseInt(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 {
// 閬僵灞�
--
Gitblit v1.9.3