From 04f90e085432fbd3302ffd248c22050ff2fd2509 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 19 五月 2023 11:14:39 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/self/show.vue | 45 ++++++++++++----------
ruoyi-ui/src/views/collection/collectionInfo.vue | 12 +++++-
ruoyi-ui/src/views/contacts/index.vue | 2
ruoyi-ui/src/views/collection/index.vue | 4 +-
ruoyi-ui/src/views/doctor/index.vue | 6 +-
ruoyi-ui/src/views/login.vue | 6 +-
6 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index 1e51cf3..ce641b6 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -392,10 +392,18 @@
})
},
handleRemoveFile(file) {
- alert(23)
+ for(let i = 0; i < this.fileListOther.length; i++)
+ {
+ if(this.fileListOther[i].url==file.url)
+ this.$delete(this.fileListOther,i);
+ }
},
handleRemove(file) {
- alert(323)
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ this.$delete(this.fileList,i);
+ }
},
handleFileCardPreview(file){
this.dialogFileUrl = file.url;
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index eaf2fe4..c75f408 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -196,7 +196,7 @@
</div>
<el-table v-loading="loading" :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="25" align="center" />
- <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
+ <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
<el-table-column label="鑾峰緱鏃堕棿" prop="happenTime" sortable width="100" align="center">
<template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
@@ -226,7 +226,7 @@
<el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" >
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
<template slot-scope="scope" >
<img
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index c67b919..fcdbe5f 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -142,7 +142,7 @@
</div>
<el-table v-loading="loading" :data="contactList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="25" align="center" />
- <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
+ <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
<el-table-column label="鎴愬憳濮撳悕" prop="myName" sortable width="160" >
<template slot-scope="scope">
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 051f124..1c34e64 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -188,7 +188,7 @@
<el-table v-loading="loading" :data="doctorList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="25" align="center" />
- <el-table-column label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
+ <el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
<el-table-column label="绫诲瀷" prop="type" sortable width="80" align="center">
<template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
@@ -726,7 +726,7 @@
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
const Ids = this.ids;
-
+
if(Ids.length==0)
{
this.download('/zfDoctor/export', {
@@ -734,7 +734,7 @@
}, `zfDoctor_${new Date().getTime()}.xlsx`)
}else{
this.download('/zfDoctor/export1/'+Ids, {
-
+
}, `zfDoctor_${new Date().getTime()}.xlsx`)
}
},
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 6146359..1d0cb0c 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -124,9 +124,9 @@
</el-form-item>
</el-form>
<!-- 搴曢儴 -->
- <div class="el-login-footer">
- <span>Copyright 漏 GDUT All Rights Reserved.</span>
- <a href="https://beian.miit.gov.cn/" target="_blank" >绮CP澶�2023050334鍙� </a>
+ <div class="el-login-footer" >
+ <span style="color: black; ">Copyright 漏 GDUT All Rights Reserved.</span>
+ <a href="https://beian.miit.gov.cn/" target="_blank" style="color: black; ">绮CP澶�2023050334鍙� </a>
</div>
</div>
</template>
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 3f897d2..7526b7e 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -326,29 +326,32 @@
<div style="width:100%"><h2 style="font-size:15px" >鑷紶</h2></div>
</el-container>
<el-tabs type="border-card" v-model="activeName" @tab-click="handleClick"
- v-loading="loading" :data="AutobiographyList" @selection-change="handleSelectionChange">
- <el-tab-pane v-for="item in AutobiographyList" :key="item.id" :label="item.label" :name="item.id">
- <div v-if="item.id === '1'">
- // 鏄剧ず涓巌d涓�1鐨勫瓧鍏搁」鐩稿叧鐨勫唴瀹�
- </div>
- <div v-else-if="item.id === '2'">
- // 鏄剧ず涓巌d涓�2鐨勫瓧鍏搁」鐩稿叧鐨勫唴瀹�
- </div>
- <div v-else>
- // 鏄剧ず涓庡叾浠栧瓧鍏搁」鐩稿叧鐨勫唴瀹�
- </div>
+ v-loading="loading" :data="AutobiographyList" >
+ <el-tab-pane v-for="(item, index) in AutobiographyList"
+ :key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'宀�'+'('+item.term+')'">
+ <div v-if="item.term === '濠村効'"> {{item.content}}</div>
+ <div v-if="item.term === '骞煎効'"> {{item.content}}</div>
+ <div v-if="item.term === '灏忓'"> {{item.content}}</div>
+ <div v-if="item.term === '鍒濅腑'"> {{item.content}}</div>
+ <div v-if="item.term === '楂樹腑'"> {{item.content}}</div>
+ <div v-if="item.term === '澶у'"> {{item.content}}</div>
+ <div v-if="item.term === '鐮旂┒鐢�'"> {{item.content}}</div>
+ <div v-if="item.term === '宸ヤ綔'"> {{item.content}}</div>
+ <div v-if="item.term === '缁撳鍚�'"> {{item.content}}</div>
</el-tab-pane>
-<!-- <el-tab-pane label="0~3宀�(濠村効鏈�)" name="1" >-->
-<!--<!– <el-input v-model="AutobiographyList.content" prop="content" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">–>-->
-<!--<!– </el-input>–>-->
+<!-- <el-tab-pane label="濠村効" >-->
+<!-- <div v-if="AutobiographyList.term === '濠村効'" v-model="AutobiographyList.content">-->
+<!-- {{AutobiographyList.content}}-->
+<!-- </div>-->
<!-- </el-tab-pane>-->
-<!-- <el-tab-pane label="6~12(灏忓)" name="2" ></el-tab-pane>-->
-<!-- <el-tab-pane label="12~15(鍒濅腑)" name="3"></el-tab-pane>-->
-<!-- <el-tab-pane label="15~18(楂樹腑)" name="4"></el-tab-pane>-->
-<!-- <el-tab-pane label="18~22(澶у)" name="5"></el-tab-pane>-->
-<!-- <el-tab-pane label="22~25(鐮旂┒鐢�)" name="6"></el-tab-pane>-->
-<!-- <el-tab-pane label="26~ (宸ヤ綔)" name="7"></el-tab-pane>-->
-<!-- <el-tab-pane label="锛熷瞾缁撳" name="8"></el-tab-pane>-->
+<!-- <el-tab-pane label="3~6宀�(骞煎効鏈�)" name="2" ></el-tab-pane>-->
+<!-- <el-tab-pane label="6~12(灏忓)" name="3" ></el-tab-pane>-->
+<!-- <el-tab-pane label="12~15(鍒濅腑)" name="4"></el-tab-pane>-->
+<!-- <el-tab-pane label="15~18(楂樹腑)" name="5"></el-tab-pane>-->
+<!-- <el-tab-pane label="18~22(澶у)" name="6"></el-tab-pane>-->
+<!-- <el-tab-pane label="22~25(鐮旂┒鐢�)" name="7"></el-tab-pane>-->
+<!-- <el-tab-pane label="26~ (宸ヤ綔)" name="8"></el-tab-pane>-->
+<!-- <el-tab-pane label="锛熷瞾缁撳" name="9"></el-tab-pane>-->
<!-- <!– </div>–>-->
<!-- <!– <el-tab-pane–>-->
<!-- <!– v-for="(item, index) in AutobiographyTermList"–>-->
--
Gitblit v1.9.1