From a52f8c508d08014d1a153cfc02e12b5fc185a3a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 11 七月 2024 15:28:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/newsDz.vue | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/admin/src/views/business/newsDz.vue b/admin/src/views/business/newsDz.vue
index 6ced12e..6ff929b 100644
--- a/admin/src/views/business/newsDz.vue
+++ b/admin/src/views/business/newsDz.vue
@@ -20,7 +20,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:news:create', 'business:news:delete']">
- <li><el-button type="primary" @click="$refs.operaNewsWindow.open('鏂板缓璧勮鍜屽畾鍒舵湇鍔′俊鎭〃')" icon="el-icon-plus" v-permissions="['business:news:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaNewsWindow.open('鏂板缓瀹氬埗鏈嶅姟淇℃伅')" icon="el-icon-plus" v-permissions="['business:news:create']">鏂板缓</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:news:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
@@ -30,8 +30,22 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>
- <el-table-column prop="subTitle" label="鍓爣棰�" min-width="100px"></el-table-column>
+ <el-table-column prop="title" label="鏍囬" fixed min-width="100px"></el-table-column>
+ <el-table-column prop="subTitle" label="鍓爣棰�" fixed min-width="100px"></el-table-column>
+ <el-table-column prop="fileList" label="闄勪欢" align="center" fixed min-width="100px">>
+ <template slot-scope="{row}">
+ <div v-if="row.fileList!=null && row.fileList.length" class="image-container">
+ <el-image
+ v-if="row.fileList[0].type !=1 && row.fileList[0].fileurlFull"
+ class="image-item"
+ :src="row.fileList[0].fileurlFull"
+ fit="fill"
+ :preview-src-list="[row.fileList[0].fileurlFull]">
+ </el-image>
+ <video v-if="row.fileList[0].type ==1 && row.fileList[0].fileurlFull" style="width: 60px;height: 60px" controls autoplay :src="row.fileList[0].fileurlFull"></video>
+ </div>
+ </template>
+ </el-table-column>
<el-table-column prop="linkType" label="璺宠浆绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.linkType ==0">瀵屾枃鏈�</span>
@@ -45,14 +59,10 @@
</template>
</el-table-column>
<el-table-column prop="lookNum" label="娴忚閲�" min-width="80px"></el-table-column>
- <el-table-column prop="donwloadNum" label="涓嬭浇閲�" min-width="80px"></el-table-column>
<el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
<el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="publishDate" label="鏈�杩戝彂甯冩椂闂�" min-width="100px"></el-table-column>
- <el-table-column prop="publishUserName" label="鏈�杩戝彂甯冧汉" min-width="100px"></el-table-column>
- <el-table-column prop="publishInfo" label="鏈�杩戝彂甯冨娉�" min-width="100px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:news:update', 'business:news:delete'])"
label="鎿嶄綔"
@@ -60,7 +70,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaNewsWindow.open('缂栬緫璧勮鍜屽畾鍒舵湇鍔′俊鎭〃', row)" icon="el-icon-edit" v-permissions="['business:news:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.operaNewsWindow.open('缂栬緫瀹氬埗鏈嶅姟淇℃伅', row)" icon="el-icon-edit" v-permissions="['business:news:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:news:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -73,7 +83,7 @@
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaNewsWindow ref="operaNewsWindow" @success="handlePageChange"/>
+ <OperaNewsDzWindow ref="operaNewsWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -81,11 +91,11 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import OperaNewsWindow from '@/components/business/OperaNewsWindow'
+import OperaNewsDzWindow from '@/components/business/OperaNewsDzWindow'
export default {
name: 'News',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaNewsWindow },
+ components: { TableLayout, Pagination, OperaNewsDzWindow },
data () {
return {
// 鎼滅储
--
Gitblit v1.9.3