From fb3c954aaa562833b49a5449e7f790657e3ff2a3 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 25 四月 2023 09:55:15 +0800
Subject: [PATCH] 删除了<!---
---
ruoyi-ui/src/views/device/index.vue | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 1ef5cc6..3b552c6 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -84,18 +84,44 @@
v-hasPermi="['family:note:export']"
>瀵煎嚭</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ v-hasPermi="['family:note:export']"
+ >瀵煎叆妯℃澘涓嬭浇</el-button>
+ </el-col>
+ <el-col :span="1.2">
+
+ <el-upload
+ action=""
+
+ class="upload-demo"
+ :show-file-list="false"
+ :http-request="handleEnport"
+ >
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-plus" >瀵煎叆</el-button>
+
+ </el-upload>
+ </el-col>
+
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 搴忓彿銆佽澶囧悕绉般�佹椂闂淬�佽喘涔颁汉銆佷簨椤瑰唴瀹广�佸瓨鏀惧湴鐐广�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
<!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
<el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="搴忓彿" prop="id" sortable width="120" />
+ <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
<el-table-column label="璁惧鍚嶇О" prop="name" sortable width="120" />
- <el-table-column label="鏃堕棿" align="center" sortable prop="createDate" width="180">
+ <el-table-column label="鏃堕棿" align="center" sortable prop="happenTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createDate) }}</span>
+ <span>{{ parseTime(scope.row.happenTime) }}</span>
</template>
</el-table-column>
@@ -103,8 +129,27 @@
<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="url" sortable width="180" />
<el-table-column label="瀹跺涵鍙�" prop="familyId" sortable width="100" />
+ <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>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
@@ -261,7 +306,7 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
-import {listEquipment,getEquipmentInfo,delEquipment, addEquipment, uploadPic} from "@/api/device/index";
+import {listEquipment,enload,delEquipment, addEquipment, uploadPic} from "@/api/device/index";
export default {
name: "Role",
dicts: ['sys_normal_disable'],
@@ -479,7 +524,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
- this.$router.push("/jiatingshebei/device/equipmentInfo/" + id);
+ this.$router.push("/familymodel/Device/equipmentInfo/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -487,7 +532,7 @@
let jd = true
this.$router.push({
- path:"/jiatingshebei/device/equipmentInfo/" + id,
+ path:"/familymodel/Device/equipmentInfo/" + id,
query:{
detail:jd
}
@@ -558,6 +603,22 @@
this.download('/zfEquipment/export', {
...this.queryParams
}, `zfEquiment_${new Date().getTime()}.xlsx`)
+ },
+ /** 瀵煎叆鎿嶄綔*/
+ 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' })
+
+ }).catch(err)
+ {
+ Message({ message: "瀵煎叆澶辫触", type: 'error' })
+ }
+
}
}
};
--
Gitblit v1.9.1