From 26f2cbdbde628ac6bdc9748ac80ad337fcdde59e Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 13 六月 2023 15:35:01 +0800
Subject: [PATCH] 1.各模块点击电子文件可进入详情页面 2.家根网和家谱的详情页接上数据
---
ruoyi-ui/src/views/homeRoot/personInfo.vue | 3
ruoyi-ui/src/views/bignote/index.vue | 3
ruoyi-ui/src/api/root/index.js | 2
ruoyi-ui/src/views/economy/index.vue | 3
ruoyi-ui/src/views/secret/index.vue | 130 ++++++++--------
ruoyi-ui/src/views/wish/index.vue | 3
ruoyi-ui/src/views/honor/index.vue | 3
ruoyi-ui/src/views/genealogy/index.vue | 26 ++
ruoyi-ui/src/views/device/index.vue | 5
ruoyi-ui/src/api/honor/index.js | 2
ruoyi-ui/src/views/clean/index.vue | 3
ruoyi-ui/src/views/homeRoot/index.vue | 29 ++-
ruoyi-ui/src/views/honor/honorInfo.vue | 96 +++++++++--
ruoyi-ui/src/views/selfeconomy/index.vue | 142 ++++++++--------
ruoyi-ui/src/router/index.js | 15 +
ruoyi-ui/src/views/note/index.vue | 3
16 files changed, 286 insertions(+), 182 deletions(-)
diff --git a/ruoyi-ui/src/api/honor/index.js b/ruoyi-ui/src/api/honor/index.js
index 1857962..321d37a 100644
--- a/ruoyi-ui/src/api/honor/index.js
+++ b/ruoyi-ui/src/api/honor/index.js
@@ -11,7 +11,7 @@
// 鏍规嵁id鏌ヨ璁板綍
export function getHonor(id) {
return request({
- url: '/zHonor/' + id,
+ url: '/zHonor/id=${id}',
method: 'get',
})
diff --git a/ruoyi-ui/src/api/root/index.js b/ruoyi-ui/src/api/root/index.js
index c1f019e..733a221 100644
--- a/ruoyi-ui/src/api/root/index.js
+++ b/ruoyi-ui/src/api/root/index.js
@@ -37,3 +37,5 @@
params: query
})
}
+
+
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 4acd499..1bcbe43 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -313,7 +313,22 @@
}
]
},
+//璇佷功銆佽祫璐�
+ {
+ path: '/self/honor',
+ component: Layout,
+ hidden: true,
+ permissions: ['self:honor:info'],
+ children: [
+ {
+ path: 'honorInfo/:id(\\d+)',
+ component: () => import('@/views/honor/honorInfo'),
+ name: 'honorInfo',
+ meta: { title: '鑽ｈ獕璇佷功璇︽儏',activeMenu: '/self/zHonor'}
+ }
+ ]
+ },
//鐧惧勾蹇冩効
{
path: '/self/wish',
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 39e2a6b..7f99517 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -162,6 +162,7 @@
<!-- <el-table-column label="瀹跺涵鍙�" prop="familyId" sortable width="100" /> -->
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
<template slot-scope="scope" >
+ <div @click="handleCheck(scope.row)">
<img
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceLis.png"
@@ -177,7 +178,7 @@
style="width: 35px; height: 35px;"
fit="cover"
v-if="scope.row.url === null"
- >
+ ></div>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 04f4456..0c79f4d 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -134,6 +134,7 @@
<el-table-column label="澶囨敞" prop="remark" sortable width="100" />
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="100" >
<template slot-scope="scope" >
+ <div @click="handleCheck(scope.row)">
<img
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceLis.png"
@@ -149,7 +150,7 @@
style="width: 35px; height: 35px;"
fit="cover"
v-if="scope.row.url === null"
- >
+ ></div>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 1002cd0..208b2bf 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -147,6 +147,7 @@
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
<template slot-scope="scope" >
+ <div @click="handleCheck(scope.row)">
<img
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceLis.png"
@@ -162,7 +163,7 @@
style="width: 35px; height: 35px;"
fit="cover"
v-if="scope.row.url === ','"
- >
+ ></div>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -635,7 +636,7 @@
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
const Ids = this.ids;
-
+
if(Ids.length==0)
{
this.download('/zfEquipment/export', {
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index 88d62f6..b394e60 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -127,6 +127,7 @@
<el-table-column label="浣欓" prop="balance" sortable width="100" />
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" align="center" sortable width="110" >
<template slot-scope="scope" >
+ <div @click="handleCheck(scope.row)">
<img
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceLis.png"
@@ -142,7 +143,7 @@
style="width: 35px; height: 35px;"
fit="cover"
v-if="scope.row.url === ','"
- >
+ ></div>
</template>
</el-table-column>
<el-table-column label="澶囨敞" prop="remark" sortable width="100" >
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index eb291bd..4e1626f 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -480,7 +480,7 @@
},
created() {
this.getList();
- this.getCateInfor()
+ // this.getCateInfor()
// for (let i = 0; i < this.contactList.length; i++) {
// this.formDat[i] = this.contactList[i];
// }
@@ -637,7 +637,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.userId;
- alert(id)
+ // alert(id)
this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
},
@@ -701,11 +701,27 @@
}).catch(() => {});
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ // handleExport() {
+ // this.download('/self/user/export/genealogy', {
+ // ...this.queryParams
+ // }, `zGenealogy_${new Date().getTime()}.xlsx`)
+ // },
+
handleExport() {
- this.download('/self/user/export/genealogy', {
- ...this.queryParams
- }, `zGenealogy_${new Date().getTime()}.xlsx`)
+ const Ids = this.ids;
+
+ if(Ids.length==0)
+ {
+ this.download('/self/user/export/genealogy', {
+ ...this.queryParams
+ }, `zGenealogy_${new Date().getTime()}.xlsx`)
+ }else{
+ this.download('/self/user/export/genealogy/'+Ids, {
+
+ }, `zGenealogy_${new Date().getTime()}.xlsx`)
+ }
},
+
/** 瀵煎叆鎿嶄綔*/
// handleEnport(params){
// var file = params.file;
diff --git a/ruoyi-ui/src/views/homeRoot/index.vue b/ruoyi-ui/src/views/homeRoot/index.vue
index 8208fef..2d294c1 100644
--- a/ruoyi-ui/src/views/homeRoot/index.vue
+++ b/ruoyi-ui/src/views/homeRoot/index.vue
@@ -24,72 +24,79 @@
<div v-model="rootList.url">
<el-avatar shape="circle" class="avater_1_1" v-if="isShow_1">
<img :src="'http://47.93.189.255:8080/'+ rootList[0].url"
- @click="getPersonInfo(rootList[0].userId)"></img>
+ @click="getPersonInfo(rootList[0].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_1_2" v-if="isShow_1">
<img :src="'http://47.93.189.255:8080/'+ rootList[1].url"
- @click="getPersonInfo(rootList[1].userId)"></img>
+ @click="getPersonInfo(rootList[1].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_1" v-if="isShow_2">
<img :src="'http://47.93.189.255:8080/'+ rootSecList[0][0].url"
- @click="getPersonInfo(rootSecList[0][0].userId)"></img>
+ @click="getPersonInfo(rootSecList[0][0].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_2" v-if="isShow_2">
<img :src="'http://47.93.189.255:8080/'+ rootSecList[0][1].url"
- @click="getPersonInfo(rootSecList[0][1].userId)"></img>
+ @click="getPersonInfo(rootSecList[0][1].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_3" v-if="isShow_2">
<img :src="'http://47.93.189.255:8080/'+ rootSecList[1][0].url"
- @click="getPersonInfo(rootSecList[1][0].userId)"></img>
+ @click="getPersonInfo(rootSecList[1][0].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_4" v-if="isShow_2">
<img :src="'http://47.93.189.255:8080/'+ rootSecList[1][1].url"
- @click="getPersonInfo(rootSecList[1][1].userId)"></img>
+ @click="getPersonInfo(rootSecList[1][1].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_5" v-if="isShow_2">
<img :src="'http://47.93.189.255:8080/'+ rootSecList[2][0].url"
- @click="getPersonInfo(rootSecList[2][0].userId)"></img>
+ @click="getPersonInfo(rootSecList[2][0].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_6" v-if="isShow_2">
<img :src="'http://47.93.189.255:8080/'+ rootSecList[2][1].url"
- @click="getPersonInfo(rootSecList[2][1].userId)"></img>
+ @click="getPersonInfo(rootSecList[2][1].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_7" v-if="isShow_2">
<img :src="'http://47.93.189.255:8080/'+ rootSecList[3][0].url"
- @click="getPersonInfo(rootSecList[3][0].userId)"></img>
+ @click="getPersonInfo(rootSecList[3][0].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_8" v-if="isShow_2">
<img :src="'http://47.93.189.255:8080/'+ rootSecList[3][1].url"
- @click="getPersonInfo(rootSecList[3][1].userId)"></img>
+ @click="getPersonInfo(rootSecList[3][1].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_3_1" v-if="isShow_3">
<img :src="'http://47.93.189.255:8080/'+ rootSecList[0][0].url"
- @click="getPersonInfo(rootSecList[0][0].userId)"></img>
+ @click="getPersonInfo(rootSecList[0][0].userId)">
</el-avatar>
+
<el-avatar shape="circle" class="avater_3_2" v-if="isShow_3">
<el-img :src="'http://47.93.189.255:8080'+ rootList.url"
></el-img>
</el-avatar>
+
<el-avatar shape="circle" class="avater_3_3" v-if="isShow_3">
<el-img :src="'http://47.93.189.255:8080'+ rootList.url"
></el-img>
</el-avatar>
+
<el-avatar shape="circle" class="avater_3_4" v-if="isShow_3">
<el-img :src="'http://47.93.189.255:8080'+ rootList.url"
></el-img>
</el-avatar>
+
<el-avatar shape="circle" class="avater_3_5" v-if="isShow_3">
<el-img :src="'http://47.93.189.255:8080'+ rootList.url"
></el-img>
</el-avatar>
+
<el-avatar shape="circle" class="avater_3_6" v-if="isShow_3">
<el-img :src="'http://47.93.189.255:8080'+ rootList.url"
></el-img>
</el-avatar>
+
<el-avatar shape="circle" class="avater_3_7" v-if="isShow_4">
<el-img :src="'http://47.93.189.255:8080'+ rootList.url"
></el-img>
</el-avatar>
+
<el-avatar shape="circle" class="avater_3_8" v-if="isShow_3">
<el-img :src="'http://47.93.189.255:8080'+ rootList.url"
></el-img>
diff --git a/ruoyi-ui/src/views/homeRoot/personInfo.vue b/ruoyi-ui/src/views/homeRoot/personInfo.vue
index 43167c3..595c8f9 100644
--- a/ruoyi-ui/src/views/homeRoot/personInfo.vue
+++ b/ruoyi-ui/src/views/homeRoot/personInfo.vue
@@ -272,6 +272,7 @@
disabled: false,
personInfos:[],
loading: true,
+ dsb:true,
formData:{
userId: undefined,
nickName: undefined,
@@ -367,7 +368,7 @@
}
,
mounted() {
- const id = this.$route.params && this.$route.params.id;
+ const id = this.$route.params && this.$route.params.id;
this.getList(id);
},
methods:{
diff --git a/ruoyi-ui/src/views/honor/honorInfo.vue b/ruoyi-ui/src/views/honor/honorInfo.vue
index d424aa9..7738e57 100644
--- a/ruoyi-ui/src/views/honor/honorInfo.vue
+++ b/ruoyi-ui/src/views/honor/honorInfo.vue
@@ -197,6 +197,7 @@
import {Message} from "element-ui";
import { download,uploadPic} from "@/api/doctor/index";
import {listHonor,updateHonor,getHonor} from "@/api/honor/index";
+import {listRoot} from "@/api/root";
export default {
components: {},
@@ -307,33 +308,88 @@
let _this = this
if (id) {
this.loading = true;
- getHonor(id).then((response) => {
- this.formData = response.data;
- let paths = response.data.url.split(",");
- for(let i = 0; i < paths.length; i++)
- {
- if(paths[i]!="") {
+ // getHonor(id).then((response) => {
+ // this.formData = response.data;
+ // let paths = response.data.url.split(",");
+ // for(let i = 0; i < paths.length; i++)
+ // {
+ // if(paths[i]!="") {
+ //
+ // let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+ //
+ // if (_this.fot.includes(pth) === true)
+ // _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ // else {
+ // // alert(paths[i])
+ // let nms = paths[i].split("\/")
+ // let nm = nms[nms.length - 1]
+ // _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ // }
+ // }
+ // }
+ // this.loading = false;
+ // });
- let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
-
- if (_this.fot.includes(pth) === true)
- _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
- else {
- // alert(paths[i])
- let nms = paths[i].split("\/")
- let nm = nms[nms.length - 1]
- _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
- }
- }
- }
- this.loading = false;
- });
+ this.fetchData()
this.getCateInfor()
}
+ //浠ヤ笅涓簍est
+ // if (id){
+ // this.loading =true;
+ // getHonor(id).then((response)=> {
+ // this.formData =response.data;
+ // let paths=response.data.url.split(" ");
+ // for(let i = 0; i < paths.length; i++){
+ // if(paths[i]!=""){
+ // let pth = paths[i].substr(paths[i].length - 4, paths[i].length);
+ // if (_this.fot.includes(pth)) {
+ // _this.fileList.push({
+ // name: paths[i],
+ // url: process.env.VUE_APP_BASE_TRUE_API + paths[i],
+ // });
+ // } else {
+ // // alert(paths[i])
+ // let nms = paths[i].split("\/")
+ // let nm = nms[nms.length - 1]
+ // _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ // }
+ // }
+ // }
+ // this.loading = false;
+ // });
+ //
+ // // getHonor(id).then(response => {
+ // // // alert(123)
+ // // // alert(123)
+ // // // console.log(response.data)
+ // // // alert(90)
+ // // this.formData = response.data;
+ // // this.isShow_1=true
+ // // // alert(this.rootList[0].url)
+ // // // this.total = response.data.total;
+ // // this.loading = false;
+ // // }
+ // // );
+ // this.getCateInfor()
+ //
+ // }
},
mounted() {},
methods: {
+ // 鑾峰彇鏁版嵁鏂规硶
+ fetchData(id) {
+ const url = 'http://47.93.189.255:8080/zHonor/id=${id}'; // 鎺ュ彛 URL'/zHonor/id='+query
+ fetch(url)
+ .then(response => response.json())
+ .then(data => {
+ this.formData = data; // 閫氳繃灏嗚繑鍥炴暟鎹祴缁欑粍浠跺睘鎬ф潵鏇存柊瑙嗗浘
+ })
+ .catch(error => {
+ console.error('Error:', error); // 澶勭悊閿欒
+ });
+ },
+
/** 鏌ヨ绫诲埆淇℃伅 */
getCateInfor()
{
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index 9fe1546..8c175f8 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -207,6 +207,7 @@
</el-table-column>
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
<template slot-scope="scope" >
+ <div @click="handleCheck(scope.row)">
<img
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceLis.png"
@@ -222,7 +223,7 @@
style="width: 35px; height: 35px;"
fit="cover"
v-if="scope.row.url ===',' "
- >
+ ></div>
</template>
</el-table-column>
<el-table-column label="澶囨敞" prop="remark" sortable width="120" align="center">
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index a8eab94..64d56a9 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -146,6 +146,7 @@
</el-table-column>
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
<template slot-scope="scope" >
+ <div @click="handleCheck(scope.row)">
<img
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceLis.png"
@@ -161,7 +162,7 @@
style="width: 35px; height: 35px;"
fit="cover"
v-if="scope.row.url === null"
- >
+ ></div>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 179c6fe..3d94ca3 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container" style="opacity: 1;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-
+
<el-form-item label="鏃堕棿" >
<el-date-picker
v-model="queryParams.happenTime"
@@ -22,7 +22,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
-
+
<el-form-item label="璐﹀彿" prop="useFor">
<el-input
v-model="queryParams.useFor"
@@ -37,7 +37,7 @@
<el-button size="mini" @click="resetQuery" style=" width: 65px;height: 32px; background: #FFDDE3; border-radius:6px 6px 6px 6px;opacity: 1;">閲嶇疆</el-button>
</el-form-item>
</el-form>
-
+
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@@ -49,7 +49,7 @@
v-hasPermi="['system:role:add']"
>鏂板</el-button>
</el-col>
-
+
<el-col :span="1.5">
<el-button
type="danger"
@@ -91,12 +91,12 @@
<el-button size="mini" type="primary"
plain
icon="el-icon-plus" >瀵煎叆</el-button>
-
+
</el-upload>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
-
+
<el-table v-loading="loading" :data="secretList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" @row-click="handleCheck" :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" />
@@ -119,7 +119,7 @@
<el-table-column label="绉佹湁/鍏湁" prop="isPrivate" sortable width="100" >
<template slot-scope="scope">{{scope.row.isFace===1 ?'绉佹湁': '鍏湁'}}</template>
</el-table-column>
- <el-table-column label="瀛樻斁浣嶇疆" prop="location" sortable width="100" >
+ <el-table-column label="瀛樻斁浣嶇疆" prop="location" sortable width="100" >
<template slot-scope="scope">{{scope.row.location? scope.row.location: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="澶囨敞" prop="remark" sortable width="100" >
@@ -127,6 +127,7 @@
</el-table-column>
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" align="center" sortable width="110" >
<template slot-scope="scope" >
+ <div @click="handleCheck(scope.row)">
<img
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceLis.png"
@@ -142,10 +143,10 @@
style="width: 35px; height: 35px;"
fit="cover"
v-if="scope.row.url === ','"
- >
+ ></div>
</template>
</el-table-column>
-
+
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
@@ -164,12 +165,12 @@
>鍒犻櫎</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:economy:info']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
-
+
</el-dropdown>
</template>
</el-table-column>
</el-table>
-
+
<pagination
v-show="total>0"
:total="total"
@@ -178,12 +179,12 @@
@pagination="getList"
style="background: #FEF7FC;"
/>
-
+
<!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
<!-- 璁惧鍚嶇О銆佹椂闂淬�佽喘涔颁汉銆佷簨椤瑰唴瀹广�佸瓨鏀惧湴鐐广�佸娉ㄣ�佺數瀛愭枃浠� -->
<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-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model='formDat.happenTime'
@@ -197,7 +198,7 @@
<el-form-item label="璐﹀彿" prop="accNo">
<el-input v-model="formDat.accNo" placeholder="璇疯緭鍏ヨ处鍙�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
-
+
<el-form-item label="鏈夋晥鏈�" prop="validityDate">
<el-date-picker
v-model='formDat.validityDate'
@@ -226,7 +227,7 @@
></el-option>
</el-select>
</el-form-item>
-
+
<el-form-item label="瀛樻斁浣嶇疆" prop="location">
<el-input v-model="formDat.location" placeholder="璇疯緭鍏ュ瓨鏀句綅缃�" clearable :style="{width: '100%'}" >
@@ -236,7 +237,7 @@
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
-
+
<h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
@@ -262,7 +263,7 @@
>
<i class="el-icon-zoom-in"></i>
</span>
-
+
<span
v-if="!disabled"
class="el-upload-list__item-delete"
@@ -271,8 +272,8 @@
<i class="el-icon-delete"></i>
</span>
</span>
-
-
+
+
</div>
</el-upload>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -281,7 +282,7 @@
:file-list="fileListOther"
class="upload-demo"
multiple
-
+
:on-remove="handleRemove"
:http-request="requestUpload"
:show-file-list="true"
@@ -292,33 +293,33 @@
</div>
</template>
</el-upload>
-
+
</el-form>
<h4 class="form-header"> </h4>
-
+
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
</div>
</el-dialog>
-
+
<!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
-
+
</el-dialog>
-
+
</div>
</template>
-
+
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-
-
-
+
+
+
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
import {listSecret,enload,getEconomyInfo,delSecret, addSecret, uploadPic} from "@/api/secret/index";
-
+
export default {
name: "Role",
dicts: ['sys_normal_disable'],
@@ -357,7 +358,7 @@
fileList:[
],
fileListOther:[
-
+
],
dsb:true,
btn:false,
@@ -386,7 +387,7 @@
type:undefined,
accNo:undefined,
createTime:undefined,
-
+
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -401,7 +402,7 @@
message: '璇疯緭鍏ュ瘑鐮�',
trigger: 'blur'
}],
-
+
accNo: [{
required: true,
message: '璇疯緭鍏ヨ处鍙�',
@@ -466,10 +467,10 @@
created() {
this.getList();
this.getCateInfor()
-
+
},
methods: {
-
+
//鍩洪噾/鍙拌处鐨勯�夋嫨
getSrc1(type) {
if (type === 0) {
@@ -478,7 +479,7 @@
return '鍙拌处'
}
},
-
+
getSrc2(kind) {
if (kind == 0) {
return '鐜伴噾'
@@ -486,13 +487,13 @@
return '鑷姩鎵ｅ垝'
}
},
-
+
// 鍙栨秷鎸夐挳
cancelData() {
this.open = false;
this.reset();
},
-
+
//闅旇鍙樿壊
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 0) {
@@ -501,18 +502,18 @@
return "statistics-warning-row";
}
},
-
+
/** 鏌ヨ瑙掕壊鍒楄〃 */
//鍒楄〃鏄剧ず瀹跺ぇ浜嬭
-
-
+
+
getList() {
this.loading = true;
this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-
+
listSecret(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
@@ -585,15 +586,15 @@
this.single = selection.length!=1
this.multiple = !selection.length
},
-
+
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
this.open = true;
this.title = "娣诲姞钘忓績瀵嗚";
},
-
-
+
+
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
@@ -603,7 +604,7 @@
handleUpdate(row) {
const id = row.id;
let jd = true
-
+
this.$router.push({
path:"/self/secret/secretInfo/" + id,
query:{
@@ -611,15 +612,15 @@
}
});
},
-
-
+
+
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
-
+
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
@@ -629,7 +630,7 @@
this.formDat.url = ul+","+uls
this.$refs["elForm"].validate(valid => {
if (valid) {
-
+
addSecret(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
@@ -644,22 +645,22 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
+
}
-
+
else{
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
}
})
-
+
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
@@ -674,7 +675,7 @@
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
const Ids = this.ids;
-
+
if(Ids.length==0)
{
this.download('/zSecret/export', {
@@ -689,7 +690,7 @@
,
handleExportTemplate(){
this.download('/zSecret/model', {
-
+
}, `zSecret_${new Date().getTime()}.xlsx`)
},
/** 瀵煎叆鎿嶄綔*/
@@ -702,26 +703,25 @@
enload(formData).then(response => {
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
-
+
}).catch(err)
{
Message({ message: "瀵煎叆澶辫触", type: 'error' })
}
-
+
}
}
-
+
};
</script>
-
+
<style>
.el-table__row.statistics-warning-row {
background: #E0EEFE;
-
+
}
.el-table__row.statistics-warning-row1 {
background: #FFEFF2;
-
+
}
</style>
-
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 28d03cc..a0bb643 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -15,11 +15,11 @@
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
-
-
+
+
</el-form-item>
-
+
<el-form-item label="鏃ユ湡">
<el-date-picker
v-model="dateRange"
@@ -36,7 +36,7 @@
end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
</el-form-item>
-
+
<el-form-item label="璐骇绫诲埆" prop="type">
<el-input
v-model="queryParams.type"
@@ -47,7 +47,7 @@
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
-
+
<el-form-item label="鏀舵敮鍚嶇О" prop="incomeName" >
<el-input
v-model="queryParams.incomeName"
@@ -58,7 +58,7 @@
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
-
+
<el-form-item label="鏈熼檺" prop="timeLimit">
<el-input
v-model="queryParams.timeLimit"
@@ -93,7 +93,7 @@
v-hasPermi="['system:role:add']"
>鏂板</el-button>
</el-col>
-
+
<el-col :span="1.5">
<el-button
type="danger"
@@ -126,10 +126,10 @@
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
<el-col :span="1.2">
-
+
<el-upload
action=""
-
+
class="upload-demo"
:show-file-list="false"
:http-request="handleEnport"
@@ -172,10 +172,11 @@
<el-table-column label="鏄惁娉ㄩ攢" prop="status" sortable width="100" align="center">
<template slot-scope="scope">{{scope.row.status===1? '鏄�': '鍚�'}}</template>
</el-table-column>
-
+
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="80" align="center">
-
+
<template slot-scope="scope" >
+ <div @click="handleCheck(scope.row)">
<img
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceLis.png"
@@ -191,7 +192,7 @@
style="width: 35px; height: 35px;"
fit="cover"
v-if="scope.row.url === ','"
- >
+ ></div>
</template>
</el-table-column>
<el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
@@ -222,14 +223,14 @@
type="text"
icon="el-icon-d-arrow-right"
@click="handleCheck(scope.row)"
-
+
>鏌ョ湅璇︽儏</el-button>
-
+
</el-dropdown>
</template>
</el-table-column>
</el-table>
-
+
<pagination
v-show="total>0"
:total="total"
@@ -238,7 +239,7 @@
style="background: #FEF7FC;"
@pagination="getList"
/>
-
+
<!-- 娣诲姞鏀惰棌涓庤崳瑾変俊鎭厤缃璇濇 -->
<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">
@@ -282,11 +283,11 @@
></el-option>
</el-select>
</el-form-item>
-
+
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
-
+
<h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
<el-upload
action="#"
@@ -312,7 +313,7 @@
>
<i class="el-icon-zoom-in"></i>
</span>
-
+
<span
v-if="!disabled"
class="el-upload-list__item-delete"
@@ -321,8 +322,8 @@
<i class="el-icon-delete"></i>
</span>
</span>
-
-
+
+
</div>
</el-upload>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -331,7 +332,7 @@
:file-list="fileListOther"
class="upload-demo"
multiple
-
+
:on-remove="handleRemove"
:http-request="requestUpload"
:show-file-list="true"
@@ -342,36 +343,36 @@
</div>
</template>
</el-upload>
-
+
</el-form>
<h4 class="form-header"> </h4>
-
+
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
</div>
</el-dialog>
-
+
<!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
-
+
</el-dialog>
-
+
</div>
</template>
-
+
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-
-
-
+
+
+
//瀵煎叆鎺ュ彛鍑芥暟
import {listSelfEconomy, getSelfEconomyInfo, addSelfEconomy,delSelfEconomy, updateSelfEconomy,uploadPic,downloadModel} from "@/api/selfeconomy/index";
// import {enload} from "@/api/doctor";
import {Message} from "element-ui";
-
-
+
+
export default {
name: "index",
dicts: ['sys_normal_disable'],
@@ -379,7 +380,7 @@
return {
// 閬僵灞�
disabled: false,
-
+
loading: true,
formData:[],
// 閫変腑鏁扮粍
@@ -411,12 +412,12 @@
fileList:[
],
fileListOther:[
-
+
],
dsb:true,
btn:false,
fit:['fill'],
-
+
formDat: {
//鐧惧勾蹇冩効璁板綍
id:undefined,
@@ -431,7 +432,7 @@
location:undefined,
remark:undefined,
url: undefined,
-
+
},
// 鑿滃崟鍒楄〃
menuOptions: [],
@@ -447,7 +448,7 @@
// happenTime:undefined,
},
// searchVal:"",
-
+
// 琛ㄥ崟鍙傛暟
form: {},
defaultProps: {
@@ -456,7 +457,7 @@
},
// 琛ㄥ崟鏍￠獙
rules: {
-
+
type: [{
required: true,
message: '璇疯緭鍏ヨ储浜х被鍒�',
@@ -502,7 +503,7 @@
message: '璇疯緭鍏ュ疄鐜伴毦搴�',
trigger: 'blur'
}],
-
+
remark: [{
// required: true,
message: '璇疯緭鍏ュ娉�',
@@ -527,7 +528,7 @@
// }
},
methods: {
-
+
// getSrc1(status) {
// if (status === 1) {
// return '鏄�'
@@ -535,7 +536,7 @@
// return '鍚�'
// }
// },
-
+
// 鍙栨秷鎸夐挳
cancelData() {
this.open = false;
@@ -559,13 +560,13 @@
console.log(this.queryParams)
this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
-
+
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listSelfEconomy(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
this.selfeconomyList = response.data.data;
-
+
this.total = response.data.total;
this.loading = false;
}
@@ -633,8 +634,8 @@
// );
// this.contactList = newlist;
// },
-
-
+
+
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
@@ -645,13 +646,13 @@
handleCheck(row){
const id = row.id;
this.$router.push("/self/selfeconomy/selfeconomyInfo/" + id);
-
+
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
const id = row.id;
let jd = true
-
+
this.$router.push({
path:"/self/selfeconomy/selfeconomyInfo/" + id,
query:{
@@ -659,15 +660,15 @@
}
});
},
-
-
+
+
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
-
+
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
@@ -677,7 +678,7 @@
this.formDat.url = ul+","+uls
this.$refs["elForm"].validate(valid => {
if (valid) {
-
+
addSelfEconomy(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
@@ -692,22 +693,22 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
+
}
-
+
else{
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
}
})
-
+
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
@@ -722,7 +723,7 @@
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
const Ids = this.ids;
-
+
if(Ids.length==0)
{
this.download('zIdea/export', {
@@ -733,27 +734,27 @@
}, `zIdea_${new Date().getTime()}.xlsx`)
}
},
-
+
/** 瀵煎叆妯℃澘涓嬭浇鎸夐挳鎿嶄綔 */
handleExportModel() {
-
+
this.download('/zIdea/model', {
}, `zIdea_model_${new Date().getTime()}.xlsx`)
},
-
+
/** 瀵煎叆鎿嶄綔*/
handleEnport(params){
var file = params.file;
var formData = new FormData();
formData.append('excelImport', file);
let _this = this
-
+
enload(formData).then(response => {
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
-
+
}).catch(() => { Message({ message: "瀵煎叆澶辫触", type: 'error' })});
-
+
}
}
};
@@ -762,16 +763,15 @@
.app-container{
background-color: #FEF7FC;
}
-
+
.el-table__row.statistics-warning-row {
background: #E0EEFE;
-
+
}
.el-table__row.statistics-warning-row1 {
background: #FFEFF2;
-
+
}
-
-
+
+
</style>
-
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index ed74568..d9099f8 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -211,6 +211,7 @@
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
<template slot-scope="scope" >
+ <div @click="handleCheck(scope.row)">
<img
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceLis.png"
@@ -226,7 +227,7 @@
style="width: 35px; height: 35px;"
fit="cover"
v-if="scope.row.url === ','"
- >
+ ></div>
</template>
</el-table-column>
<el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
--
Gitblit v1.9.1