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 ++++++++++-----------------
ruoyi-ui/src/views/selfeconomy/index.vue | 55 +++++++++--------
ruoyi-ui/src/layout/components/Navbar.vue | 15 +++--
ruoyi-ui/src/views/login.vue | 4
4 files changed, 71 insertions(+), 85 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 97b87fe..2be56e8 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -8,7 +8,7 @@
<div class="right-menu">
<template v-if="device!=='mobile'">
<!-- <search id="header-search" class="right-menu-item" />
-
+
<el-tooltip content="婧愮爜鍦板潃" effect="dark" placement="bottom">
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
</el-tooltip>
@@ -16,9 +16,9 @@
<el-tooltip content="鏂囨。鍦板潃" effect="dark" placement="bottom">
<ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
</el-tooltip>
- -->
+ -->
<el-tooltip effect="dark" placement="bottom">
- <h1 class="right-menu-item hover-effect" style="text-align: center;display:
+ <h1 class="right-menu-item hover-effect" style="text-align: center;display:
block;line-height: 50px;">{{greeting}}</h1>
</el-tooltip>
<screenfull id="screenfull" class="right-menu-item hover-effect" />
@@ -28,7 +28,7 @@
</el-tooltip>
</template>
-
+
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
<img :src="avatar" class="user-avatar">
@@ -76,19 +76,21 @@
return {
greeting: "",
-
+
};
},
+
mounted() {
this.setGreeting();
},
+
computed: {
...mapGetters([
'sidebar',
'avatar',
'device'
]),
-
+
setting: {
get() {
return this.$store.state.settings.showSettings
@@ -124,6 +126,7 @@
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
+
async logout() {
this.$confirm('纭畾娉ㄩ攢骞堕��鍑虹郴缁熷悧锛�', '鎻愮ず', {
confirmButtonText: '纭畾',
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index b030f3a..3f7715b 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -118,8 +118,8 @@
</el-form>
<!-- 搴曢儴 -->
<div class="el-login-footer" >
- <span style="color: black; ">Copyright 漏 GDUT All Rights Reserved.<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></span>
- <a href="https://beian.miit.gov.cn/" target="_blank" style="color: black; ">绮CP澶�2023050334鍙�<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>鍏畨澶囨鍙�44010402003045</a>
+ <span style="color: black; ">Copyright 漏 GDUT All Rights Reserved.<span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></span>
+ <a href="https://beian.miit.gov.cn/" target="_blank" style="color: black; ">绮CP澶�2023050334鍙�<span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>鍏畨澶囨鍙�44010402003045</a>
</div>
</div>
</template>
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 '';
},
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 282625b..5ac7589 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -145,7 +145,7 @@
<el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
</el-dropdown-menu>
</template>
- </el-dropdown>
+ </el-dropdown>
@@ -154,8 +154,8 @@
</el-row>
</div>
- <el-table v-loading="loading" border :data="selfeconomyList" :row-key="getRowId" 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 v-loading="loading" border :data="selfeconomyList" :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" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
<el-table-column label="鏃ユ湡" prop="happenTime" sortable width="100" align="center">
<template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
@@ -208,10 +208,10 @@
></div>
</template>
</el-table-column>
- <el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
+ <el-table-column label="澶囨敞" prop="remark" sortable align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
+ <el-table-column label="鎿嶄綔" align="center" width="220" class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<div class="button-container">
<el-button
@@ -337,10 +337,9 @@
:preview-src-list="[file.url]"
>
<span class="el-upload-list__item-actions">
- <span
- class="el-upload-list__item-preview"
- @click="handlePictureCardPreview(file)"
- >
+ <span
+ class="el-upload-list__item-preview"
+ @click="handlePictureCardPreview(file)">
<i class="el-icon-zoom-in"></i>
</span>
@@ -448,7 +447,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="getRowId1" 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" >
@@ -483,7 +482,7 @@
</el-select>
</div>
- <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId2" 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 width="100" align="center">
<template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
@@ -582,15 +581,15 @@
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-import {getInfo} from "@/api/login";
+ import {getInfo} from "@/api/login";
//瀵煎叆鎺ュ彛鍑芥暟
import {listSelfEconomy, getSelfEconomyInfo,enload, addSelfEconomy,delSelfEconomy, updateSelfEconomy,uploadPic,downloadModel,
share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
} from "@/api/selfeconomy/index";
-import {listUserAll} from "@/api/root/index";
-import { Notification, MessageBox, Message, Loading } from 'element-ui'
+ import {listUserAll} from "@/api/root/index";
+ import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
@@ -630,6 +629,7 @@
multiple1: true,
dateRange1: [],
+ selfeconomyList: [],
userId: undefined,
// 閬僵灞�
@@ -647,6 +647,7 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
+ total1: 0,
// 鐧惧勾蹇冩効琛ㄦ牸鏁版嵁
wishList: [],
// 寮瑰嚭灞傛爣棰�
@@ -794,10 +795,12 @@
};
},
created() {
- this.getList1()
+ this.getList1();
this.getList();
- // this.getCateInfor()
- this.getInfo()
+
+ //this.getCateInfor();
+ this.getInfo();
+
// for (let i = 0; i < this.contactList.length; i++) {
// this.formDat[i] = this.contactList[i];
// }
@@ -931,14 +934,6 @@
// this.single1 = selection.length!=1
// this.multiple1 = !selection.length
},
- getRowId1(row)
- {
- return row.id
- },
- getRowId2(row)
- {
- return row.id
- },
getList1() {
this.loading1 = true;
this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
@@ -999,7 +994,15 @@
this.open = false;
this.reset();
},
- getRowId(row)
+ getRowId1(row)
+ {
+ return row.id
+ },
+ getRowId2(row)
+ {
+ return row.id
+ },
+ getRowId3(row)
{
return row.id
},
--
Gitblit v1.9.1