From bcac500a760877dc9140f1f381739793706c1af6 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 10 十一月 2023 10:29:38 +0800
Subject: [PATCH] 修改图片大小

---
 ruoyi-ui/src/views/clean/index.vue |  418 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 250 insertions(+), 168 deletions(-)

diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 2bd5233..2852fe3 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -6,7 +6,10 @@
             v-model="queryParams.kind"
             placeholder="鎵�鏈夌被鍨�"
             clearable
-            style="width: 240px"
+            style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
           >
             <el-option
               v-for="dict in typeOptions"
@@ -20,7 +23,10 @@
               v-model="queryParams.suitable"
               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>
@@ -29,7 +35,10 @@
               v-model="queryParams.type"
               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>
@@ -38,7 +47,10 @@
               v-model="queryParams.method"
               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>
@@ -52,7 +64,7 @@
             border-radius: 6px 6px 6px 6px;opacity:1;">閲嶇疆</el-button>
         </el-form-item>
       </el-form>
-  
+
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button
@@ -64,7 +76,7 @@
             v-hasPermi="['system:role:add']"
           >鏂板</el-button>
         </el-col>
-  
+
         <el-col :span="1.5">
           <el-button
             type="danger"
@@ -86,18 +98,18 @@
             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"
+              @click="handleExportTemplate"
               v-hasPermi="['family:note:export']"
             >瀵煎叆妯℃澘涓嬭浇</el-button>
           </el-col>
-          <el-col :span="1.2">
+          <el-col :span="1.5">
             <el-upload
               action=""
               class="upload-demo"
@@ -106,77 +118,84 @@
             >
               <el-button size="mini"   type="primary"
               plain
-              icon="el-icon-plus" >瀵煎叆</el-button>
-  
+             icon="el-icon-top" >瀵煎叆</el-button>
+
             </el-upload>
           </el-col>
-  
+
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
-  
-      <el-table v-loading="loading" :data="cleanList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
-        <el-table-column type="selection" width="55"  align="center" />
-        <el-table-column label="绫诲瀷" prop="kind" sortable width="120" >
+
+      <el-table v-loading="loading" :data="cleanList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
+        <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="80"/>
+
+        <el-table-column label="绫诲瀷" prop="kind" sortable width="80px" >
           <template slot-scope="scope">
           {{ getSrc1(scope.row.kind) }}
            </template>
           </el-table-column>
-        <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
-        <el-table-column label="閫傜敤浜�" prop="suitable" sortable :show-overflow-tooltip="true" width="150" />
+       <el-table-column label="閫傜敤浜�" prop="suitable" sortable :show-overflow-tooltip="true" width="110px" />
         <el-table-column label="绫诲埆" prop="type" sortable width="100" />
-        <el-table-column label="淇濇磥鏂规硶" prop="method" sortable width="100" />
-        <el-table-column label="鏉愭枡瀛樻斁鍦�" prop="location" sortable width="120" />
-        <el-table-column label="鏀剧疆鍦扮偣" prop="place" sortable width="100" />
-        <el-table-column label="鍙戠敓鏃堕棿" align="center" sortable prop="happenTime" width="180">
-         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.happenTime) }}</span>
-         </template>
+        <el-table-column label="淇濇磥鏂规硶" prop="method" sortable width="120" />
+        <el-table-column label="鏉愭枡瀛樻斁鍦�" prop="location" sortable width="140" />
+        <el-table-column label="鏀剧疆鍦扮偣" prop="place" sortable width="120" />
+        <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="150" align="center">
+          <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
         </el-table-column>
-        <el-table-column label="澶囨敞" prop="remark" sortable width="100" />
-        <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="100" >
-             <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
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['familymodel:clean:info']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:role:remove']"
-          >鍒犻櫎</el-button>
-          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:clean:info']">
-            <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
+        <el-table-column label="澶囨敞" prop="remark" sortable width="70px" />
+        <el-table-column label="鏈搴褰�" prop="ownData" sortable width="110px" >
+          <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+        </el-table-column>
+        <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
 
