From da1f13fac6dda0b4168d70bc9f7d68b03b1cc117 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 16 五月 2023 03:40:28 +0800
Subject: [PATCH] 1.修改了网站名以及在首页加上了备案号 2.各模块删除时不显示数据序号 3.各模块删除单条数据时不会再同时打开详情页 4.各模块新增重复数据可被检测并且提示不要输入重复数据 5.家根网页面更换了第三代的大图 6.收藏与荣誉模块显示和新增统一为“持有者”

---
 ruoyi-ui/src/views/collection/collectionInfo.vue |   93 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 80 insertions(+), 13 deletions(-)

diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index 4757ded..bd2665f 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="form-header mt">
       <h4 class="dt h4">鏀惰棌涓庤崳瑾夎缁嗕俊鎭� </h4>
-      <el-button type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" :disabled="btn">缂栬緫</el-button>
+<!--      <el-button v-if="isShow" type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>-->
       <!--      <br>-->
       <!--      <el-button type="primary" class="pt"   @click="handleExport"-->
       <!--                 v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
@@ -14,7 +14,7 @@
       <!--                  clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>-->
       <!--      </el-form-item>-->
       <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">
-        <el-input v-model="formData.type" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
+        <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
         </el-input>
       </el-form-item>
       <el-form-item label="绫诲埆" prop="type">
@@ -29,8 +29,8 @@
         <el-input v-model="formData.source" placeholder="璇疯緭鍏ユ潵婧�" clearable :style="{width: '100%'}" :disabled="dsb">
         </el-input>
       </el-form-item>
-      <el-form-item label="鎷ユ湁鑰�" prop="寮犱笁">
-        <el-input v-model="formData.owner" placeholder="璇疯緭鍏ユ嫢鏈夎��" clearable :style="{width: '100%'}" :disabled="dsb">
+      <el-form-item label="鎸佹湁鑰�" prop="owner">
+        <el-input v-model="formData.owner" placeholder="璇疯緭鍏ユ寔鏈夎��" clearable :style="{width: '100%'}" :disabled="dsb">
         </el-input>
       </el-form-item>
       <el-form-item label="浠峰��" prop="price">
@@ -64,22 +64,23 @@
             fit="cover"
             :preview-src-list="[file.url]"
           >
-          <span class="el-upload-list__item-actions">
+          <span class="el-upload-list__item-actions" >
         <span
+          v-if="isShow"
           class="el-upload-list__item-preview"
           @click="handlePictureCardPreview(file)"
         >
           <i class="el-icon-zoom-in"></i>
         </span>
         <span
-          v-if="!disabled"
+          v-if="isShow"
           class="el-upload-list__item-delete"
           @click="handleDownload(file.url)"
         >
           <i class="el-icon-download"></i>
         </span>
         <span
-          v-if="!disabled"
+          v-if="isShow"
           class="el-upload-list__item-delete"
           @click="handleRemove(file)"
         >
@@ -91,7 +92,7 @@
         </div>
       </el-upload>
 
-      <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+      <!--<h4 class="form-header">鍏朵粬闄勪欢 </h4>
       <el-upload
         action=""
         :file-list="fileListOther"
@@ -103,17 +104,68 @@
         :http-request="requestUpload"
         :show-file-list="true"
       >
-        <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+        <el-button v-if="isShow" type="primary" >鐐瑰嚮涓婁紶</el-button>
         <template #tip>
           <div class="el-upload__tip">
           </div>
         </template>
 
 
+      </el-upload>-->
+      <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+      <el-upload
+        action=""
+        :file-list="fileListOther"
+        class="upload-demo"
+        multiple
+        list-type="picture-card"
+        :on-preview="handleFileCardPreview"
+        :on-remove="handleRemove"
+        :http-request="requestUpload"
+        :show-file-list="true"
+      >
+
+        <i slot="default" class="el-icon-plus"></i>
+        <div slot="file" slot-scope="{file}">
+          <img
+            class="el-upload-list__item-thumbnail"
+            src="../../assets/401_images/401.gif"
+            alt=""
+            style="width: 147px; height: 147px"
+            fit="cover"
+          >
+          <span class="el-upload-list__item-actions">
+                <span v-if="isShow"
+                  class="el-upload-list__item-preview"
+                  @click="handleFileCardPreview(file)"
+                >
+                  <i class="el-icon-zoom-in"></i>
+                </span>
+                <span
+                  v-if="isShow"
+                  @click="handleRemove(file)"
+                  class="el-upload-list__item-delete"
+
+                >
+                  <i class="el-icon-download"></i>
+                </span>
+                <span
+                  v-if="isShow"
+                  class="el-upload-list__item-delete"
+                  @click="handleRemoveFile(file)"
+                >
+                  <i class="el-icon-delete"></i>
+                </span>
+              </span>
+
+
+        </div>
+
+
       </el-upload>
 
       <el-form-item size="large">
-        <el-button type="primary" @click="submitForm" :disabled="dsb" >淇敼</el-button>
+        <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb" >淇敼</el-button>
       </el-form-item>
     </el-form>
 
@@ -145,7 +197,7 @@
       ],
       dsb:true,
       btn:false,
-
+      isShow:true,
       // 鏀惰棌涓庤崳瑾夎〃鏍兼暟鎹�
      collectionList: [],
 
@@ -188,7 +240,7 @@
         }],
         owner: [{
           required: true,
-          message: '璇疯緭鍏ユ嫢鏈夎��',
+          message: '璇疯緭鍏ユ寔鏈夎��',
           trigger: 'blur'
         }],
         price: [{
@@ -228,6 +280,7 @@
     else{
       document.title = "鏌ョ湅鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";
       this.$route.meta.title = "鏌ョ湅鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
+      this.isShow=false
     }
 
     let _this = this
@@ -300,6 +353,10 @@
     resetForm() {
       this.$refs['elForm'].resetFields()
     },
+    // //杩斿洖涓婁竴椤�
+    // goBack(){
+    //   this.$router.push("/familymodel/collection/index" );
+    // },
     handlePreview(file)
     {
       let formData = {'path':"/"+file.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
@@ -318,6 +375,12 @@
     },
     handleRemove(file) {
       alert(323)
+    },
+    handleFileCardPreview(file){
+      this.dialogFileUrl = file.url;
+      const Base64 = require('js-base64').Base64
+      this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+      myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
     },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
@@ -339,7 +402,8 @@
     handleEdit()
     {
       this.dsb = false
-      this.btn = true
+      // this.btn = true
+      this.isShow=false
     },
     requestUpload(params)
     {
@@ -378,6 +442,9 @@
 </script>
 
 <style scoped>
+.app-container{
+  background-color: #FEF7FC;
+}
 .mt
 {
   position: relative;

--
Gitblit v1.9.1