From 0d915fa05f1521db346e05180aecc5bab7d2cc22 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期日, 04 八月 2024 18:16:40 +0800
Subject: [PATCH] 完成了分享模块
---
ruoyi-ui/src/api/economy/index.js | 50 +
ruoyi-ui/src/api/collection/index.js | 51 +
ruoyi-ui/src/views/device/index.vue | 383 ++++++++++
ruoyi-ui/src/views/contacts/index.vue | 398 ++++++++++
ruoyi-ui/src/views/clean/index.vue | 381 ++++++++++
ruoyi-ui/src/api/contacts/index.js | 51 +
ruoyi-ui/src/api/device/index.js | 51 +
ruoyi-ui/src/views/economy/index.vue | 376 ++++++++++
ruoyi-ui/src/api/clean/index.js | 51 +
ruoyi-ui/src/views/collection/index.vue | 389 ++++++++++
10 files changed, 2,174 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/api/clean/index.js b/ruoyi-ui/src/api/clean/index.js
index ecbbe35..5ce77fd 100644
--- a/ruoyi-ui/src/api/clean/index.js
+++ b/ruoyi-ui/src/api/clean/index.js
@@ -77,3 +77,54 @@
data: data
})
}
+
+// -------------------------------
+// 鍒嗕韩
+export function share(data) {
+ return request({
+ url: '/zfCleanShare/share',
+ method: 'post',
+ data: data
+ })
+}
+// 鏌ョ湅鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�
+export function shareToWho(data,query) {
+ return request({
+ url: '/zfCleanShare/getInfoByUserId',
+ method: 'post',
+ data: data,
+ params: query
+ })
+}
+// 鏌ョ湅璋佸垎浜簡鏁版嵁
+export function getWhoShare(query) {
+ return request({
+ url: '/zfCleanShare/getInfoByShareId',
+ method: 'get',
+ params: query
+ })
+}
+// 涓嬭浇鍒嗕韩鐨勬暟鎹�
+export function downShareData(data) {
+ return request({
+ url: '/zfCleanShare/downloadDate',
+ method: 'post',
+ data: data
+ })
+}
+// 鏀跺洖鍒嗕韩鏁版嵁
+export function deleteShareData(data) {
+ return request({
+ url: '/zfCleanShare/deleteInfoByUserId',
+ method: 'post',
+ data: data
+ })
+}
+// 灞曠ず涓嬭浇鐨勬暟鎹�
+export function showShareData(query) {
+ return request({
+ url: '/zfCleanShare/all',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/ruoyi-ui/src/api/collection/index.js b/ruoyi-ui/src/api/collection/index.js
index 14bf1d0..46f42bb 100644
--- a/ruoyi-ui/src/api/collection/index.js
+++ b/ruoyi-ui/src/api/collection/index.js
@@ -80,3 +80,54 @@
data: data
})
}
+
+// -------------------------------
+// 鍒嗕韩
+export function share(data) {
+ return request({
+ url: '/zfCollectionShare/share',
+ method: 'post',
+ data: data
+ })
+}
+// 鏌ョ湅鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�
+export function shareToWho(data,query) {
+ return request({
+ url: '/zfCollectionShare/getInfoByUserId',
+ method: 'post',
+ data: data,
+ params: query
+ })
+}
+// 鏌ョ湅璋佸垎浜簡鏁版嵁
+export function getWhoShare(query) {
+ return request({
+ url: '/zfCollectionShare/getInfoByShareId',
+ method: 'get',
+ params: query
+ })
+}
+// 涓嬭浇鍒嗕韩鐨勬暟鎹�
+export function downShareData(data) {
+ return request({
+ url: '/zfCollectionShare/downloadDate',
+ method: 'post',
+ data: data
+ })
+}
+// 鏀跺洖鍒嗕韩鏁版嵁
+export function deleteShareData(data) {
+ return request({
+ url: '/zfCollectionShare/deleteInfoByUserId',
+ method: 'post',
+ data: data
+ })
+}
+// 灞曠ず涓嬭浇鐨勬暟鎹�
+export function showShareData(query) {
+ return request({
+ url: '/zfCollectionShare/all',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/ruoyi-ui/src/api/contacts/index.js b/ruoyi-ui/src/api/contacts/index.js
index 8e0f286..ad2b935 100644
--- a/ruoyi-ui/src/api/contacts/index.js
+++ b/ruoyi-ui/src/api/contacts/index.js
@@ -70,3 +70,54 @@
data: data
})
}
+
+// -------------------------------
+// 鍒嗕韩
+export function share(data) {
+ return request({
+ url: '/zfContactShare/share',
+ method: 'post',
+ data: data
+ })
+}
+// 鏌ョ湅鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�
+export function shareToWho(data,query) {
+ return request({
+ url: '/zfContactShare/getInfoByUserId',
+ method: 'post',
+ data: data,
+ params: query
+ })
+}
+// 鏌ョ湅璋佸垎浜簡鏁版嵁
+export function getWhoShare(query) {
+ return request({
+ url: '/zfContactShare/getInfoByShareId',
+ method: 'get',
+ params: query
+ })
+}
+// 涓嬭浇鍒嗕韩鐨勬暟鎹�
+export function downShareData(data) {
+ return request({
+ url: '/zfContactShare/downloadDate',
+ method: 'post',
+ data: data
+ })
+}
+// 鏀跺洖鍒嗕韩鏁版嵁
+export function deleteShareData(data) {
+ return request({
+ url: '/zfContactShare/deleteInfoByUserId',
+ method: 'post',
+ data: data
+ })
+}
+// 灞曠ず涓嬭浇鐨勬暟鎹�
+export function showShareData(query) {
+ return request({
+ url: '/zfContactShare/all',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/ruoyi-ui/src/api/device/index.js b/ruoyi-ui/src/api/device/index.js
index 96b7aab..b1078e7 100644
--- a/ruoyi-ui/src/api/device/index.js
+++ b/ruoyi-ui/src/api/device/index.js
@@ -82,4 +82,55 @@
// })
// }
+// -------------------------------
+// 鍒嗕韩
+export function share(data) {
+ return request({
+ url: '/zfEquipmentShare/share',
+ method: 'post',
+ data: data
+ })
+}
+// 鏌ョ湅鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�
+export function shareToWho(data,query) {
+ return request({
+ url: '/zfEquipmentShare/getInfoByUserId',
+ method: 'post',
+ data: data,
+ params: query
+ })
+}
+// 鏌ョ湅璋佸垎浜簡鏁版嵁
+export function getWhoShare(query) {
+ return request({
+ url: '/zfEquipmentShare/getInfoByShareId',
+ method: 'get',
+ params: query
+ })
+}
+// 涓嬭浇鍒嗕韩鐨勬暟鎹�
+export function downShareData(data) {
+ return request({
+ url: '/zfEquipmentShare/downloadDate',
+ method: 'post',
+ data: data
+ })
+}
+// 鏀跺洖鍒嗕韩鏁版嵁
+export function deleteShareData(data) {
+ return request({
+ url: '/zfEquipmentShare/deleteInfoByUserId',
+ method: 'post',
+ data: data
+ })
+}
+// 灞曠ず涓嬭浇鐨勬暟鎹�
+export function showShareData(query) {
+ return request({
+ url: '/zfEquipmentShare/all',
+ method: 'get',
+ params: query
+ })
+}
+
diff --git a/ruoyi-ui/src/api/economy/index.js b/ruoyi-ui/src/api/economy/index.js
index cb2e9d3..432888f 100644
--- a/ruoyi-ui/src/api/economy/index.js
+++ b/ruoyi-ui/src/api/economy/index.js
@@ -74,3 +74,53 @@
})
}
+// -------------------------------
+// 鍒嗕韩
+export function share(data) {
+ return request({
+ url: '/zfEconomyShare/share',
+ method: 'post',
+ data: data
+ })
+}
+// 鏌ョ湅鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�
+export function shareToWho(data,query) {
+ return request({
+ url: '/zfEconomyShare/getInfoByUserId',
+ method: 'post',
+ data: data,
+ params: query
+ })
+}
+// 鏌ョ湅璋佸垎浜簡鏁版嵁
+export function getWhoShare(query) {
+ return request({
+ url: '/zfEconomyShare/getInfoByShareId',
+ method: 'get',
+ params: query
+ })
+}
+// 涓嬭浇鍒嗕韩鐨勬暟鎹�
+export function downShareData(data) {
+ return request({
+ url: '/zfEconomyShare/downloadDate',
+ method: 'post',
+ data: data
+ })
+}
+// 鏀跺洖鍒嗕韩鏁版嵁
+export function deleteShareData(data) {
+ return request({
+ url: '/zfEconomyShare/deleteInfoByUserId',
+ method: 'post',
+ data: data
+ })
+}
+// 灞曠ず涓嬭浇鐨勬暟鎹�
+export function showShareData(query) {
+ return request({
+ url: '/zfEconomyShare/all',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index da60d35..5a4f53a 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -123,6 +123,48 @@
</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-row>
@@ -193,6 +235,12 @@
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
</el-dropdown>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleShare(scope.row)">
+ <span style="font-size: 14px;">鍒嗕韩</span></el-button>
</div>
</template>
</el-table-column>
@@ -376,6 +424,126 @@
</el-dialog>
+ <!-- 鍒嗕韩瀵硅瘽妗�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-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" >
+ <template slot-scope="scope" >
+ <span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
+ <span v-else>鈥斺��</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
+ </el-table>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="subShare">鍒� 浜�</el-button>
+ </div>
+
+ </el-dialog>
+
+ <!-- 鍒嗕韩瀵硅瘽妗�2 -->
+ <el-dialog :title="title2" :visible.sync="open2" width="85%" append-to-body @close="handleClose">
+ <div>
+ <el-select v-if="ifNum == 1"
+ v-model="user" id="userSelect"
+ placeholder="璇烽�夋嫨鍒嗕韩鐨勫璞�" clearable
+ style="width: 240px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ margin-bottom: 5px;
+ opacity: 0.5;" filterable allow-create
+ @change="selectValue">
+ <el-option v-for="item in userOptions"
+ :key="item.value" :label="item.label" :value="item.value"/>
+ </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-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"/> -->
+ <el-table-column label="绫诲瀷" prop="kind" sortable width="80px" >
+ <template slot-scope="scope">
+ {{ getSrc1(scope.row.kind) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="閫傜敤浜�" prop="suitable" sortable :show-overflow-tooltip="true" width="110px" />
+ <el-table-column label="绫诲埆" prop="type" sortable width="100" />
+ <el-table-column label="淇濇磥鏂规硶" prop="method" sortable width="120" />
+ <el-table-column label="鏉愭枡瀛樻斁鍦�" prop="location" sortable width="140" />
+ <el-table-column label="鏀剧疆鍦扮偣" prop="place" sortable width="120" />
+ <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="150" align="center">
+ <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="澶囨敞" prop="remark" sortable width="70px" />
+ <el-table-column label="鏈搴褰�" prop="ownData" sortable width="110px" >
+ <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+ </el-table-column>
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
+ <template slot-scope="scope" >
+ <div>
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
+ >
+ <img
+ v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceA.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+
+ ></div>
+ </template>
+ </el-table-column>
+
+ <el-table-column label="鎿嶄綔" align="center" width="250" 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
+ v-if="ifNum == 2"
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleDown(scope.row)">
+ <span style="font-size: 14px;">涓嬭浇</span></el-button>
+ <el-button
+ v-if="ifNum == 1"
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleBack(scope.row)">
+ <span style="font-size: 14px;">鏀跺洖</span></el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleCheck(scope.row)">
+ <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total1>0"
+ :total="total1"
+ :page.sync="queryParams2.pageNo"
+ :limit.sync="queryParams2.pageSize"
+ @pagination='fenYe'
+ style="background: #FEF7FC;"
+ />
+
+ </el-dialog>
+
</div>
</template>
@@ -386,13 +554,50 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�
- import {listClean,enload,delClean, addClean, uploadPic} from "@/api/clean/index";
- import {Message} from "element-ui";
+import {listClean,enload,delClean, addClean, uploadPic,
+ share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
+ } from "@/api/clean/index";
+import {listUserAll} from "@/api/root/index";
+// import {Message} from "element-ui";
+import { Notification, MessageBox, Message, Loading } from 'element-ui'
+
export default {
name: "Role",
dicts: ['sys_normal_disable'],
data() {
return {
+ // 鍒嗕韩缁欒皝鐨刲ist
+ listRoot: [],
+ open1:false,
+ open2:false,
+ id1: undefined,
+ shareList1: [],
+ // shareList2: [],
+ userOptions:[],
+ user:undefined,
+ userList:[],
+ ifNum:undefined,
+ selectWho:undefined,
+ title1: "",
+ title2: "",
+ loading1: false,
+ loading2: false,
+ // 鏌ヨ鍙傛暟1
+ queryParams1: {
+ pageNum: 1,
+ pageSize: 10,
+ },
+ queryParams2: {
+ pageNo: 1,
+ pageSize: 10,
+ },
+ ids1: [],
+ single1: true,
+ multiple1: true,
+ dateRange1: [],
+ total1:0,
+
+
userId: undefined,
// 閬僵灞�
disabled: false,
@@ -515,11 +720,183 @@
};
},
created() {
+ this.getList1();
this.getList();
this.getCateInfor()
this.getInfo()
+
+
},
methods: {
+ // 鍒嗛〉
+ fenYe(){
+ // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
+ if(this.ifNum === 1){
+ this.selectValue(this.selectWho)
+ }else if(this.ifNum === 2){
+ this.whoShare()
+ }else{
+ this.showData()
+ }
+ },
+ // 鍏抽棴寮圭獥鍚�
+ handleClose(){
+ this.user = ''
+ this.queryParams2.pageNo = 1
+ this.total1 = 0
+ },
+ handleClose2(){
+ this.$refs.table1.clearSelection()
+ },
+
+ // 涓嬭浇浠栦汉缁欐垜鍒嗕韩鐨勬暟鎹�
+ handleDown(row){
+ const a = {"downloadContent" : row.id}
+ downShareData(a).then(() => {
+ Message({ message: "涓嬭浇鎴愬姛", type: 'success' })
+ })
+ },
+
+ // 鏀跺洖鍒嗕韩缁欏埆浜虹殑鏁版嵁
+ handleBack(row){
+ // 鍒嗕韩缁欒皝鐨勶細this.selectWho
+ const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
+ deleteShareData(list).then(()=>{
+ Message({ message: "鏀跺洖鎴愬姛", type: 'success' })
+
+ const list2 = {"shareIds": [this.selectWho]}
+ shareToWho(list2,this.queryParams2).then(response => {
+ this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ })
+ })
+ },
+ // 灞曠ず涓嬭浇鐨勫垎浜暟鎹�
+ showData(){
+ this.shareList1 = []
+ this.ifNum = 3
+ this.open2 = true
+ this.title2 = "涓嬭浇鐨勫垎浜暟鎹�";
+ showShareData(this.queryParams2).then(response => {
+ this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ // console.log(response,'灞曠ず涓嬭浇鐨勫垎浜暟鎹睍绀轰笅杞界殑鍒嗕韩鏁版嵁')
+ })
+ },
+ // 灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹�
+ whoShare(){
+ this.shareList1 = []
+ this.ifNum = 2
+ this.open2 = true
+ this.title2 = "鍒嗕韩缁欐垜鐨勬暟鎹�";
+ // const list = {"shareId": this.userList}
+ // const list = {"shareId": 111}
+ getWhoShare(this.queryParams2).then(response => {
+ const data = response.data.data
+ this.total1 = response.data.total
+ console.log(response,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁s')
+ for(let i in data){
+ console.log(i,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁')
+ this.shareList1.push(data[i])
+ }
+ })
+ },
+
+ // 鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�
+ selectValue(value){
+ this.selectWho = value
+ this.shareList1 = []
+ const list = {"shareIds": [this.selectWho]}
+ shareToWho(list,this.queryParams2).then(response => {
+ // this.loading2 = true;
+ response.data.data.forEach(res=>{
+ if(res){
+ this.shareList1.push(res)
+ }
+ })
+ // this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ // this.loading2 = false;
+ console.log(response.data,'鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹垎浜粰璋佷簡浠�涔堟暟鎹�')
+ })
+ },
+ handleWho(){
+ this.ifNum = 1
+ this.open2 = true
+ this.title2 = "鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�";
+ this.shareList1 = []
+ },
+
+ /** 鍒嗕韩鎿嶄綔 */
+ handleShare(row) {
+ if(row.id){
+ this.id1 = [row.id]
+ }
+ this.open1 = true;
+ this.title1 = "鍒嗕韩";
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange1(selection) {
+ this.ids1 = selection.map(item => item.userId)
+ this.single1 = selection.length!=1
+ this.multiple1 = !selection.length
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange2(selection) {
+ // this.ids1 = selection.map(item => item.userId)
+ // // console.log(selection)
+ // console.log(this.ids1,'ids1ids1ids1ids1')
+ // 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]
+ this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ listUserAll(this.queryParams1).then(response => {
+ this.listRoot = response.data.data;
+ const kon = {}
+ this.listRoot.forEach(element => {
+ kon[element['nickName']] = element['userId']
+ })
+ for(let i in kon){
+ this.userOptions.push({label: i,value: kon[i]})
+ }
+ for(let i in this.userOptions){
+ this.userList.push(this.userOptions[i].value)
+ }
+ console.log(this.userList,'userListuserListuserList')
+ this.loading1 = false;
+ }
+ );
+ },
+ // 纭鍒嗕韩
+ subShare(row) {
+ const shareList = {}
+ shareList.shareContents = this.id1 || this.ids;
+ shareList.shareIds = this.ids1
+ console.log(shareList,'sharelistsharelist')
+ this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
+ return share(shareList);
+ }).then(() => {
+
+ this.getList();
+ this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
+ this.id1 = undefined
+ this.open1 = false;
+ }).catch(() => {});
+ },
+ // ------------------------------------------------------------------
+
+
getInfo(){
console.log('-----------------')
getInfo().then(response=>{
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 063c56e..bdc2c98 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -183,6 +183,49 @@
icon="el-icon-top" >瀵煎叆</el-button>
</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-row>
</div>
@@ -269,6 +312,12 @@
icon="el-icon-d-arrow-right"
@click="handleCheck(scope.row)">
<span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleShare(scope.row)">
+ <span style="font-size: 14px;">鍒嗕韩</span></el-button>
</div>
</template>
</el-table-column>
@@ -453,6 +502,139 @@
</el-dialog>
+ <!-- 鍒嗕韩瀵硅瘽妗�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-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" >
+ <template slot-scope="scope" >
+ <span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
+ <span v-else>鈥斺��</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
+ </el-table>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="subShare">鍒� 浜�</el-button>
+ </div>
+
+ </el-dialog>
+
+ <!-- 鍒嗕韩瀵硅瘽妗�2 -->
+ <el-dialog :title="title2" :visible.sync="open2" width="85%" append-to-body @close="handleClose">
+ <div>
+ <el-select v-if="ifNum == 1"
+ v-model="user" id="userSelect"
+ placeholder="璇烽�夋嫨鍒嗕韩鐨勫璞�" clearable
+ style="width: 240px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ margin-bottom: 5px;
+ opacity: 0.5;" filterable allow-create
+ @change="selectValue">
+ <el-option v-for="item in userOptions"
+ :key="item.value" :label="item.label" :value="item.value"/>
+ </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-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"/> -->
+ <el-table-column label="鑾峰緱鏃堕棿" prop="happenTime" sortable width="120" align="center">
+ <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="绫诲埆" prop="type" sortable :show-overflow-tooltip="true" width="120" align="center">
+ <!-- <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>-->
+ <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" >
+ <template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鏉ユ簮" prop="source" sortable :show-overflow-tooltip="true" width="120" align="center" >
+ <template slot-scope="scope">{{scope.row.source? scope.row.source: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+
+ <el-table-column label="鎸佹湁鑰�" prop="owner" sortable :show-overflow-tooltip="true" width="110" align="center">
+
+ <template slot-scope="scope">{{scope.row.owner? scope.row.owner: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="浠峰��" prop="price" sortable :show-overflow-tooltip="true" width="120" align="center">
+ <template slot-scope="scope">{{scope.row.price? scope.row.price: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="瀛樻斁浣嶇疆" prop="location" :show-overflow-tooltip="true" sortable width="160" align="center">
+ <template slot-scope="scope">{{scope.row.location? scope.row.location: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="澶囨敞" prop="remark" sortable :show-overflow-tooltip="true" width="120" align="center">
+ <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" :show-overflow-tooltip="true" sortable width="150px" align="center">
+ <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+ </el-table-column>
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
+ <template slot-scope="scope" >
+ <div>
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
+ >
+ <img
+ v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceA.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+
+ ></div>
+ </template>
+ </el-table-column>
+
+ <el-table-column label="鎿嶄綔" align="center" width="250" 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
+ v-if="ifNum == 2"
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleDown(scope.row)">
+ <span style="font-size: 14px;">涓嬭浇</span></el-button>
+ <el-button
+ v-if="ifNum == 1"
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleBack(scope.row)">
+ <span style="font-size: 14px;">鏀跺洖</span></el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleCheck(scope.row)">
+ <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total1>0"
+ :total="total1"
+ :page.sync="queryParams2.pageNo"
+ :limit.sync="queryParams2.pageSize"
+ @pagination='fenYe'
+ style="background: #FEF7FC;"
+ />
+
+ </el-dialog>
+
</div>
</template>
@@ -463,8 +645,10 @@
//瀵煎叆鎺ュ彛鍑芥暟
-import {listCollection,listType, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel,enload} from "@/api/collection/index";
-
+import {listCollection,listType, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel,enload,
+ share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
+} from "@/api/collection/index";
+import {listUserAll} from "@/api/root/index";
import {Message} from "element-ui";
@@ -473,6 +657,37 @@
dicts: ['sys_normal_disable'],
data() {
return {
+ // 鍒嗕韩缁欒皝鐨刲ist
+ listRoot: [],
+ open1:false,
+ open2:false,
+ id1: undefined,
+ shareList1: [],
+ // shareList2: [],
+ userOptions:[],
+ user:undefined,
+ userList:[],
+ ifNum:undefined,
+ selectWho:undefined,
+ title1: "",
+ title2: "",
+ loading1: false,
+ loading2: false,
+ // 鏌ヨ鍙傛暟1
+ queryParams1: {
+ pageNum: 1,
+ pageSize: 10,
+ },
+ queryParams2: {
+ pageNo: 1,
+ pageSize: 10,
+ },
+ ids1: [],
+ single1: true,
+ multiple1: true,
+ dateRange1: [],
+
+
userId: undefined,
// 閬僵灞�
disabled: false,
@@ -609,8 +824,178 @@
this.getList();
this.getTypeOptions();
this.getInfo()
+
+ this.getList1();
},
methods: {
+ // 鍒嗛〉
+ fenYe(){
+ // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
+ if(this.ifNum === 1){
+ this.selectValue(this.selectWho)
+ }else if(this.ifNum === 2){
+ this.whoShare()
+ }else{
+ this.showData()
+ }
+ },
+ // 鍏抽棴寮圭獥鍚�
+ handleClose(){
+ this.user = ''
+ this.queryParams2.pageNo = 1
+ this.total1 = 0
+ },
+ handleClose2(){
+ this.$refs.table1.clearSelection()
+ },
+
+ // 涓嬭浇浠栦汉缁欐垜鍒嗕韩鐨勬暟鎹�
+ handleDown(row){
+ const a = {"downloadContent" : row.id}
+ downShareData(a).then(() => {
+ Message({ message: "涓嬭浇鎴愬姛", type: 'success' })
+ })
+ },
+
+ // 鏀跺洖鍒嗕韩缁欏埆浜虹殑鏁版嵁
+ handleBack(row){
+ // 鍒嗕韩缁欒皝鐨勶細this.selectWho
+ const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
+ deleteShareData(list).then(()=>{
+ Message({ message: "鏀跺洖鎴愬姛", type: 'success' })
+
+ const list2 = {"shareIds": [this.selectWho]}
+ shareToWho(list2,this.queryParams2).then(response => {
+ this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ })
+ })
+ },
+ // 灞曠ず涓嬭浇鐨勫垎浜暟鎹�
+ showData(){
+ this.shareList1 = []
+ this.ifNum = 3
+ this.open2 = true
+ this.title2 = "涓嬭浇鐨勫垎浜暟鎹�";
+ showShareData(this.queryParams2).then(response => {
+ this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ // console.log(response,'灞曠ず涓嬭浇鐨勫垎浜暟鎹睍绀轰笅杞界殑鍒嗕韩鏁版嵁')
+ })
+ },
+ // 灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹�
+ whoShare(){
+ this.shareList1 = []
+ this.ifNum = 2
+ this.open2 = true
+ this.title2 = "鍒嗕韩缁欐垜鐨勬暟鎹�";
+ // const list = {"shareId": this.userList}
+ // const list = {"shareId": 111}
+ getWhoShare(this.queryParams2).then(response => {
+ const data = response.data.data
+ this.total1 = response.data.total
+ console.log(response,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁s')
+ for(let i in data){
+ console.log(i,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁')
+ this.shareList1.push(data[i])
+ }
+ })
+ },
+
+ // 鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�
+ selectValue(value){
+ this.selectWho = value
+ this.shareList1 = []
+ const list = {"shareIds": [this.selectWho]}
+ shareToWho(list,this.queryParams2).then(response => {
+ // this.loading2 = true;
+ response.data.data.forEach(res=>{
+ if(res){
+ this.shareList1.push(res)
+ }
+ })
+ // this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ // this.loading2 = false;
+ console.log(response.data,'鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹垎浜粰璋佷簡浠�涔堟暟鎹�')
+ })
+ },
+ handleWho(){
+ this.ifNum = 1
+ this.open2 = true
+ this.title2 = "鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�";
+ this.shareList1 = []
+ },
+
+ /** 鍒嗕韩鎿嶄綔 */
+ handleShare(row) {
+ if(row.id){
+ this.id1 = [row.id]
+ }
+ this.open1 = true;
+ this.title1 = "鍒嗕韩";
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange1(selection) {
+ this.ids1 = selection.map(item => item.userId)
+ this.single1 = selection.length!=1
+ this.multiple1 = !selection.length
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange2(selection) {
+ // this.ids1 = selection.map(item => item.userId)
+ // // console.log(selection)
+ // console.log(this.ids1,'ids1ids1ids1ids1')
+ // 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]
+ this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ listUserAll(this.queryParams1).then(response => {
+ this.listRoot = response.data.data;
+ const kon = {}
+ this.listRoot.forEach(element => {
+ kon[element['nickName']] = element['userId']
+ })
+ for(let i in kon){
+ this.userOptions.push({label: i,value: kon[i]})
+ }
+ for(let i in this.userOptions){
+ this.userList.push(this.userOptions[i].value)
+ }
+ console.log(this.userList,'userListuserListuserList')
+ this.loading1 = false;
+ }
+ );
+ },
+ // 纭鍒嗕韩
+ subShare(row) {
+ const shareList = {}
+ shareList.shareContents = this.id1 || this.ids;
+ shareList.shareIds = this.ids1
+ console.log(shareList,'sharelistsharelist')
+ this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
+ return share(shareList);
+ }).then(() => {
+
+ this.getList();
+ this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
+ this.id1 = undefined
+ this.open1 = false;
+ }).catch(() => {});
+ },
+ // ------------------------------------------------------------------
+
getInfo(){
console.log('-----------------')
getInfo().then(response=>{
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 1192a26..49f06e4 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -140,6 +140,49 @@
</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-row>
@@ -239,6 +282,12 @@
icon="el-icon-d-arrow-right"
@click="handleCheck(scope.row)">
<span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleShare(scope.row)">
+ <span style="font-size: 14px;">鍒嗕韩</span></el-button>
</div>
</template>
</el-table-column>
@@ -431,6 +480,149 @@
</el-dialog>
+ <!-- 鍒嗕韩瀵硅瘽妗�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-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" >
+ <template slot-scope="scope" >
+ <span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
+ <span v-else>鈥斺��</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
+ </el-table>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="subShare">鍒� 浜�</el-button>
+ </div>
+
+ </el-dialog>
+
+ <!-- 鍒嗕韩瀵硅瘽妗�2 -->
+ <el-dialog :title="title2" :visible.sync="open2" width="85%" append-to-body @close="handleClose">
+ <div>
+ <el-select v-if="ifNum == 1"
+ v-model="user" id="userSelect"
+ placeholder="璇烽�夋嫨鍒嗕韩鐨勫璞�" clearable
+ style="width: 240px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ margin-bottom: 5px;
+ opacity: 0.5;" filterable allow-create
+ @change="selectValue">
+ <el-option v-for="item in userOptions"
+ :key="item.value" :label="item.label" :value="item.value"/>
+ </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-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"/> -->
+ <el-table-column label="瀹朵汉濮撳悕" prop="myName" sortable width="130" >
+ <template slot-scope="scope">
+ <div>
+ <a href="javascript:;" @click="handleCheck(scope.row)">{{scope.row.myName}}</a>
+ </div>
+ </template>
+
+ </el-table-column>
+ <el-table-column label="閫氳褰曚腑绉板懠" prop="nickName" sortable :show-overflow-tooltip="true" width="160" align="center" />
+ <el-table-column label="濮撳悕" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center"/>
+ <el-table-column label="宸ヤ綔鍗曚綅" prop="work" sortable :show-overflow-tooltip="true" width="160" align="center" >
+ <template slot-scope="scope">{{scope.row.work? scope.row.work: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鎵嬫満" prop="phone" sortable :show-overflow-tooltip="true" width="120" align="center" >
+ <template slot-scope="scope">{{scope.row.phone? scope.row.phone: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鍏跺畠鑱旂郴鏂瑰紡" prop="wx qq twitter" sortable :show-overflow-tooltip="true" width="150" align="center" >
+ <template slot-scope="scope">
+ <span v-if="scope.row.wx || scope.row.qq || scope.row.twitter == true" >
+ {{scope.row.wx}}/{{scope.row.qq}}/{{scope.row.twitter}}
+ </span>
+ <span v-else>鈥斺�斺�斺��</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏄惁甯歌仈绯�" prop="isAlways" :show-overflow-tooltip="true" sortable width="170" align="center" >
+ <template slot-scope="scope">
+ <span v-if="scope.row.isAlways===1">鏄�</span>
+ <span v-if="scope.row.isAlways===0">鍚�</span>
+ <span v-if="scope.row.isAlways== null">鈥斺��</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" align="center" >
+ <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+ </el-table-column>
+
+
+ <el-table-column label="澶囨敞锛堟槸鍚﹀瓨鍦ㄩ噾閽卞叧绯伙級" prop="remark" :show-overflow-tooltip="true" sortable width="120" align="center">
+ <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
+ <template slot-scope="scope" >
+ <div>
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
+ >
+ <img
+ v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceA.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+
+ ></div>
+ </template>
+ </el-table-column>
+
+ <el-table-column label="鎿嶄綔" align="center" width="250" 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
+ v-if="ifNum == 2"
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleDown(scope.row)">
+ <span style="font-size: 14px;">涓嬭浇</span></el-button>
+ <el-button
+ v-if="ifNum == 1"
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleBack(scope.row)">
+ <span style="font-size: 14px;">鏀跺洖</span></el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleCheck(scope.row)">
+ <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total1>0"
+ :total="total1"
+ :page.sync="queryParams2.pageNo"
+ :limit.sync="queryParams2.pageSize"
+ @pagination='fenYe'
+ style="background: #FEF7FC;"
+ />
+
+ </el-dialog>
+
+
</div>
</template>
@@ -441,12 +633,46 @@
import { Notification, MessageBox, Message, Loading } from 'element-ui'
//瀵煎叆鎺ュ彛鍑芥暟
-import {getContactList,enload, addContact, delContact,uploadPic} from "@/api/contacts/index";
+import {getContactList,enload, addContact, delContact,uploadPic,
+ share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
+ } from "@/api/contacts/index";
+import {listUserAll} from "@/api/root/index";
export default {
name: "index",
dicts: ['sys_normal_disable'],
data() {
return {
+ // 鍒嗕韩缁欒皝鐨刲ist
+ listRoot: [],
+ open1:false,
+ open2:false,
+ id1: undefined,
+ shareList1: [],
+ // shareList2: [],
+ userOptions:[],
+ user:undefined,
+ userList:[],
+ ifNum:undefined,
+ selectWho:undefined,
+ title1: "",
+ title2: "",
+ loading1: false,
+ loading2: false,
+ // 鏌ヨ鍙傛暟1
+ queryParams1: {
+ pageNum: 1,
+ pageSize: 10,
+ },
+ queryParams2: {
+ pageNo: 1,
+ pageSize: 10,
+ },
+ ids1: [],
+ single1: true,
+ multiple1: true,
+ dateRange1: [],
+
+
userId: undefined,
// 閬僵灞�
disabled: false,
@@ -609,12 +835,182 @@
created() {
this.getList();
this.getInfo()
+
+ this.getList1();
// this.getCateInfor()
// for (let i = 0; i < this.contactList.length; i++) {
// this.formDat[i] = this.contactList[i];
// }
},
methods: {
+ // 鍒嗛〉
+ fenYe(){
+ // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
+ if(this.ifNum === 1){
+ this.selectValue(this.selectWho)
+ }else if(this.ifNum === 2){
+ this.whoShare()
+ }else{
+ this.showData()
+ }
+ },
+ // 鍏抽棴寮圭獥鍚�
+ handleClose(){
+ this.user = ''
+ this.queryParams2.pageNo = 1
+ this.total1 = 0
+ },
+ handleClose2(){
+ this.$refs.table1.clearSelection()
+ },
+
+ // 涓嬭浇浠栦汉缁欐垜鍒嗕韩鐨勬暟鎹�
+ handleDown(row){
+ const a = {"downloadContent" : row.id}
+ downShareData(a).then(() => {
+ Message({ message: "涓嬭浇鎴愬姛", type: 'success' })
+ })
+ },
+
+ // 鏀跺洖鍒嗕韩缁欏埆浜虹殑鏁版嵁
+ handleBack(row){
+ // 鍒嗕韩缁欒皝鐨勶細this.selectWho
+ const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
+ deleteShareData(list).then(()=>{
+ Message({ message: "鏀跺洖鎴愬姛", type: 'success' })
+
+ const list2 = {"shareIds": [this.selectWho]}
+ shareToWho(list2,this.queryParams2).then(response => {
+ this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ })
+ })
+ },
+ // 灞曠ず涓嬭浇鐨勫垎浜暟鎹�
+ showData(){
+ this.shareList1 = []
+ this.ifNum = 3
+ this.open2 = true
+ this.title2 = "涓嬭浇鐨勫垎浜暟鎹�";
+ showShareData(this.queryParams2).then(response => {
+ this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ // console.log(response,'灞曠ず涓嬭浇鐨勫垎浜暟鎹睍绀轰笅杞界殑鍒嗕韩鏁版嵁')
+ })
+ },
+ // 灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹�
+ whoShare(){
+ this.shareList1 = []
+ this.ifNum = 2
+ this.open2 = true
+ this.title2 = "鍒嗕韩缁欐垜鐨勬暟鎹�";
+ // const list = {"shareId": this.userList}
+ // const list = {"shareId": 111}
+ getWhoShare(this.queryParams2).then(response => {
+ const data = response.data.data
+ this.total1 = response.data.total
+ console.log(response,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁s')
+ for(let i in data){
+ console.log(i,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁')
+ this.shareList1.push(data[i])
+ }
+ })
+ },
+
+ // 鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�
+ selectValue(value){
+ this.selectWho = value
+ this.shareList1 = []
+ const list = {"shareIds": [this.selectWho]}
+ shareToWho(list,this.queryParams2).then(response => {
+ // this.loading2 = true;
+ response.data.data.forEach(res=>{
+ if(res){
+ this.shareList1.push(res)
+ }
+ })
+ // this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ // this.loading2 = false;
+ console.log(response.data,'鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹垎浜粰璋佷簡浠�涔堟暟鎹�')
+ })
+ },
+ handleWho(){
+ this.ifNum = 1
+ this.open2 = true
+ this.title2 = "鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�";
+ this.shareList1 = []
+ },
+
+ /** 鍒嗕韩鎿嶄綔 */
+ handleShare(row) {
+ if(row.id){
+ this.id1 = [row.id]
+ }
+ this.open1 = true;
+ this.title1 = "鍒嗕韩";
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange1(selection) {
+ this.ids1 = selection.map(item => item.userId)
+ this.single1 = selection.length!=1
+ this.multiple1 = !selection.length
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange2(selection) {
+ // this.ids1 = selection.map(item => item.userId)
+ // // console.log(selection)
+ // console.log(this.ids1,'ids1ids1ids1ids1')
+ // 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]
+ this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ listUserAll(this.queryParams1).then(response => {
+ this.listRoot = response.data.data;
+ const kon = {}
+ this.listRoot.forEach(element => {
+ kon[element['nickName']] = element['userId']
+ })
+ for(let i in kon){
+ this.userOptions.push({label: i,value: kon[i]})
+ }
+ for(let i in this.userOptions){
+ this.userList.push(this.userOptions[i].value)
+ }
+ console.log(this.userList,'userListuserListuserList')
+ this.loading1 = false;
+ }
+ );
+ },
+ // 纭鍒嗕韩
+ subShare(row) {
+ const shareList = {}
+ shareList.shareContents = this.id1 || this.ids;
+ shareList.shareIds = this.ids1
+ console.log(shareList,'sharelistsharelist')
+ this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
+ return share(shareList);
+ }).then(() => {
+
+ this.getList();
+ this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
+ this.id1 = undefined
+ this.open1 = false;
+ }).catch(() => {});
+ },
+ // ------------------------------------------------------------------
+
getInfo(){
console.log('-----------------')
getInfo().then(response=>{
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index c80b35d..a48d35f 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -134,6 +134,48 @@
</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-row>
<!-- 搴忓彿銆佽澶囧悕绉般�佹椂闂淬�佽喘涔颁汉銆佷簨椤瑰唴瀹广�佸瓨鏀惧湴鐐广�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
@@ -210,6 +252,12 @@
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
</el-dropdown>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleShare(scope.row)">
+ <span style="font-size: 14px;">鍒嗕韩</span></el-button>
</div>
</template>
</el-table-column>
@@ -390,6 +438,133 @@
</el-dialog>
+
+ <!-- 鍒嗕韩瀵硅瘽妗�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-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" >
+ <template slot-scope="scope" >
+ <span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
+ <span v-else>鈥斺��</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
+ </el-table>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="subShare">鍒� 浜�</el-button>
+ </div>
+
+ </el-dialog>
+
+ <!-- 鍒嗕韩瀵硅瘽妗�2 -->
+ <el-dialog :title="title2" :visible.sync="open2" width="85%" append-to-body @close="handleClose">
+ <div>
+ <el-select v-if="ifNum == 1"
+ v-model="user" id="userSelect"
+ placeholder="璇烽�夋嫨鍒嗕韩鐨勫璞�" clearable
+ style="width: 240px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ margin-bottom: 5px;
+ opacity: 0.5;" filterable allow-create
+ @change="selectValue">
+ <el-option v-for="item in userOptions"
+ :key="item.value" :label="item.label" :value="item.value"/>
+ </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-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"/> -->
+ <el-table-column label="璁惧鍚嶇О" prop="name" sortable width="150" />
+
+ <el-table-column label="鏃堕棿" align="happenTime" sortable prop="happenTime" width="140">
+ <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鏄惁娉ㄩ攢" align="center" sortable prop="status" width="140">
+ <template slot-scope="scope">
+ {{ getSrc1(scope.row.status) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="璐拱浜�" prop="buyer" sortable width="140" />
+ <el-table-column label="浜嬮」鍐呭" prop="content" sortable :show-overflow-tooltip="true" width="150" />
+ <el-table-column label="瀛樻斁鍦扮偣" prop="location" sortable width="120" />
+
+ <el-table-column label="澶囨敞" prop="remark" sortable width="100" >
+ <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+
+
+
+ <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+ <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+ </el-table-column>
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
+ <template slot-scope="scope" >
+ <div>
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
+ >
+ <img
+ v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceA.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+
+ ></div>
+ </template>
+ </el-table-column>
+
+ <el-table-column label="鎿嶄綔" align="center" width="250" 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
+ v-if="ifNum == 2"
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleDown(scope.row)">
+ <span style="font-size: 14px;">涓嬭浇</span></el-button>
+ <el-button
+ v-if="ifNum == 1"
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleBack(scope.row)">
+ <span style="font-size: 14px;">鏀跺洖</span></el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleCheck(scope.row)">
+ <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total1>0"
+ :total="total1"
+ :page.sync="queryParams2.pageNo"
+ :limit.sync="queryParams2.pageSize"
+ @pagination='fenYe'
+ style="background: #FEF7FC;"
+ />
+
+ </el-dialog>
+
</div>
</template>
@@ -400,12 +575,48 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
-import {listEquipment,enload,delEquipment, addEquipment, uploadPic} from "@/api/device/index";
+import {listEquipment,enload,delEquipment, addEquipment, uploadPic,
+ share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
+} from "@/api/device/index";
+import {listUserAll} from "@/api/root/index";
+
+
export default {
name: "Role",
dicts: ['sys_normal_disable'],
data() {
return {
+ // 鍒嗕韩缁欒皝鐨刲ist
+ listRoot: [],
+ open1:false,
+ open2:false,
+ id1: undefined,
+ shareList1: [],
+ // shareList2: [],
+ userOptions:[],
+ user:undefined,
+ userList:[],
+ ifNum:undefined,
+ selectWho:undefined,
+ title1: "",
+ title2: "",
+ loading1: false,
+ loading2: false,
+ // 鏌ヨ鍙傛暟1
+ queryParams1: {
+ pageNum: 1,
+ pageSize: 10,
+ },
+ queryParams2: {
+ pageNo: 1,
+ pageSize: 10,
+ },
+ ids1: [],
+ single1: true,
+ multiple1: true,
+ dateRange1: [],
+
+
userId: undefined,
// 閬僵灞�
disabled: false,
@@ -536,8 +747,178 @@
// this.getCateInfor()
this.getInfo()
+ this.getList1();
},
methods: {
+ // 鍒嗛〉
+ fenYe(){
+ // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
+ if(this.ifNum === 1){
+ this.selectValue(this.selectWho)
+ }else if(this.ifNum === 2){
+ this.whoShare()
+ }else{
+ this.showData()
+ }
+ },
+ // 鍏抽棴寮圭獥鍚�
+ handleClose(){
+ this.user = ''
+ this.queryParams2.pageNo = 1
+ this.total1 = 0
+ },
+ handleClose2(){
+ this.$refs.table1.clearSelection()
+ },
+
+ // 涓嬭浇浠栦汉缁欐垜鍒嗕韩鐨勬暟鎹�
+ handleDown(row){
+ const a = {"downloadContent" : row.id}
+ downShareData(a).then(() => {
+ Message({ message: "涓嬭浇鎴愬姛", type: 'success' })
+ })
+ },
+
+ // 鏀跺洖鍒嗕韩缁欏埆浜虹殑鏁版嵁
+ handleBack(row){
+ // 鍒嗕韩缁欒皝鐨勶細this.selectWho
+ const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
+ deleteShareData(list).then(()=>{
+ Message({ message: "鏀跺洖鎴愬姛", type: 'success' })
+
+ const list2 = {"shareIds": [this.selectWho]}
+ shareToWho(list2,this.queryParams2).then(response => {
+ this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ })
+ })
+ },
+ // 灞曠ず涓嬭浇鐨勫垎浜暟鎹�
+ showData(){
+ this.shareList1 = []
+ this.ifNum = 3
+ this.open2 = true
+ this.title2 = "涓嬭浇鐨勫垎浜暟鎹�";
+ showShareData(this.queryParams2).then(response => {
+ this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ // console.log(response,'灞曠ず涓嬭浇鐨勫垎浜暟鎹睍绀轰笅杞界殑鍒嗕韩鏁版嵁')
+ })
+ },
+ // 灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹�
+ whoShare(){
+ this.shareList1 = []
+ this.ifNum = 2
+ this.open2 = true
+ this.title2 = "鍒嗕韩缁欐垜鐨勬暟鎹�";
+ // const list = {"shareId": this.userList}
+ // const list = {"shareId": 111}
+ getWhoShare(this.queryParams2).then(response => {
+ const data = response.data.data
+ this.total1 = response.data.total
+ console.log(response,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁s')
+ for(let i in data){
+ console.log(i,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁')
+ this.shareList1.push(data[i])
+ }
+ })
+ },
+
+ // 鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�
+ selectValue(value){
+ this.selectWho = value
+ this.shareList1 = []
+ const list = {"shareIds": [this.selectWho]}
+ shareToWho(list,this.queryParams2).then(response => {
+ // this.loading2 = true;
+ response.data.data.forEach(res=>{
+ if(res){
+ this.shareList1.push(res)
+ }
+ })
+ // this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ // this.loading2 = false;
+ console.log(response.data,'鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹垎浜粰璋佷簡浠�涔堟暟鎹�')
+ })
+ },
+ handleWho(){
+ this.ifNum = 1
+ this.open2 = true
+ this.title2 = "鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�";
+ this.shareList1 = []
+ },
+
+ /** 鍒嗕韩鎿嶄綔 */
+ handleShare(row) {
+ if(row.id){
+ this.id1 = [row.id]
+ }
+ this.open1 = true;
+ this.title1 = "鍒嗕韩";
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange1(selection) {
+ this.ids1 = selection.map(item => item.userId)
+ this.single1 = selection.length!=1
+ this.multiple1 = !selection.length
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange2(selection) {
+ // this.ids1 = selection.map(item => item.userId)
+ // // console.log(selection)
+ // console.log(this.ids1,'ids1ids1ids1ids1')
+ // 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]
+ this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ listUserAll(this.queryParams1).then(response => {
+ this.listRoot = response.data.data;
+ const kon = {}
+ this.listRoot.forEach(element => {
+ kon[element['nickName']] = element['userId']
+ })
+ for(let i in kon){
+ this.userOptions.push({label: i,value: kon[i]})
+ }
+ for(let i in this.userOptions){
+ this.userList.push(this.userOptions[i].value)
+ }
+ console.log(this.userList,'userListuserListuserList')
+ this.loading1 = false;
+ }
+ );
+ },
+ // 纭鍒嗕韩
+ subShare(row) {
+ const shareList = {}
+ shareList.shareContents = this.id1 || this.ids;
+ shareList.shareIds = this.ids1
+ console.log(shareList,'sharelistsharelist')
+ this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
+ return share(shareList);
+ }).then(() => {
+
+ this.getList();
+ this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
+ this.id1 = undefined
+ this.open1 = false;
+ }).catch(() => {});
+ },
+ // ------------------------------------------------------------------
+
+
getInfo(){
console.log('-----------------')
getInfo().then(response=>{
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index 5aff8d3..4c7719a 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -104,6 +104,49 @@
</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-row>
<!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵ｅ垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
@@ -177,6 +220,13 @@
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
</el-dropdown>
+
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleShare(scope.row)">
+ <span style="font-size: 14px;">鍒嗕韩</span></el-button>
</div>
</template>
@@ -357,6 +407,126 @@
</el-dialog>
+ <!-- 鍒嗕韩瀵硅瘽妗�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-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" >
+ <template slot-scope="scope" >
+ <span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
+ <span v-else>鈥斺��</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
+ </el-table>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="subShare">鍒� 浜�</el-button>
+ </div>
+
+ </el-dialog>
+
+ <!-- 鍒嗕韩瀵硅瘽妗�2 -->
+ <el-dialog :title="title2" :visible.sync="open2" width="85%" append-to-body @close="handleClose">
+ <div>
+ <el-select v-if="ifNum == 1"
+ v-model="user" id="userSelect"
+ placeholder="璇烽�夋嫨鍒嗕韩鐨勫璞�" clearable
+ style="width: 240px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ margin-bottom: 5px;
+ opacity: 0.5;" filterable allow-create
+ @change="selectValue">
+ <el-option v-for="item in userOptions"
+ :key="item.value" :label="item.label" :value="item.value"/>
+ </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-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"/> -->
+ <el-table-column label="鍙戠敓鏃堕棿" prop="createTime" sortable width="150" align="center">
+ <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鍙拌处" prop="type" sortable width="100" />
+ <el-table-column label="鏀跺叆/鏀嚭" prop="price" sortable width="100" >
+
+ </el-table-column>
+ <el-table-column label="閲戦" prop="balance" sortable width="100" />
+ <el-table-column label="鐢ㄩ��" prop="useFor" sortable width="100" />
+
+ <el-table-column label="浣跨敤浜�" prop="usePeople" sortable width="100" />
+ <el-table-column label="鐜伴噾/鑷姩鎵ｅ垝" prop="kind" sortable width="130" >
+ <template slot-scope="scope">{{scope.row.kind? scope.row.kind: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+ <template slot-scope="scope">{{scope.row.ownData === 1 ? '鏄�': '鍚�'}}</template>
+ </el-table-column>
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
+ <template slot-scope="scope" >
+ <div>
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
+ >
+ <img
+ v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceA.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+
+ ></div>
+ </template>
+ </el-table-column>
+
+ <el-table-column label="鎿嶄綔" align="center" width="250" 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
+ v-if="ifNum == 2"
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleDown(scope.row)">
+ <span style="font-size: 14px;">涓嬭浇</span></el-button>
+ <el-button
+ v-if="ifNum == 1"
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleBack(scope.row)">
+ <span style="font-size: 14px;">鏀跺洖</span></el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleCheck(scope.row)">
+ <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total1>0"
+ :total="total1"
+ :page.sync="queryParams2.pageNo"
+ :limit.sync="queryParams2.pageSize"
+ @pagination='fenYe'
+ style="background: #FEF7FC;"
+ />
+
+ </el-dialog>
+
</div>
</template>
@@ -367,13 +537,47 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
-import {listEconomy,enload,delEconomy, addEconomy, uploadPic} from "@/api/economy/index";
+import {listEconomy,enload,delEconomy, addEconomy, uploadPic,
+ share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
+} from "@/api/economy/index";
+import {listUserAll} from "@/api/root/index";
export default {
name: "Role",
dicts: ['sys_normal_disable'],
data() {
return {
+ // 鍒嗕韩缁欒皝鐨刲ist
+ listRoot: [],
+ open1:false,
+ open2:false,
+ id1: undefined,
+ shareList1: [],
+ // shareList2: [],
+ userOptions:[],
+ user:undefined,
+ userList:[],
+ ifNum:undefined,
+ selectWho:undefined,
+ title1: "",
+ title2: "",
+ loading1: false,
+ loading2: false,
+ // 鏌ヨ鍙傛暟1
+ queryParams1: {
+ pageNum: 1,
+ pageSize: 10,
+ },
+ queryParams2: {
+ pageNo: 1,
+ pageSize: 10,
+ },
+ ids1: [],
+ single1: true,
+ multiple1: true,
+ dateRange1: [],
+
+
userId: undefined,
// 閬僵灞�
disabled: false,
@@ -509,12 +713,182 @@
};
},
created() {
+ this.getList1();
this.getList();
this.getCateInfor()
this.getInfo()
+
},
methods: {
+ // 鍒嗛〉
+ fenYe(){
+ // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
+ if(this.ifNum === 1){
+ this.selectValue(this.selectWho)
+ }else if(this.ifNum === 2){
+ this.whoShare()
+ }else{
+ this.showData()
+ }
+ },
+ // 鍏抽棴寮圭獥鍚�
+ handleClose(){
+ this.user = ''
+ this.queryParams2.pageNo = 1
+ this.total1 = 0
+ },
+ handleClose2(){
+ this.$refs.table1.clearSelection()
+ },
+
+ // 涓嬭浇浠栦汉缁欐垜鍒嗕韩鐨勬暟鎹�
+ handleDown(row){
+ const a = {"downloadContent" : row.id}
+ downShareData(a).then(() => {
+ Message({ message: "涓嬭浇鎴愬姛", type: 'success' })
+ })
+ },
+
+ // 鏀跺洖鍒嗕韩缁欏埆浜虹殑鏁版嵁
+ handleBack(row){
+ // 鍒嗕韩缁欒皝鐨勶細this.selectWho
+ const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
+ deleteShareData(list).then(()=>{
+ Message({ message: "鏀跺洖鎴愬姛", type: 'success' })
+
+ const list2 = {"shareIds": [this.selectWho]}
+ shareToWho(list2,this.queryParams2).then(response => {
+ this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ })
+ })
+ },
+ // 灞曠ず涓嬭浇鐨勫垎浜暟鎹�
+ showData(){
+ this.shareList1 = []
+ this.ifNum = 3
+ this.open2 = true
+ this.title2 = "涓嬭浇鐨勫垎浜暟鎹�";
+ showShareData(this.queryParams2).then(response => {
+ this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ // console.log(response,'灞曠ず涓嬭浇鐨勫垎浜暟鎹睍绀轰笅杞界殑鍒嗕韩鏁版嵁')
+ })
+ },
+ // 灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹�
+ whoShare(){
+ this.shareList1 = []
+ this.ifNum = 2
+ this.open2 = true
+ this.title2 = "鍒嗕韩缁欐垜鐨勬暟鎹�";
+ // const list = {"shareId": this.userList}
+ // const list = {"shareId": 111}
+ getWhoShare(this.queryParams2).then(response => {
+ const data = response.data.data
+ this.total1 = response.data.total
+ console.log(response,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁s')
+ for(let i in data){
+ console.log(i,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁')
+ this.shareList1.push(data[i])
+ }
+ })
+ },
+
+ // 鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�
+ selectValue(value){
+ this.selectWho = value
+ this.shareList1 = []
+ const list = {"shareIds": [this.selectWho]}
+ shareToWho(list,this.queryParams2).then(response => {
+ // this.loading2 = true;
+ response.data.data.forEach(res=>{
+ if(res){
+ this.shareList1.push(res)
+ }
+ })
+ // this.shareList1 = response.data.data
+ this.total1 = response.data.total;
+ // this.loading2 = false;
+ console.log(response.data,'鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹垎浜粰璋佷簡浠�涔堟暟鎹�')
+ })
+ },
+ handleWho(){
+ this.ifNum = 1
+ this.open2 = true
+ this.title2 = "鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�";
+ this.shareList1 = []
+ },
+
+ /** 鍒嗕韩鎿嶄綔 */
+ handleShare(row) {
+ if(row.id){
+ this.id1 = [row.id]
+ }
+ this.open1 = true;
+ this.title1 = "鍒嗕韩";
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange1(selection) {
+ this.ids1 = selection.map(item => item.userId)
+ this.single1 = selection.length!=1
+ this.multiple1 = !selection.length
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange2(selection) {
+ // this.ids1 = selection.map(item => item.userId)
+ // // console.log(selection)
+ // console.log(this.ids1,'ids1ids1ids1ids1')
+ // 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]
+ this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ listUserAll(this.queryParams1).then(response => {
+ this.listRoot = response.data.data;
+ const kon = {}
+ this.listRoot.forEach(element => {
+ kon[element['nickName']] = element['userId']
+ })
+ for(let i in kon){
+ this.userOptions.push({label: i,value: kon[i]})
+ }
+ for(let i in this.userOptions){
+ this.userList.push(this.userOptions[i].value)
+ }
+ console.log(this.userList,'userListuserListuserList')
+ this.loading1 = false;
+ }
+ );
+ },
+ // 纭鍒嗕韩
+ subShare(row) {
+ const shareList = {}
+ shareList.shareContents = this.id1 || this.ids;
+ shareList.shareIds = this.ids1
+ console.log(shareList,'sharelistsharelist')
+ this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
+ return share(shareList);
+ }).then(() => {
+
+ this.getList();
+ this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
+ this.id1 = undefined
+ this.open1 = false;
+ }).catch(() => {});
+ },
+ // ------------------------------------------------------------------
+
getInfo(){
console.log('-----------------')
getInfo().then(response=>{
--
Gitblit v1.9.1