From 82892af0b74f02df34eb2f9833da0d4c373e59b8 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期四, 29 八月 2024 23:11:15 +0800 Subject: [PATCH] 家庭号可以重复了 --- ruoyi-ui/src/views/note/index.vue | 107 +++++++++++++++++++++++++++++------------------------ 1 files changed, 59 insertions(+), 48 deletions(-) diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue index d5885ae..fa96064 100644 --- a/ruoyi-ui/src/views/note/index.vue +++ b/ruoyi-ui/src/views/note/index.vue @@ -143,52 +143,28 @@ </el-upload> </el-col> - <el-col :span="1.5"> - <el-button - type="primary" - plain - icon="el-icon-top" - size="mini" - :disabled="multiple" - @click="handleShare" - - >鍒嗕韩</el-button> - </el-col> - - <el-col :span="1.5"> - <el-button - type="primary" - plain - icon="el-icon-top" - size="mini" - @click="handleWho" - >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button> - </el-col> - - <el-col :span="1.5"> - <el-button - type="primary" - plain - icon="el-icon-top" - size="mini" - @click="whoShare" - >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button> - </el-col> - - <el-col :span="1.5"> - <el-button - type="primary" - plain - icon="el-icon-top" - size="mini" - @click="showData" - >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button> - </el-col> - - <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> + <el-dropdown placement="鍒嗕韩鐩稿叧"> + <el-button size="mini" type="primary" + plain + icon="el-icon-top">鍒嗕韩鐩稿叧</el-button> + <template #dropdown> + <el-dropdown-menu> + <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item> + + <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item> + <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item> + <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item> + </el-dropdown-menu> + </template> + </el-dropdown> + + + + <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> + </el-row> - <el-table v-loading="loading" :data="propertyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"> + <el-table v-loading="loading" border aria-autocomplete="":data="propertyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"> <el-table-column type="selection" width="55" align="center" /> <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="100"/> @@ -273,7 +249,7 @@ <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 --> <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 ref="elForm" border :model="formDat" :rules="rules" size="medium" label-width="100px"> <!-- <el-form-item label="绫诲埆" prop="type">--> <!-- <el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" ></el-input>--> <!-- </el-form-item>--> @@ -371,10 +347,44 @@ list-type="picture-card" :http-request="requestUpload1" > - <template #tip> + <!-- <template #tip> <div class="el-upload__tip"> </div> - </template> + </template> --> + + <i slot="default" class="el-icon-plus"></i> + <div slot="file" slot-scope="{file}"> + <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 --> + <video + v-if="file.url.includes('.mp4')" + class="el-upload-list__item-thumbnail" + :src="file.url" + style="width: 147px; height: 147px" + fit="cover" + ></video> + <img v-else + class="el-upload-list__item-thumbnail" + src="../../assets/images/deviceLis.png" + alt="" + style="width: 100%; height: 100%" + fit="cover"></img> + + <span class="el-upload-list__item-actions"> + <span class="el-upload-list__item-name">{{ file.name }}</span> + + + <span + + class="el-upload-list__item-delete" + @click="handleRemoveFile(file)" + > + <i class="el-icon-delete"></i> + </span> + </span> + + </div> + + </el-upload> <el-button style="margin-left: 10px" @@ -594,12 +604,13 @@ menuNodeAll: false, deptExpand: true, deptNodeAll: false, + valueFromParent: '瀹跺涵璧勪骇', // 鏃ユ湡鑼冨洿 dateRange: [], // 鏁版嵁鑼冨洿閫夐」 // 鏁版嵁鑼冨洿閫夐」 fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx', - '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'], + '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'], fileList:[ ], -- Gitblit v1.9.1