-          </el-dropdown>
+          <template slot-scope="scope" >
+            <div  @click="handleCheck(scope.row)">
+              <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 === '' || scope.row.url === ',' || scope.row.url === null)"
+              >
+              <img
+                v-else
+                class="el-upload-list__item-thumbnail"
+                src="../../assets/images/deviceA.png"
+                alt=""
+                style="width: 35px; height: 35px;"
+                fit="cover"
+
+              ></div>
+          </template>
+        </el-table-column>
+        <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
+          <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+            <div class="button-container">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['familymodel:clean:info']"
+              >淇敼</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:role:remove']"
+              >鍒犻櫎</el-button>
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:clean:info']">
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
+
+              </el-dropdown>
+            </div>
         </template>
       </el-table-column>
       </el-table>
-  
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -185,11 +204,11 @@
         @pagination="getList"
         style="background: #FEF7FC;"
       />
-  
+
       <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
       <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
         <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
-  
+
             <el-form-item label="绫诲瀷" prop="kind">
         <el-select v-model="formDat.kind" placeholder="璇烽�夋嫨绫诲瀷" clearable :style="{width: '100%'}"  >
           <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
@@ -204,10 +223,9 @@
             </el-input>
           </el-form-item>
           <el-form-item label="鏃堕棿" prop="happenTime">
-           <el-date-picker
-            v-model='formDat.happenTime'
-            type='createDate'
-            placeholder='閫夋嫨鏃ユ湡'></el-date-picker>
+            <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                            :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
+            ></el-date-picker>
           </el-form-item>
           <el-form-item label="淇濇磥鏂规硶" prop="method">
             <el-input v-model="formDat.method" placeholder="璇疯緭鍏ヤ繚娲佹柟娉�" clearable :style="{width: '100%'}" >
@@ -221,47 +239,47 @@
             <el-input v-model="formDat.location" 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>
-  
+
           <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
           <el-upload
             action="#"
+            accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
             list-type="picture-card"
             multiple
             :http-request="requestUpload"
             :file-list="fileList"
           >
             <i slot="default" class="el-icon-plus"></i>
-            <div slot="file" slot-scope="{file}">
-              <img
-                class="el-upload-list__item-thumbnail"
-                :src="file.url"
-                alt=""
-                style="width: 126px; height: 126px"
-                fit="cover"
-                :preview-src-list="[file.url]"
-              >
+            <div slot="file" slot-scope="{ file }">
+              <template v-if="fileList">
+                <img
+                  class="el-upload-list__item-thumbnail"
+                  :src="file.url"
+                  alt=""
+                  style="width: 100%; height: 100%; object-fit: cover;"
+                  fit="cover"
+                  :preview-src-list="[file.url]"
+                >
+              </template>
               <span class="el-upload-list__item-actions">
-          <span
-            class="el-upload-list__item-preview"
-            @click="handlePictureCardPreview(file)"
-          >
-            <i class="el-icon-zoom-in"></i>
-          </span>
-  
-          <span
-            v-if="!disabled"
-            class="el-upload-list__item-delete"
-            @click="handleRemove(file)"
-          >
-            <i class="el-icon-delete"></i>
-          </span>
-        </span>
-  
-  
+      <span
+        class="el-upload-list__item-preview"
+        @click="handlePictureCardPreview(file)"
+      >
+        <i class="el-icon-zoom-in"></i>
+      </span>
+      <span
+        v-if="!disabled"
+        class="el-upload-list__item-delete"
+        @click="handleRemove(file)"
+      >
+        <i class="el-icon-delete"></i>
+      </span>
+    </span>
             </div>
           </el-upload>
           <h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -270,43 +288,46 @@
             :file-list="fileListOther"
             class="upload-demo"
             multiple
-  
-            :on-remove="handleRemove"
-            :http-request="requestUpload"
+
+            :on-remove="handleRemoveFile"
+            :http-request="requestUpload1"
             :show-file-list="true"
           >
