From a4db210c069cd45448067fffb39f070e9d119bb9 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 26 九月 2023 17:00:32 +0800
Subject: [PATCH] 修改家大事记 的图片文件上传 直调接口

---
 ruoyi-ui/src/views/device/index.vue |   45 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 2742998..2e06301 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -5,7 +5,10 @@
       <el-form-item label="鏃堕棿" prop="happenTime">
         <el-date-picker
           v-model="dateRange"
-          style="width: 240px;"
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
           value-format="yyyy-MM-dd"
           type="daterange"
           range-separator="-"
@@ -18,7 +21,10 @@
           v-model="queryParams.name"
           placeholder="璇疯緭鍏ヨ澶囧悕绉�"
           clearable
-          style="width: 240px"
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -27,7 +33,10 @@
           v-model="queryParams.buyer"
           placeholder="璇疯緭鍏ヨ喘涔颁汉"
           clearable
-          style="width: 240px"
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -36,7 +45,10 @@
           v-model="queryParams.location"
           placeholder="璇疯緭鍏ュ瓨鏀惧湴鐐�"
           clearable
-          style="width: 240px"
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
           @keyup.enter.native="handleQuery"
         />
 
@@ -47,7 +59,10 @@
           v-model="queryParams.content"
           placeholder="璇疯緭鍏ヤ簨椤瑰唴瀹�"
           clearable
-          style="width: 240px"
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -126,25 +141,29 @@
     <el-table v-loading="loading" :data="equipmentList"  :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
       <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" />
       <el-table-column fixed 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="璁惧鍚嶇О" prop="name" sortable width="150" />
 
-      <el-table-column label="鏃堕棿" align="happenTime" sortable prop="happenTime" width="150">
+      <el-table-column label="鏃堕棿" align="happenTime" sortable prop="happenTime" width="140">
         <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
-      <el-table-column label="鏄惁娉ㄩ攢" align="center" sortable prop="status" width="120">
+      <el-table-column label="鏄惁娉ㄩ攢" align="center" sortable prop="status" width="140">
         <template slot-scope="scope">
           {{ getSrc1(scope.row.status) }}
         </template>
       </el-table-column>
-      <el-table-column label="璐拱浜�" prop="buyer" sortable width="100" />
+      <el-table-column label="璐拱浜�" prop="buyer" sortable width="140" />
       <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="location" sortable width="120" />
 
       <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="ownData" sortable width="150px" >
+        <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+      </el-table-column>
       <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="120" align="center">
 
         <template slot-scope="scope" >
@@ -249,8 +268,7 @@
           :http-request="requestUpload"
           :file-list="fileList"
         >
-          <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
-          <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
+          <i  slot="default" class="el-icon-plus"></i>
           <div slot="file" slot-scope="{file}">
             <img
               class="el-upload-list__item-thumbnail"
@@ -291,7 +309,8 @@
           :http-request="requestUpload"
           :show-file-list="true"
         >
-          <el-button type="primary">涓婁紶</el-button>
+          <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+          <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
           <template #tip>
             <div class="el-upload__tip">
             </div>

--
Gitblit v1.9.1