From 76a3eb05129f0af9f9b5798b1c8abbf9afaf7f19 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 27 八月 2024 17:59:26 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/self/show.vue | 82 +++++++++++++++-------------------------
1 files changed, 31 insertions(+), 51 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 79a9714..f1d9fe2 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -158,8 +158,8 @@
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
- <el-col :span="1.5">
+ <el-col :span="1.5">
<el-upload
action=""
@@ -174,53 +174,26 @@
</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-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-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>
+ <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 :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</div>
- <el-table v-loading="loading" border :data="noteList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="noteList" :row-key="getRowId1" 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" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
@@ -410,8 +383,7 @@
class="el-upload-list__item-thumbnail"
:src="file.url"
style="width: 147px; height: 147px"
- fit="cover"
- ></video>
+ fit="cover"></video>
<img v-else
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceLis.png"
@@ -941,7 +913,7 @@
<!-- 鍒嗕韩瀵硅瘽妗�1 -->
<el-dialog :title="title1" :visible.sync="open1" width="500px" append-to-body @close="handleClose2">
- <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId" ref="table1" @selection-change="handleSelectionChange1" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId2" ref="table1" @selection-change="handleSelectionChange1" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
<el-table-column label="韬唤" prop="identity" sortable width="130" >
@@ -976,7 +948,7 @@
</el-select>
</div>
- <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange2" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId3" ref="multipleTable" @selection-change="handleSelectionChange2" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column label="鏃堕棿" prop="happenTime" sortable :show-overflow-tooltip="true" width="150" align="center" >
<template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
@@ -1062,7 +1034,7 @@
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import axios from 'axios';
-//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
+//鍦ˊ/api/self/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
import {
getIndividualList, addIndividual, updateIndividual, delIndividual,
listExperience, addExperience, updateExperience, delExperience,
@@ -1623,7 +1595,15 @@
// this.single1 = selection.length!=1
// this.multiple1 = !selection.length
},
- getRowId(row)
+ getRowId1(row)
+ {
+ return row.id
+ },
+ getRowId2(row)
+ {
+ return row.id
+ },
+ getRowId3(row)
{
return row.id
},
@@ -1828,15 +1808,15 @@
editAutobiography(item) {
this.isEdit1 = true;
this.dialogVisible.autobiography = true;
- this.formDat = { ...item };
+ this.formDat = { item };
},
//闅旇鍙樿壊
tableRowClassName({row, rowIndex}) {
if (rowIndex % 2 == 0) {
- return "statistics-warning-row1";
- } else {
return "statistics-warning-row";
+ } else {
+ return "statistics-warning-row1";
}
return '';
},
--
Gitblit v1.9.1