From a36d141236c0e06af4da16e8247d30915b197e32 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期三, 24 一月 2024 13:53:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/da/tileMatchRules/index.vue | 14 ++++++++++++--
jcdm-ui/src/views/main/kb/engineCheck/index.vue | 8 +++-----
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
index 7c97ea1..03168e7 100644
--- a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
+++ b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
@@ -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">
@@ -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 {
// 閬僵灞�
diff --git a/jcdm-ui/src/views/main/kb/engineCheck/index.vue b/jcdm-ui/src/views/main/kb/engineCheck/index.vue
index fbcb8b3..a3b2be1 100644
--- a/jcdm-ui/src/views/main/kb/engineCheck/index.vue
+++ b/jcdm-ui/src/views/main/kb/engineCheck/index.vue
@@ -5,7 +5,7 @@
<div class="container" type="flex" justify="center" style="text-align:center">
<!-- <el-row type="flex" justify="center" style="text-align:center;height: 12px" >-->
<!-- <el-col type="flex" justify="center" :span="14" style="text-align:center">-->
- <span style="font-size:22px;color:black"><strong>鍙戝姩鏈烘暟鎹鏌�</strong></span>
+ <el-divider><span style="font-size:22px;color:black"><strong>鍙戝姩鏈烘暟鎹鏌�</strong></span></el-divider>
<!-- </el-col>-->
<!-- </el-row>-->
</div>
@@ -54,22 +54,20 @@
</el-col>
<el-col :span="10" inline style="margin-top: 5px">
- <el-tabs type="border-card" >
- <el-card class="custom-content" style="height: 242px;width:800px">
+ <el-card class="custom-content" style="height: 264px">
<el-col :span="14">
<span style="font-size:25px"><strong>璐ㄩ噺鐘舵��</strong></span>
<el-divider></el-divider>
{{this.form.engineCheckList}}
</el-col>
</el-card>
- <el-card class="custom-content" style="margin-top: 10px;height: 242px;width:800px" >
+ <el-card class="custom-content" style="height: 264px" >
<el-col :span="14"style=" ">
<span style="font-size:25px"><strong>鏈�缁堢粨鏋�</strong></span>
<el-divider></el-divider>
{{queryParams.productType}}
</el-col>
</el-card>
- </el-tabs>
</el-col>
</el-row>
</div>
--
Gitblit v1.9.3