From fa2bbe82b73ff975f520caf8f9d32b2c98c7bd56 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期日, 17 九月 2023 23:49:20 +0800
Subject: [PATCH] 完善成长经历阅历,解决折叠面板文字重叠,自传的新增样式已修改,自传已可以成功修改内容
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 42 +-
ruoyi-ui/src/views/self/show.vue | 91 +++--
ruoyi-ui/src/views/genealogy/index.vue | 3
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java | 18
ruoyi-ui/src/views/shouye/shouye.vue | 15 +
ruoyi-ui/src/views/index.vue | 68 ++-
ruoyi-ui/src/views/search/index.vue | 616 +++++++++++++++++++++++++++++++++++++++++
ruoyi-ui/src/api/search/index.js | 1
ruoyi-ui/src/router/index.js | 23 +
ruoyi-ui/src/views/wish/index.vue | 3
ruoyi-ui/src/assets/images/shouye.png | 0
11 files changed, 782 insertions(+), 98 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
index 4889f81..5d8631a 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
@@ -39,7 +39,7 @@
/**
* 涓氬姟 鏈嶅姟灞傚疄鐜�
- *
+ *
* @author ruoyi
*/
@Service
@@ -55,7 +55,7 @@
/**
* 鏌ヨ涓氬姟淇℃伅
- *
+ *
* @param id 涓氬姟ID
* @return 涓氬姟淇℃伅
*/
@@ -69,7 +69,7 @@
/**
* 鏌ヨ涓氬姟鍒楄〃
- *
+ *
* @param genTable 涓氬姟淇℃伅
* @return 涓氬姟闆嗗悎
*/
@@ -81,7 +81,7 @@
/**
* 鏌ヨ鎹簱鍒楄〃
- *
+ *
* @param genTable 涓氬姟淇℃伅
* @return 鏁版嵁搴撹〃闆嗗悎
*/
@@ -93,7 +93,7 @@
/**
* 鏌ヨ鎹簱鍒楄〃
- *
+ *
* @param tableNames 琛ㄥ悕绉扮粍
* @return 鏁版嵁搴撹〃闆嗗悎
*/
@@ -105,7 +105,7 @@
/**
* 鏌ヨ鎵�鏈夎〃淇℃伅
- *
+ *
* @return 琛ㄤ俊鎭泦鍚�
*/
@Override
@@ -116,7 +116,7 @@
/**
* 淇敼涓氬姟
- *
+ *
* @param genTable 涓氬姟淇℃伅
* @return 缁撴灉
*/
@@ -138,7 +138,7 @@
/**
* 鍒犻櫎涓氬姟瀵硅薄
- *
+ *
* @param tableIds 闇�瑕佸垹闄ょ殑鏁版嵁ID
* @return 缁撴灉
*/
@@ -152,7 +152,7 @@
/**
* 瀵煎叆琛ㄧ粨鏋�
- *
+ *
* @param tableList 瀵煎叆琛ㄥ垪琛�
*/
@Override
@@ -187,7 +187,7 @@
/**
* 棰勮浠ｇ爜
- *
+ *
* @param tableId 琛ㄧ紪鍙�
* @return 棰勮鏁版嵁鍒楄〃
*/
@@ -220,7 +220,7 @@
/**
* 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
- *
+ *
* @param tableName 琛ㄥ悕绉�
* @return 鏁版嵁
*/
@@ -236,7 +236,7 @@
/**
* 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
- *
+ *
* @param tableName 琛ㄥ悕绉�
*/
@Override
@@ -257,7 +257,7 @@
List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
for (String template : templates)
{
- if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm"))
+ if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "shouye.vue.vm", "index-tree.vue.vm"))
{
// 娓叉煋妯℃澘
StringWriter sw = new StringWriter();
@@ -278,7 +278,7 @@
/**
* 鍚屾鏁版嵁搴�
- *
+ *
* @param tableName 琛ㄥ悕绉�
*/
@Override
@@ -333,7 +333,7 @@
/**
* 鎵归噺鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
- *
+ *
* @param tableNames 琛ㄦ暟缁�
* @return 鏁版嵁
*/
@@ -392,7 +392,7 @@
/**
* 淇敼淇濆瓨鍙傛暟鏍￠獙
- *
+ *
* @param genTable 涓氬姟淇℃伅
*/
@Override
@@ -430,7 +430,7 @@
/**
* 璁剧疆涓婚敭鍒椾俊鎭�
- *
+ *
* @param table 涓氬姟琛ㄤ俊鎭�
*/
public void setPkColumn(GenTable table)
@@ -466,7 +466,7 @@
/**
* 璁剧疆涓诲瓙琛ㄤ俊鎭�
- *
+ *
* @param table 涓氬姟琛ㄤ俊鎭�
*/
public void setSubTable(GenTable table)
@@ -480,7 +480,7 @@
/**
* 璁剧疆浠ｇ爜鐢熸垚鍏朵粬閫夐」鍊�
- *
+ *
* @param genTable 璁剧疆鍚庣殑鐢熸垚瀵硅薄
*/
public void setTableFromOptions(GenTable genTable)
@@ -504,7 +504,7 @@
/**
* 鑾峰彇浠ｇ爜鐢熸垚鍦板潃
- *
+ *
* @param table 涓氬姟琛ㄤ俊鎭�
* @param template 妯℃澘鏂囦欢璺緞
* @return 鐢熸垚鍦板潃
@@ -518,4 +518,4 @@
}
return genPath + File.separator + VelocityUtils.getFileName(template, table);
}
-}
\ No newline at end of file
+}
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index 7ede02d..61a1a80 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -15,7 +15,7 @@
/**
* 妯℃澘澶勭悊宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
public class VelocityUtils
@@ -139,7 +139,7 @@
templates.add("vm/js/api.js.vm");
if (GenConstants.TPL_CRUD.equals(tplCategory))
{
- templates.add("vm/vue/index.vue.vm");
+ templates.add("vm/vue/shouye.vue.vm");
}
else if (GenConstants.TPL_TREE.equals(tplCategory))
{
@@ -147,7 +147,7 @@
}
else if (GenConstants.TPL_SUB.equals(tplCategory))
{
- templates.add("vm/vue/index.vue.vm");
+ templates.add("vm/vue/shouye.vue.vm");
templates.add("vm/java/sub-domain.java.vm");
}
return templates;
@@ -209,13 +209,13 @@
{
fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
}
- else if (template.contains("index.vue.vm"))
+ else if (template.contains("shouye.vue.vm"))
{
- fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
+ fileName = StringUtils.format("{}/views/{}/{}/shouye.vue", vuePath, moduleName, businessName);
}
else if (template.contains("index-tree.vue.vm"))
{
- fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
+ fileName = StringUtils.format("{}/views/{}/{}/shouye.vue", vuePath, moduleName, businessName);
}
return fileName;
}
@@ -234,7 +234,7 @@
/**
* 鏍规嵁鍒楃被鍨嬭幏鍙栧鍏ュ寘
- *
+ *
* @param genTable 涓氬姟琛ㄥ璞�
* @return 杩斿洖闇�瑕佸鍏ョ殑鍖呭垪琛�
*/
@@ -264,7 +264,7 @@
/**
* 鏍规嵁鍒楃被鍨嬭幏鍙栧瓧鍏哥粍
- *
+ *
* @param genTable 涓氬姟琛ㄥ璞�
* @return 杩斿洖瀛楀吀缁�
*/
@@ -283,7 +283,7 @@
/**
* 娣诲姞瀛楀吀鍒楄〃
- *
+ *
* @param dicts 瀛楀吀鍒楄〃
* @param columns 鍒楅泦鍚�
*/
diff --git a/ruoyi-ui/src/api/search/index.js b/ruoyi-ui/src/api/search/index.js
new file mode 100644
index 0000000..543ea86
--- /dev/null
+++ b/ruoyi-ui/src/api/search/index.js
@@ -0,0 +1 @@
+import request from '@/utils/request'
diff --git a/ruoyi-ui/src/assets/images/shouye.png b/ruoyi-ui/src/assets/images/shouye.png
index a3dca1c..2c62c4c 100644
--- a/ruoyi-ui/src/assets/images/shouye.png
+++ b/ruoyi-ui/src/assets/images/shouye.png
Binary files differ
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index b4a48e2..d438fa9 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -1,5 +1,7 @@
import Vue from 'vue'
import Router from 'vue-router'
+import Index from '@/views/index'; // 棣栭〉缁勪欢
+import OtherPage from '@/views/shouye/shouye'; // 瑕佽烦杞殑椤甸潰缁勪欢
Vue.use(Router)
@@ -76,7 +78,7 @@
component: () => import('@/views/index'),
name: 'Index',
meta: { title: '棣栭〉', icon: 'dashboard', affix: true }
- }
+ },
]
},
@@ -93,7 +95,8 @@
meta: { title: '涓汉涓績', icon: 'user' }
}
]
- }
+ },
+
]
// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
@@ -112,6 +115,22 @@
}
]
},
+ //棣栭〉閫氱煡璇︽儏
+ {
+ path:'/dashboard',
+ component:Layout,
+ hidden: true,
+ permissions: ['familymodel:property:info'],
+
+ children: [
+ {
+ path: 'shouye/:id(\\d+)',
+ component: () => import('@/views/shouye/shouye'),
+ name: 'shouye',
+ meta: { title: '閫氱煡璇︽儏' }
+ }
+ ]
+ },
//瀹跺涵璧勪骇绠＄悊
{
path: '/familymodel/Property',
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index b723ec3..152afad 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -55,7 +55,7 @@
</el-select>
</el-form-item>
- <el-form-item label="鐢熸棩" prop="birth">
+ <el-form-item label="鐢熸棩" prop="birth deadDay">
<el-date-picker
v-model="dateRange"
style="width: 197px;
@@ -69,6 +69,7 @@
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
+ @keyup.enter.native="handleQuery"
></el-date-picker>
</el-form-item>
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 965fe11..873fdf0 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -2,6 +2,11 @@
<div class="app-container">
<div class="image-container">
<img class="bottom-image" src="../assets/images/shouye.png" alt="Bottom Image">
+ <div class="notification-box" :class="{ 'has-new-message': hasNewMessage }">
+ <div class="left-section">娑堟伅閫氱煡</div>
+ <el-button class="right-section " type="text" @click="handleClick">鐐瑰嚮杩涘叆</el-button>
+ <div class="new-message-dot" v-if="hasNewMessage"></div>
+ </div>
</div>
</div>
@@ -15,10 +20,15 @@
dicts: ['sys_normal_disable'],
data(){
return {
-
+ hasNewMessage:false,
};
+ },
+ created() {},
+ methods:{
+ handleClick(){
+ this.$router.push("/shouye/shouye" );
+ }
}
-
};
</script>
@@ -32,35 +42,41 @@
height: 100%;
}
.bottom-image {
- z-index: -1; /* 璁剧疆搴曞眰鍥剧墖鐨勫眰绾т负1 */
+ position: relative;
width: 100%;
height: 100%;
- /*position: absolute;*/
- top: 0;
+ z-index: 1;
}
-.text-box1 {
- position: absolute;
- top: 17.5%;
- left: 47.5%;
- transform: translate(-50%, -50%);
- width: 320px;
-}
-.text-box1 ::placeholder{
- color:#000000;
- font-size: 15px;
- font-family: Microsoft YaHei UI-Light, Microsoft YaHei UI;
-}
-.text-box2 {
+.notification-box {
position: absolute;
- top: 51%;
- left: 80%;
- transform: translate(-50%, -50%);
- width: 345px;
+ top: 500px;
+ left: 150px;
+ display: flex;
+ align-items: center;
+ width: 20%;
+ height: 8%;
+ background-color: rgba(227, 219, 219, 0.51);
+ padding: 10px;
+ /*color: white;*/
+ z-index: 2; /* 璁剧疆閫氱煡妗嗗眰绾т负2锛屾瘮鍥剧墖楂� */
}
-.text-box2 ::placeholder{
- color:#000000;
- font-size: 15px;
- font-family: Microsoft YaHei UI-Light, Microsoft YaHei UI;
+
+.left-section {
+ flex-grow: 1;
+}
+
+.right-section {
+ margin-left: 10px;
+}
+
+.new-message-dot {
+ position: absolute;
+ top: 10px;
+ right: 10px;
+ width: 8px;
+ height: 8px;
+ background-color: red;
+ border-radius: 50%;
}
</style>
diff --git a/ruoyi-ui/src/views/search/index.vue b/ruoyi-ui/src/views/search/index.vue
new file mode 100644
index 0000000..f8d3ae5
--- /dev/null
+++ b/ruoyi-ui/src/views/search/index.vue
@@ -0,0 +1,616 @@
+<template>
+ <div class="app-container">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+ <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
+ <el-input
+ v-model:phone="queryParams.phone"
+ v-model:wx="queryParams.wx"
+ v-model:qq="queryParams.qq"
+ v-model:twitter="queryParams.twitter"
+ v-model:isAlways="queryParams.isAlways"
+ v-model:remark="queryParams.remark"
+ placeholder=" "
+ clearable
+ style="width: 240px"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+
+ </el-form-item>
+ <el-form-item label="鏃堕棿" prop="happenTime">
+ <el-date-picker
+ v-model="dateRange"
+ style="width: 197px;
+ height: 30px;
+ background: #FFFFFF;
+ border-radius: 14px 14px 14px 14px;
+ opacity: 0.5;
+ border: 1px solid rgba(0,0,0,0.25);"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </el-form-item>
+
+ <el-form-item>
+ <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+ border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button>
+ <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+ border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ <span style="font-size:16px">鎼滅储缁撴灉濡備笅锛�</span>
+ <el-divider />
+
+ <el-table v-loading="loading" :data="searchList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+<!-- <el-table-column type="selection" :reserve-selection="true" width="55" align="center" />-->
+ <el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
+ <el-table-column label="鏍囪瘑" prop="type" sortable :show-overflow-tooltip="true" width="120" align="center" >
+ <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
+ <!-- <template slot-scope="scope">{{ getSrc1(scope.row.type) }}</template>-->
+ </el-table-column>
+ <el-table-column label="瀛楁" prop="name" sortable width="120" align="center" >
+ <template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鏃堕棿" prop="getDate" sortable width="170" align="center" >
+ <template slot-scope="scope">{{scope.row.getDate? scope.row.getDate: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="浣嶇疆" prop="location" sortable width="170" align="center" >
+ <template slot-scope="scope">{{scope.row.location? scope.row.location: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+
+ <!-- </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
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:role:edit']"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:role:remove']"
+ >鍒犻櫎</el-button>
+
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleCheck(scope.row)">
+ 鏌ョ湅璇︽儏</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ style="background: #FEF7FC;"
+ @pagination="getList"
+ />
+
+
+
+ <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
+ <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 {listHonor,listType,enload, addHonor,updateHonor, delHonor,uploadPic,getCategory} from "@/api/honor/index";
+
+import { Notification, MessageBox, Message, Loading } from 'element-ui'
+export default {
+ name: "index",
+ dicts: ['sys_normal_disable'],
+ data() {
+ return {
+ // 閬僵灞�
+ disabled: false,
+
+ loading: true,
+ formData:[],
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 鑽ｈ獕琛ㄦ牸鏁版嵁
+ searchList: [],
+ typeList:[],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
+ openDataScope: false,
+ menuExpand: false,
+ menuNodeAll: false,
+ deptExpand: true,
+ deptNodeAll: false,
+ // 鏃ユ湡鑼冨洿
+ dateRange: [],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ fileList:[],
+ fileListOther:[],
+ dsb:true,
+ btn:false,
+ fit:['fill'],
+ uploading: false,
+ formDat: {
+ //鑽ｈ獕璇佷功璁板綍
+ id:undefined,
+ type:undefined,
+ createTime:undefined,
+ name:undefined,
+ idNo:undefined,
+ grade:undefined,
+ validityDate:undefined,
+ getDate:undefined,
+ location:undefined,
+ remark:undefined,
+ url: undefined,
+
+ },
+ // 鑿滃崟鍒楄〃
+ menuOptions: [],
+ // 閮ㄩ棬鍒楄〃
+ deptOptions: [],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ type:undefined,
+ grade:undefined,
+ name:undefined,
+ },
+ // searchVal:"",
+
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ defaultProps: {
+ children: "children",
+ label: "label"
+ },
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ createTime: [{
+ required: true,
+ message: '璇疯緭鍏ュ垱寤烘椂闂�',
+ trigger: 'blur'
+ }],
+ type: [{
+ required: true,
+ message: '璇疯緭鍏ョ被鍨�',
+ trigger: 'blur'
+ }],
+ name: [{
+ // required: true,
+ message: '璇疯緭鍏ュ悕绉�',
+ trigger: 'blur'
+ }],
+ grade: [{
+ required: true,
+ message: '璇疯緭鍏ョ骇鍒�',
+ trigger: 'blur'
+ }],
+ idNo: [{
+ required: true,
+ message: '璇疯緭鍏ヨ瘉浠跺彿/涓撲笟',
+ trigger: 'blur'
+ }],
+ validityDate: [{
+ // required: true,
+ message: '璇疯緭鍏ユ湁鏁堟椂闂�',
+ trigger: 'blur'
+ }],
+ getDate: [{
+ // required: true,
+ message: '璇疯緭鍏ヨ幏寰楁椂闂�',
+ trigger: 'blur'
+ }],
+ location: [{
+ // required: true,
+ message: '璇疯緭鍏ュ瓨鏀句綅缃�',
+ trigger: 'blur'
+ }],
+ remark: [{
+ // required: true,
+ message: '璇疯緭鍏ュ娉�',
+ trigger: 'blur'
+ }],
+ },
+ selected:'',
+ typeOptions: [],
+ newOption: undefined,
+ showInput: true,
+ typeOption:[
+ {value:'璇佷欢',label:'璇佷欢'},
+ {value:'鑽ｈ獕',label:'鑽ｈ獕'},
+ {value:'璧勮川',label:'璧勮川'},]
+
+ };
+ },
+ created() {
+ this.getList();
+ this.getTypeOptions();
+ },
+ methods: {
+ // 鍙栨秷鎸夐挳
+ cancelData() {
+ this.open = false;
+ this.reset();
+ },
+
+ //闅旇鍙樿壊
+ tableRowClassName({ row, rowIndex }) {
+ if (rowIndex % 2 == 0) {
+ return "statistics-warning-row1";
+ } else {
+ return "statistics-warning-row";
+ }
+ },
+ //鍚嶇О
+ addNewOption() {
+ const newOption = this.newOption.trim();
+ if (newOption && !this.typeOptions.includes(newOption)) {
+ this.typeOptions.push(newOption);
+ this.$set(this.formDat, 'name', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
+ }
+ },
+ /** 鏌ヨ璁板綍鍒楄〃 */
+ getList() {
+ this.loading = true;
+ 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 => {
+ listHonor(this.queryParams).then(response => {
+ // alert(123)
+ // console.log(response.data)
+ this.honorList = response.data.data;
+
+ this.total = response.data.total;
+ this.loading = false;
+ }
+ );
+ listType(this.queryParams).then(response => {
+ this.typeList = response.data;
+ this.total = response.data.total;
+ // console.log( this.typeList )
+ // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
+ this.getTypeOptions();
+ this.loading = false;
+ }
+ );
+ },
+ getTypeOptions() {
+ const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
+
+ const uniqueOptions = {};
+
+ this.typeOptions = filteredOptions.reduce((options, option) => {
+ if (!uniqueOptions[option]) {
+ uniqueOptions[option] = true;
+ options.push({
+ label: option,
+ value: option
+ });
+ }
+ return options;
+ }, []);
+
+ },
+ /** 鏌ヨ绫诲埆淇℃伅 */
+ // getCateInfor()
+ // {
+ // let _this = this
+ // getCategory().then(response=>{
+ //
+ // // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ // // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // response.data.itemValues.replace("{", "").replace("}", "").split(",").map(elem => {
+ // const label = elem.split(":")[0].trim();
+ // const value = parseInt(elem.split(":")[1].trim());
+ // _this.typeOptions.push({ "label": label, "value": value });
+ // })
+ // })
+ // },
+ //绫诲埆閫夋嫨
+ getSrc1(type){
+ if(type===0){
+ return '璇佷欢'
+ }else if(type===1){
+ return '鑽ｈ獕'
+ }else if(type===2){
+ return '璧勮川'
+ }
+ },
+ //鍚嶇О閫夋嫨
+ getSrc(name) {
+ if (name === 1){
+ return '鍑虹敓璇�'
+ }else if(name === 2){
+ return '瀛︾敓璇�'
+ }else if(name === 3){
+ return '姣曚笟璇�'
+ }else if(name === 4){
+ return '缁撳璇�'
+ }else if(name === 5){
+ return '鎴峰彛绨�'
+ }else if(name === 6){
+ return '鐙敓瀛愬コ璇�'
+ }else if(name === 7){
+ return '楂樼骇鑱岀О'
+ }else if(name === 8){
+ return '鎶ょ収'
+ }else if(name === 9){
+ return '閫氳璇�'
+ }else {
+ return '鍏跺畠'
+ }
+ },
+
+ handleRemove(file) {
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ this.$delete(this.fileList,i);
+ }
+ },
+ handleRemoveFile(file) {
+ for(let i = 0; i < this.fileListOther.length; i++)
+ {
+ if(this.fileListOther[i].url==file.url)
+ this.$delete(this.fileListOther,i);
+ }
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ getRowId(row)
+ {
+ return row.id
+ },
+ // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
+ cancelDataScope() {
+ this.openDataScope = false;
+ this.reset();
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ if (this.$refs.menu != undefined) {
+ this.$refs.menu.setCheckedKeys([]);
+ }
+ this.menuExpand = false,
+ this.menuNodeAll = false,
+ this.deptExpand = true,
+ this.deptNodeAll = false,
+ this.form = {
+ roleId: undefined,
+ roleName: undefined,
+ roleKey: undefined,
+ roleSort: 0,
+ status: "0",
+ menuIds: [],
+ deptIds: [],
+ menuCheckStrictly: true,
+ deptCheckStrictly: true,
+ remark: undefined
+ };
+ this.resetForm("form");
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.dateRange = [];
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = selection.map(item => item.id)
+ console.log(this.ids)
+ this.single = selection.length!=1
+ this.multiple = !selection.length
+ },
+ // //姣忔鏀瑰彉input妗嗗�兼椂灏辨敼鍙榯his.myTableData鐨勫��
+ // inputChange() { //寰幆姣忎竴椤� 鍙content鐨勫�煎惈鏈夎緭鍏ョ殑searchVal鍊硷紝灏卞姞杩沶ewList锛涘弽涔嬶紝灏辨棤涓滆タ鍔犺繘newList
+ // let newlist = this.formDat.filter(
+ // (item) => item.content.indexOf(this.searchVal) > -1
+ // );
+ // this.contactList = newlist;
+ // },
+
+
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ this.open = true;
+ this.title = "娣诲姞璇佷欢/鑽ｈ獕/璧勮川淇℃伅";
+ },
+ /** 鏌ョ湅璇︾粏淇℃伅 */
+ handleCheck(row){
+ const id = row.id;
+ this.$router.push("/self/Honor/honorInfo/" + id);
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ const id = row.id;
+ let jd = true
+
+ this.$router.push({
+ path:"/self/Honor/honorInfo/" + id,
+ query:{
+ detail:jd
+ }
+ });
+ },
+
+
+ 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(",")
+ let uls = this.fileListOther.map(function (elem){
+ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ }).join(",")
+ this.formDat.url = ul+","+uls
+ this.$refs["elForm"].validate(valid => {
+ if (valid) {
+
+ addHonor(this.formDat).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ }
+ });
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ for(let i = 0; i <= this.fileList.length; i++)
+ {
+ this.handleRemove(this.fileList[0]);
+ }
+ for(let i = 0; i < this.fileListOther.length; i++){
+ this.handleRemoveFile(this.fileListOther[0]);
+ }
+ },
+ requestUpload(params)
+ {
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('uploadFile', file);
+ let _this = this
+ this.uploading = true;
+ uploadPic(formData).then(response => {
+ let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
+ 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) {
+ const Ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() {
+ return delHonor(Ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ const Ids = this.ids;
+
+ if(Ids.length==0)
+ {
+ this.download('/zHonor/export', {
+ ...this.queryParams
+ }, `zHonor_${new Date().getTime()}.xlsx`)
+ }else{
+ this.download('/zHonor/export1/'+Ids, {
+
+ }, `zHonor_${new Date().getTime()}.xlsx`)
+ }
+ },
+
+ handleExportTemplate(){
+ this.download('/zHonor/model', {
+
+ }, `zHonor_${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' })});
+
+ }
+ },
+ watch: {
+ type(value) {
+ if (value === '') {
+ this.showInput = true;
+ } else {
+ this.showInput = false;
+ }
+ }
+ }
+};
+</script>
+<style>
+.app-container{
+ background-color: #FEF7FC;
+}
+.el-table__row.statistics-warning-row {
+ background: #E0EEFE;
+
+}
+.el-table__row.statistics-warning-row1 {
+ background: #FFEFF2;
+
+}
+
+
+</style>
+
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 0e2cf44..2259c78 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -287,7 +287,7 @@
<el-collapse-item name="1" >
<template v-slot:title>
<div class="title-wrapper">
- 涓昏瀛︿範鍙婂伐浣滅粡鍘�
+ <div class="left-content">涓昏瀛︿範鍙婂伐浣滅粡鍘�</div>
<div>
<el-button class="button" size="mini" type="text" @click="showDialog('open')" >
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
@@ -341,9 +341,9 @@
<el-collapse-item name="2" >
<template v-slot:title>
<div class="title-wrapper">
- 瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�
+ <div class="left-content">瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�</div>
<div>
- <el-button class="button2" size="mini" type="text" @click="showDialog('relation1')">
+ <el-button class="button" size="mini" type="text" @click="showDialog('relation1')">
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
</div>
</div>
@@ -396,8 +396,8 @@
<el-collapse-item name="4">
<template v-slot:title>
<div class="title-wrapper">
- 鎸佹湁璇佷欢鎯呭喌
- <el-button class="button4" size="mini" type="text" @click="showDialog('certificate')">
+ <div class="left-content">鎸佹湁璇佷欢鎯呭喌</div>
+ <el-button class="button" size="mini" type="text" @click="showDialog('certificate')">
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
</div>
</template>
@@ -461,8 +461,8 @@
<el-collapse-item name="5">
<template v-slot:title>
<div class="title-wrapper">
- 鍑哄浗锛堝锛夋儏鍐�
- <el-button class="button5" size="mini" type="text" @click="showDialog('abroad')">
+ <div class="left-content">鍑哄浗锛堝锛夋儏鍐�</div>
+ <el-button class="button" size="mini" type="text" @click="showDialog('abroad')">
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
</div>
</template>
@@ -514,9 +514,9 @@
<el-collapse-item name="6">
<template v-slot:title>
<div class="title-wrapper">
- 鑷紶
+ <div class="left-content">鑷紶</div>
<div>
- <el-button size='mini' type="text" class="btn_autobiography" @click="showDialog('autobiography')" >
+ <el-button size='mini' type="text" class="button" @click="showDialog('autobiography')" >
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
</el-button>
</div>
@@ -528,16 +528,17 @@
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-button size='mini' type="text" class="btn_edit" @click="editData(item)" style='position: absolute;right:10px;top:5px;'>
+ <div>{{ 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>-->
+<!-- <div v-if="item.term === '缁撳鍚�'"> {{item.content}}</div>-->
+ <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='position: absolute;right:10px;top:5px;'>
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
</el-button>
</el-tab-pane>
@@ -708,10 +709,12 @@
<span> 宀� </span>
</el-form-item>
<el-form-item label="鏃舵湡锛�" prop="term">
- <el-select v-model="formDat.term" placeholder="璇烽�夋嫨鏃舵湡" clearable :style="{width: '50%'}" >
- <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
- ></el-option>
- </el-select>
+<!-- <el-select v-model="formDat.term" placeholder="璇烽�夋嫨鏃舵湡" clearable :style="{width: '50%'}" >-->
+<!-- <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"-->
+<!-- ></el-option>-->
+<!-- </el-select>-->
+ <el-input v-model="formDat.term" placeholder="璇疯緭鍏ユ椂鏈�" clearable :style="{width: '100%'}" >
+ </el-input>
</el-form-item>
<el-form-item label="鍐呭缂栬緫锛�" prop="content">
<el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="" clearable :style="{width: '100%'}" >
@@ -1002,7 +1005,7 @@
//鑷紶
term: [{
required: true,
- message: '璇烽�夋嫨鏃舵湡',
+ message: '璇疯緭鍏ユ椂鏈�',
trigger: 'blur'
}],
ageBegin: [{
@@ -1076,6 +1079,11 @@
// 鎵撳紑寮圭獥
this.dialogVisible.autobiography = true;
},
+ editAutobiography(item) {
+ this.isEdit1 = true;
+ this.dialogVisible.autobiography = true;
+ this.formDat = { ...item };
+ },
//闅旇鍙樿壊
tableRowClassName({ row, rowIndex }) {
@@ -1115,7 +1123,7 @@
// alert(123)
// console.log(response.data)
this.experienceList = response.data;
- this.total = response.data.total;
+ // this.total = response.data.total;
this.loading = false;
}
);
@@ -1124,7 +1132,7 @@
// alert(123)
// console.log(response.data)
this.relationList = response.data;
- this.total = response.data.total;
+ // this.total = response.data.total;
this.loading = false;
}
);
@@ -1133,7 +1141,7 @@
// alert(123)
// console.log(response.data)
this.individualList = response.data;
- this.total = response.data.total;
+ // this.total = response.data.total;
this.loading = false;
}
);
@@ -1142,7 +1150,7 @@
// alert(123)
// console.log(response.data)
this.certificateList = response.data;
- this.total = response.data.total;
+ // this.total = response.data.total;
this.loading = false;
}
);
@@ -1151,7 +1159,7 @@
// alert(123)
// console.log(response.data)
this.AbroadList = response.data;
- this.total = response.data.total;
+ // this.total = response.data.total;
this.loading = false;
}
);
@@ -1160,7 +1168,7 @@
// alert(123)
// console.log(response.data)
this.AutobiographyList = response.data;
- this.total = response.data.total;
+ // this.total = response.data.total;
this.loading = false;
});
@@ -1174,7 +1182,7 @@
// });
listType(this.queryParams).then(response => {
this.typeList = response.data;
- this.total = response.data.total;
+ // this.total = response.data.total;
// console.log( this.typeList )
// 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
this.getTypeOptions();
@@ -1405,14 +1413,14 @@
this.$refs["elForm"].validate(valid => {
if (valid) {
// 鏍规嵁鍊兼壘鍒伴�変腑鐨勯�夐」瀵硅薄
- const selectedOption = this.typeOptions.find(option => option.value === this.formDat.term);
+ // const selectedOption = this.typeOptions.find(option => option.value === this.formDat.term);
if (this.isEdit1) {
// 鎵ц淇敼鎿嶄綔
updateAutobiography(this.formDat).then(response => {
// 灏嗛�変腑閫夐」鐨勬枃鏈缃负"term"瀛楁鐨勫��
- this.formDat.term = selectedOption.label;
- this.formDat.id = selectedOption.id;
+ // this.formDat.term = selectedOption.value;
+ // this.formDat.id = selectedOption.id;
console.log("1")
this.$modal.msgSuccess("淇敼鎴愬姛");
this.dialogVisible.autobiography = false;
@@ -1426,7 +1434,7 @@
} else {
// 鎵ц鏂板鎿嶄綔
addAutobiography(this.formDat).then(response => {
- this.formDat.term = selectedOption.label;
+ // this.formDat.term = selectedOption.label;
this.$modal.msgSuccess("鏂板鎴愬姛");
this.dialogVisible.autobiography = false;
this.getList();
@@ -1725,10 +1733,17 @@
.el-collapse-item__header {
background-color:#FEF7FC;
+ width: 100%;
}
.title-wrapper {
display: flex;
justify-content: space-between;
+ align-items: center;
+ width: calc(100% - 50px);
+}
+.left-content {
+
+ width: 100%;
}
.btn_autobiography{
background:center no-repeat url('../../assets/icons/add1.png') ;
@@ -1747,8 +1762,10 @@
}
.button {
background:center no-repeat url('../../assets/icons/add1.png') ;
- margin-left: 69.5vw;
-
+ /*margin-right: -10px ;*/
+ flex-shrink: 0;
+ width: 30px;
+ height: 28px;
}
.button2 {
background: center no-repeat url('../../assets/icons/add1.png') ;
diff --git a/ruoyi-ui/src/views/shouye/shouye.vue b/ruoyi-ui/src/views/shouye/shouye.vue
new file mode 100644
index 0000000..4e86d4b
--- /dev/null
+++ b/ruoyi-ui/src/views/shouye/shouye.vue
@@ -0,0 +1,15 @@
+<template>
+ <div>
+ xiugaixiangqing
+ </div>
+</template>
+
+<script>
+export default {
+ name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index 56627f4..c355eca 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -445,8 +445,7 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ fot:[".jpg",".jif"],
fileList:[],
fileListOther:[],
dsb:true,
--
Gitblit v1.9.1