From 016f890b89151f2edfee3ae792a9c5594460bf2b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 20 二月 2024 17:41:51 +0800
Subject: [PATCH] 提交新代码
---
ruoyi-ui/src/views/device/index.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index df485a5..74b15b1 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -5,7 +5,7 @@
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
- style="width: 200px;
+ style="width: 240px;
height: 35px;
border-radius: 16px 16px 16px 16px;
opacity: 0.5;"
@@ -118,7 +118,7 @@
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
- <el-col :span="1.2">
+ <el-col :span="1.5">
<el-upload
action=""
@@ -129,7 +129,7 @@
>
<el-button size="mini" type="primary"
plain
- icon="el-icon-plus" >瀵煎叆</el-button>
+ icon="el-icon-top" >瀵煎叆</el-button>
</el-upload>
</el-col>
@@ -194,6 +194,7 @@
size="mini"
type="text"
icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
>淇敼</el-button>
@@ -201,6 +202,7 @@
size="mini"
type="text"
icon="el-icon-delete"
+ :disabled="!scope.row.ownData"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
@@ -377,7 +379,9 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -508,13 +512,20 @@
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+ let _this = this
listEquipment(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.equipmentList = response.data.data;
+ if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�")
+ {
+ _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ _this.loading = false;
+ }else{
+ _this.equipmentList = response.data.data;
- this.total = response.data.total;
- this.loading = false;
+ _this.total = response.data.total;
+ _this.loading = false;
+ }
}
);
},
--
Gitblit v1.9.1