From 04b8eff075a04db23e6f908855699b4d2954588c Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期四, 23 五月 2024 18:47:01 +0800
Subject: [PATCH] 380新产品,优化
---
jcdm-ui/src/views/main/da/tileMatchRules/index.vue | 166 ++++++++++++++++--------------------------------------
1 files changed, 50 insertions(+), 116 deletions(-)
diff --git a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
index fa51d6d..104eb91 100644
--- a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
+++ b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
@@ -10,38 +10,7 @@
@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,73 +19,29 @@
@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"
- placeholder="璇疯緭鍏ョ姸鎬�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-select v-model="queryParams.state" placeholder="璇烽�夋嫨鐘舵��" clearable>
+ <el-option
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">楂樼骇鏌ヨ</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px">
+ <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="axisName">
+ <el-input v-model="queryParams.axisName" placeholder="璇疯緭鍏ヨ酱鍚嶇О" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
</el-form>
</el-card>
@@ -171,38 +96,30 @@
<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 label="鐡﹂鑹�" align="center" prop="tileColor" >
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.colour_hex" :value="scope.row.tileColor" style="color: #FFFFFF;" :style="{ backgroundColor: scope.row.tileColor }"/>
+ </template>
</el-table-column>
<!-- <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">-->
@@ -249,7 +166,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}}
@@ -285,8 +202,21 @@
<el-form-item label="棰堝��" prop="neckValue">
<el-input v-model="form.neckValue" placeholder="璇疯緭鍏ラ鍊�" />
</el-form-item>
- <el-form-item label="鐡﹂鑹�" prop="tileColor">
+<!-- <el-form-item label="鐡﹂鑹�" prop="tileColor">
<el-input v-model="form.tileColor" placeholder="璇疯緭鍏ョ摝棰滆壊" />
+ </el-form-item>-->
+<!-- <el-form-item label="鐡﹂鑹�" prop="tileColor" required>
+ <el-color-picker v-model="form.tileColor" size="medium"></el-color-picker>
+ </el-form-item>-->
+ <el-form-item label="鐡﹂鑹�" prop="tileColor">
+ <el-select v-model="form.tileColor" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option
+ v-for="dict in dict.type.colour_hex"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
</el-form-item>
<!-- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
<!-- <el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ垱寤虹敤鎴�" />-->
@@ -295,12 +225,12 @@
<!-- <el-input v-model="form.updateUser" placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�" />-->
<!-- </el-form-item>-->
<el-form-item label="鐘舵��" prop="state">
- <el-select 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"
+ :value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
@@ -318,9 +248,10 @@
export default {
name: "TileMatchRules",
- dicts: ['subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable'],
+ dicts: ['subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable','colour_hex'],
data() {
return {
+ advancedShowSearch: false,
// 閬僵灞�
loading: true,
titleName: "",
@@ -403,6 +334,9 @@
this.getList();
},
methods: {
+ advancedQuery(){
+ this.advancedShowSearch = (this.advancedShowSearch) ? this.advancedShowSearch = false : this.advancedShowSearch = true;
+ },
/** 鏌ヨ閰嶇摝瑙勫垯鍒楄〃 */
getList() {
this.loading = true;
--
Gitblit v1.9.3