+
             <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+            <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
             <template #tip>
               <div class="el-upload__tip">
               </div>
             </template>
           </el-upload>
-  
+
         </el-form>
         <h4 class="form-header"> </h4>
-  
+
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
           <el-button @click="cancelData">鍙� 娑�</el-button>
         </div>
       </el-dialog>
-  
+
       <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
       <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
-  
+
       </el-dialog>
-  
+
     </div>
   </template>
-  
+
   <script>
   import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
   import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-  
-  
-  
+
+
+
   //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�
   import {listClean,enload,delClean, addClean, uploadPic} from "@/api/clean/index";
+  import {Message} from "element-ui";
   export default {
     name: "Role",
     dicts: ['sys_normal_disable'],
@@ -314,7 +335,7 @@
       return {
         // 閬僵灞�
         disabled: false,
-  
+
         loading: true,
         formData:[],
         // 閫変腑鏁扮粍
@@ -346,10 +367,11 @@
         fileList:[
         ],
         fileListOther:[
-  
+
         ],
         dsb:true,
         btn:false,
+        uploading: false,
         formDat: {
           type: undefined,
           kind: undefined,
@@ -360,7 +382,7 @@
           remark: undefined,
           happenTime: undefined,
           url: undefined,
-  
+
         },
         // 鑿滃崟鍒楄〃
         menuOptions: [],
@@ -429,7 +451,7 @@
     created() {
       this.getList();
       this.getCateInfor()
-  
+
     },
     methods: {
     //
@@ -445,7 +467,10 @@
         this.open = false;
         this.reset();
       },
-  
+    getRowId(row)
+    {
+      return row.id
+    },
       //闅旇鍙樿壊
       tableRowClassName({ row, rowIndex }) {
         if (rowIndex % 2 == 0) {
@@ -454,20 +479,20 @@
           return "statistics-warning-row";
         }
       },
-  
+
       /** 鏌ヨ瑙掕壊鍒楄〃 */
       getList() {
         this.loading = true;
         this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
         this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
-  
+
         // console.log(this.queryParams)
         //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         listClean(this.queryParams).then(response => {
             //  alert(123)
             //   console.log(response.data)
             this.cleanList = response.data.data;
-  
+
             this.total = response.data.total;
             this.loading = false;
           }
@@ -478,20 +503,21 @@
       {
         let _this = this
         getCategory().then(response=>{
-  
+
           response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
             _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
           })
         })
       },
-  
+
       handleRemove(file) {
-        for(let i = 0; i < this.fileListOther.length; i++)
+        for(let i = 0; i < this.fileList.length; i++)
         {
-          if(this.fileListOther[i].url==file.url)
-            this.$delete(this.fileListOther,i);
+          if(this.fileList[i].url==file.url)
+            this.$delete(this.fileList,i);
         }
       },
+
       // 鍙栨秷鎸夐挳
       cancel() {
         this.open = false;
@@ -543,7 +569,7 @@
         this.single = selection.length!=1
         this.multiple = !selection.length
       },
-  
+
       /** 鏂板鎸夐挳鎿嶄綔 */
       handleAdd() {
         this.reset();
@@ -559,7 +585,7 @@
       handleUpdate(row) {
         const id = row.id;
         let jd = true
-  
+
         this.$router.push({
           path:"/familymodel/clean/cleanInfo/" + id,
           query:{
@@ -567,23 +593,22 @@
           }
         });
       },
-  
-  
+
+
       handlePictureCardPreview(file) {
         this.dialogImageUrl = file.url;
         this.dialogVisible = true;
       },
       handleRemoveFile(file,) {
-  
-  for(let i = 0; i < this.fileListOther.length; i++)
-  {
-    if(this.fileListOther[i].url==file.url)
-      this.$delete(this.fileListOther,i);
-  }
-},
+        for(let i = 0; i < this.fileListOther.length; i++)
+        {
+          if(this.fileListOther[i].url==file.url)
+            this.$delete(this.fileListOther,i);
+        }
+      },
       /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
       submitDataScope: function() {
-  
+
         let ul = this.fileList.map(function (elem){
           return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
         }).join(",")
@@ -593,42 +618,79 @@
         this.formDat.url = ul+","+uls
         this.$refs["elForm"].validate(valid => {
           if (valid) {
-  
+
             addClean(this.formDat).then(response => {
               this.$modal.msgSuccess("鏂板鎴愬姛");
               this.open = false;
+              // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+              Object.keys(this.formDat).forEach(key => {
+                this.formDat[key] = '';
+              });
+              for(let i = 0; i <= this.fileList.length; i++)
+              {
+                this.handleRemove(this.fileList[0]);
+              }
+              for(let i = 0; i < this.fileListOther.length; i++){
+                this.handleRemoveFile(this.fileListOther[0]);
+              }
               this.getList();
             });
           }
         });
