From 3b27872f10a6618af42fd86ff5c4602894fab589 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期一, 24 四月 2023 20:38:18 +0800
Subject: [PATCH] 4.24日新增收藏与荣誉模块
---
ruoyi-ui/src/views/note/index.vue | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index e51907f..c8e82d5 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -20,7 +20,7 @@
v-model="queryParams.title"
placeholder="璇疯緭鍏ユ爣棰�"
clearable
- style="width: 240px"title
+ style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -64,8 +64,10 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
+ border-radius: 6px 6px 6px 6px;opacity:1;">鎼滅储</el-button>
+ <el-button size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
+ border-radius: 6px 6px 6px 6px;opacity:1;">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -105,7 +107,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="propertyList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" :data="propertyList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="璧勪骇缂栧彿" prop="id" sortable width="120" />
<el-table-column label="绫诲瀷" prop="type" sortable :show-overflow-tooltip="true" width="150" />
@@ -114,11 +116,14 @@
<el-table-column label="鎸佹湁浜�" prop="holder" sortable width="100" />
<el-table-column label="鍏蜂綋浣嶇疆" prop="address" sortable width="100" />
<el-table-column label="澶囨敞淇℃伅" prop="remark" sortable width="100" />
+ <el-table-column label="瀹跺涵鍙�" prop="familyId" sortable width="100" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" sortable prop="createTime" width="180">
+
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
+
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
@@ -126,7 +131,7 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['system:role:edit']"
+ v-hasPermi="['familymodel:property:info']"
>淇敼</el-button>
<el-button
size="mini"
@@ -135,7 +140,7 @@
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
+ <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:property:info']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
</el-dropdown>
@@ -149,6 +154,7 @@
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
+ style="background: #FEF7FC;"
/>
<!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
@@ -176,6 +182,11 @@
<el-input v-model="formDat.address" placeholder="璇疯緭鍏ュ叿浣撲綅缃�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
+ <el-form-item label="瀹跺涵鍙�" prop="familyId">
+ <el-input v-model="formDat.familyId" placeholder="璇疯緭鍏ュ搴彿" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
@@ -312,6 +323,7 @@
address: undefined,
remark: undefined,
url: undefined,
+
},
// 鑿滃崟鍒楄〃
menuOptions: [],
@@ -326,7 +338,8 @@
location:undefined,
holder:undefined,
address:undefined,
- createTime:undefined
+ createTime:undefined,
+
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -361,9 +374,9 @@
message: '璇疯緭鍏ュ叿浣撲綅缃�',
trigger: 'blur'
}],
- remark: [{
+ familyId: [{
required: true,
- message: '璇疯緭鍏ュ娉�',
+ message: '璇疯緭鍏amilyId',
trigger: 'blur'
}],
createTime: [{
@@ -386,6 +399,16 @@
this.open = false;
this.reset();
},
+
+ //闅旇鍙樿壊
+ tableRowClassName({ row, rowIndex }) {
+ if (rowIndex % 2 == 0) {
+ return "statistics-warning-row1";
+ } else {
+ return "statistics-warning-row";
+ }
+ },
+
/** 鏌ヨ瑙掕壊鍒楄〃 */
getList() {
this.loading = true;
@@ -477,7 +500,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
- this.$router.push("/family/note1/propertyInfo/" + id);
+ this.$router.push("/familymodel/property/propertyInfo/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -485,7 +508,7 @@
let jd = true
this.$router.push({
- path:"/family/note1/propertyInfo/" + id,
+ path:"/familymodel/property/propertyInfo/" + id,
query:{
detail:jd
}
@@ -560,3 +583,13 @@
}
};
</script>
+<style>
+.el-table__row.statistics-warning-row {
+ background: #E0EEFE;
+
+}
+.el-table__row.statistics-warning-row1 {
+ background: #FFEFF2;
+
+}
+</style>
--
Gitblit v1.9.1