From 579fcaaeb4f3d55b3137445055f4a27af0773c8c Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 16 五月 2023 02:45:44 +0800
Subject: [PATCH] 修改家庭设备bug
---
ruoyi-ui/src/views/device/index.vue | 161 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 96 insertions(+), 65 deletions(-)
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 3b552c6..2b64e80 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -13,6 +13,15 @@
end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
</el-form-item>
+ <el-form-item label="璁惧鍚嶇О" prop="name" >
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ clearable
+ style="width: 240px"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-form-item label="璐拱浜�" prop="buyer" >
<el-input
v-model="queryParams.buyer"
@@ -33,10 +42,10 @@
</el-form-item>
- <el-form-item label="浜嬮」鍐呭" prop="content">
+ <el-form-item label="鏍囬" prop="content">
<el-input
v-model="queryParams.content"
- placeholder="璇疯緭鍏ヤ簨椤瑰唴瀹�"
+ placeholder="璇疯緭鍏ユ爣棰�"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
@@ -104,8 +113,8 @@
:http-request="handleEnport"
>
<el-button size="mini" type="primary"
- plain
- icon="el-icon-plus" >瀵煎叆</el-button>
+ plain
+ icon="el-icon-plus" >瀵煎叆</el-button>
</el-upload>
</el-col>
@@ -120,36 +129,42 @@
<el-table-column label="璁惧鍚嶇О" prop="name" sortable width="120" />
<el-table-column label="鏃堕棿" align="center" sortable prop="happenTime" width="180">
+ <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鏄惁娉ㄩ攢" align="center" sortable prop="status" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.happenTime) }}</span>
+ {{ getSrc1(scope.row.status) }}
</template>
</el-table-column>
-
<el-table-column label="璐拱浜�" prop="buyer" sortable width="100" />
- <el-table-column label="浜嬮」鍐呭" prop="content" sortable :show-overflow-tooltip="true" width="150" />
+ <el-table-column label="鏍囬" prop="content" sortable :show-overflow-tooltip="true" width="150" />
<el-table-column label="瀛樻斁鍦扮偣" prop="location" 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="澶囨敞" prop="remark" sortable width="100" >
+ <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+
+
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
- <template slot-scope="scope" >
- <img
- class="el-upload-list__item-thumbnail"
- src="../../assets/images/deviceLis.png"
- alt=""
- style="width: 35px; height: 35px;"
- fit="cover"
- v-if="scope.row.url !== null"
- >
- <img
- class="el-upload-list__item-thumbnail"
- src="../../assets/images/deviceA.png"
- alt=""
- style="width: 35px; height: 35px;"
- fit="cover"
- v-if="scope.row.url === null"
- >
- </template>
- </el-table-column>
+ <template slot-scope="scope" >
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="scope.row.url !== ','"
+ >
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceA.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="scope.row.url === ','"
+ >
+ </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
@@ -192,17 +207,12 @@
<el-input v-model="formDat.name" placeholder="璇疯緭鍏ヨ澶囧悕绉�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
- <!-- <el-form-item label="鏃堕棿" prop="createDate">
- <el-input v-model="formDat.createDate" placeholder="璇疯緭鍏ユ椂闂�" clearable :style="{width: '100%'}" ></el-input>
- </el-form-item>
- -->
- <el-form-item label="鏃堕棿" prop="createDate">
+ <el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
<el-date-picker
- v-model='formDat.createDate'
+ v-model='formDat.happenTime'
type='date'
placeholder='閫夋嫨鏃ユ湡'
></el-date-picker>
-
</el-form-item>
@@ -211,16 +221,18 @@
<el-input v-model="formDat.buyer" placeholder="璇疯緭鍏ヨ喘涔颁汉" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="浜嬮」鍐呭" prop="content">
+ <el-form-item label="鏍囬" prop="content">
<el-input v-model="formDat.content" placeholder="璇疯緭鍏ヤ簨椤瑰唴瀹�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
<el-form-item label="瀛樻斁鍦扮偣" prop="location">
<el-input v-model="formDat.location" 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 label="鏄惁娉ㄩ攢" prop="status">
+ <el-select v-model="formDat.status" placeholder="璇烽�夋嫨鏄惁娉ㄩ攢" clearable :style="{width: '100%'}" >
+ <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
@@ -359,6 +371,7 @@
remark: undefined,
familyId:undefined,
url: undefined,
+ status:undefined,
},
// 鑿滃崟鍒楄〃
menuOptions: [],
@@ -386,6 +399,12 @@
message: '璇疯緭鍏ヨ澶囧悕绉�',
trigger: 'blur'
}],
+ status: [{
+ required: true,
+ message: '鏄惁娉ㄩ攢',
+ trigger: 'change'
+ }],
+
buyer: [{
required: true,
@@ -397,28 +416,31 @@
message: '璇疯緭鍏ュ瓨鏀惧湴鐐�',
trigger: 'blur'
}],
- // remark: [{
- // required: true,
- // message: '璇疯緭鍏ュ娉�',
- // trigger: 'blur'
- // }],
- familyId: [{
- required: true,
- message: '璇疯緭鍏ュ搴彿',
+ remark: [{
+ // required: true,
+ message: '璇疯緭鍏ュ娉�',
trigger: 'blur'
}],
- // createDate: [{
- // required: true,
- // message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
- // trigger: 'change'
- // }],
+
+ happenTime: [{
+ required: true,
+ message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
+ trigger: 'change'
+ }],
content: [{
required: true,
- message: '璇烽�夋嫨浜嬮」鍐呭',
+ message: '璇疯緭鍏ユ爣棰�',
trigger: 'blur'
}],
},
- typeOptions: [],
+ typeOptions: [{
+ value: '1',
+ label: '鏄�',
+ },
+ {
+ value: '0',
+ label: '鍚�',
+ }],
};
},
created() {
@@ -427,6 +449,15 @@
},
methods: {
+
+ getSrc1(status) {
+ if (status === 1) {
+ return '鏄�'
+ }else {
+ return '鍚�'
+ }
+ },
+
// 鍙栨秷鎸夐挳
cancelData() {
this.open = false;
@@ -606,18 +637,18 @@
},
/** 瀵煎叆鎿嶄綔*/
handleEnport(params){
- var file = params.file;
- var formData = new FormData();
- formData.append('excelImport', file);
- let _this = this
- enload(formData).then(response => {
- _this.getList();
- Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('excelImport', file);
+ let _this = this
+ enload(formData).then(response => {
+ _this.getList();
+ Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
- }).catch(err)
- {
- Message({ message: "瀵煎叆澶辫触", type: 'error' })
- }
+ }).catch(err)
+ {
+ Message({ message: "瀵煎叆澶辫触", type: 'error' })
+ }
}
}
--
Gitblit v1.9.1