+
       },
-      requestUpload(params)
+      requestUpload(params) {
+
+        var file = params.file;
+        var formData = new FormData();
+        formData.append('uploadFile', file);
+        let _this = this
+        this.uploading1 = true;
+        uploadPic(formData).then(response => {
+          let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+          this.uploading1 = false;
+          this.$modal.msgSuccess("涓婁紶鎴愬姛");
+          if(_this.fot.includes(pth) === true)
+          {
+            _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+
+          }
+
+          else{
+            // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+          }
+        })
+      },
+      requestUpload1(params)
       {
         var file = params.file;
         var formData = new FormData();
         formData.append('uploadFile', file);
         let _this = this
-  
+        this.uploading = true;
         uploadPic(formData).then(response => {
           let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-  
-          if(_this.fot.includes(pth) === true)
+          this.uploading = false;
+          this.$modal.msgSuccess("涓婁紶鎴愬姛");
+          if(_this.fot.includes(pth) !== true)
           {
-            _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-  
-          }
-  
-          else{
+            // _this.fileList.push({name:response.data.fileName, "url":response.data.url})
             _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-  
+
           }
+
+          // else{
+          //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+          //
+          // }
         })
-  
+
       },
       /** 鍒犻櫎鎸夐挳鎿嶄綔 */
       handleDelete(row) {
         const Ids = row.id || this.ids;
-        this.$modal.confirm('鏄惁纭鍒犻櫎璧勪骇缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+        this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() {
           return delClean(Ids);
         }).then(() => {
           this.getList();
@@ -637,38 +699,58 @@
       },
       /** 瀵煎嚭鎸夐挳鎿嶄綔 */
       handleExport() {
-        this.download('/zfEconomy/export', {
+        const Ids = this.ids;
+
+        if(Ids.length==0)
+        {
+        this.download('/zfClean/export', {
           ...this.queryParams
         }, `clean_${new Date().getTime()}.xlsx`)
+        }else{
+          this.download('/zfClean/export1/'+Ids, {
+
+          }, `clean_${new Date().getTime()}.xlsx`)
+        }
       },
+      handleExportTemplate() {
+        this.download('/zfClean/model', {
+
+        }, `clean_${new Date().getTime()}.xlsx`)
+      },
+
       /** 瀵煎叆鎿嶄綔*/
       handleEnport(params){
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('excelImport', file);
-      let _this = this
-      alert(file)
-      enload(formData).then(response => {
-         _this.getList();
-        Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
-  
-      }).catch(err)
-      {
-        Message({ message: "瀵煎叆澶辫触", type: 'error' })
+        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' })
+        }
+
       }
-  
-      }
+
     }
   };
   </script>
   <style>
   .el-table__row.statistics-warning-row {
     background: #E0EEFE;
-  
+
   }
   .el-table__row.statistics-warning-row1 {
     background: #FFEFF2;
-  
+
+  }
+  .el-table__cell {
+    font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+  }
+  .button-container {
+    display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
   }
   </style>
-  
\ No newline at end of file

--
Gitblit v1.9.1