From 842712a3c827a286044bf300fffa34e34db4cea7 Mon Sep 17 00:00:00 2001 From: Tcsm <1377977403@qq.com> Date: 星期二, 19 九月 2023 21:32:14 +0800 Subject: [PATCH] 新增首页修改信息页面 --- ruoyi-ui/src/api/shouye/index.js | 9 ++ ruoyi-ui/src/views/genealogy/index.vue | 1 ruoyi-ui/src/views/shouye/shouye.vue | 173 ++++++++++++++++++++++++++++++++++++++++++ ruoyi-ui/src/views/index.vue | 6 ruoyi-ui/src/assets/images/shouyeInfo.png | 0 ruoyi-ui/src/views/search/index.vue | 1 ruoyi-ui/src/api/search/index.js | 4 ruoyi-ui/src/router/index.js | 28 +++++- 8 files changed, 207 insertions(+), 15 deletions(-) diff --git a/ruoyi-ui/src/api/search/index.js b/ruoyi-ui/src/api/search/index.js index 909482e..6ef7185 100644 --- a/ruoyi-ui/src/api/search/index.js +++ b/ruoyi-ui/src/api/search/index.js @@ -1,9 +1,9 @@ import request from '@/utils/request' // 鏍规嵁keyword鏌ヨ璁板綍 -export function getSearch(query) { +export function getSearch(keyword) { return request({ url: '/search', method: 'get', - params: query + params: keyword }) } diff --git a/ruoyi-ui/src/api/shouye/index.js b/ruoyi-ui/src/api/shouye/index.js new file mode 100644 index 0000000..e243b85 --- /dev/null +++ b/ruoyi-ui/src/api/shouye/index.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function getShouye(query) { + return request({ + url: '/log/list', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/assets/images/shouyeInfo.png b/ruoyi-ui/src/assets/images/shouyeInfo.png new file mode 100644 index 0000000..d29e325 --- /dev/null +++ b/ruoyi-ui/src/assets/images/shouyeInfo.png Binary files differ diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index d438fa9..2006cca 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -1,7 +1,6 @@ import Vue from 'vue' import Router from 'vue-router' -import Index from '@/views/index'; // 棣栭〉缁勪欢 -import OtherPage from '@/views/shouye/shouye'; // 瑕佽烦杞殑椤甸潰缁勪欢 +import Shouye from '@/views/shouye/shouye.vue'; Vue.use(Router) @@ -96,7 +95,26 @@ } ] }, - + // { + // path: '', + // component: Layout, + // hidden: true, + // redirect: 'noredirect', + // children: [ + // { + // path: 'shouye', + // component: () => import('@/views/shouye/shouye'), + // name: 'shouye', + // meta: { title: '閫氱煡璇︽儏' } + // } + // ] + // }, + // { + // path: '/views/shouye/shouye', + // component: Layout, + // hidden: true, + // redirect: 'noredirect', + // } ] // 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇 @@ -117,14 +135,14 @@ }, //棣栭〉閫氱煡璇︽儏 { - path:'/dashboard', + path:'/views/shouye', component:Layout, hidden: true, permissions: ['familymodel:property:info'], children: [ { - path: 'shouye/:id(\\d+)', + path: '', component: () => import('@/views/shouye/shouye'), name: 'shouye', meta: { title: '閫氱煡璇︽儏' } diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue index 3f43d34..59c0854 100644 --- a/ruoyi-ui/src/views/genealogy/index.vue +++ b/ruoyi-ui/src/views/genealogy/index.vue @@ -195,7 +195,6 @@ </el-table> <pagination - v-show="total!=0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 873fdf0..37ba963 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -26,7 +26,7 @@ created() {}, methods:{ handleClick(){ - this.$router.push("/shouye/shouye" ); + this.$router.push('/views/shouye'); } } }; @@ -34,8 +34,8 @@ <style scoped> .app-container{ - background-color: #FEF7FC; -} + background-color: #FEF7FC; + } .image-container { position: relative; width: 100%; diff --git a/ruoyi-ui/src/views/search/index.vue b/ruoyi-ui/src/views/search/index.vue index 4a55a9a..a60c0c7 100644 --- a/ruoyi-ui/src/views/search/index.vue +++ b/ruoyi-ui/src/views/search/index.vue @@ -228,7 +228,6 @@ /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { this.queryParams.pageNum = 1; - this.getList(); }, /** 閲嶇疆鎸夐挳鎿嶄綔 */ diff --git a/ruoyi-ui/src/views/shouye/shouye.vue b/ruoyi-ui/src/views/shouye/shouye.vue index 4e86d4b..2e8b919 100644 --- a/ruoyi-ui/src/views/shouye/shouye.vue +++ b/ruoyi-ui/src/views/shouye/shouye.vue @@ -1,15 +1,182 @@ <template> - <div> - xiugaixiangqing + <div class="app-container" > + <div class="bkg_image"> + <img src="../../assets/images/shouyeInfo.png"> + <div class="overlay"> + <div class="table-container"> + <div style="padding-top:15px;padding-left:30px"><span class="text">淇敼璁板綍</span></div> + <el-divider/> + <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> + <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" style="width: 20%" align="center"/> + + <el-table-column label="琚慨鏀规ā鍧�" prop="module" sortable style="width: 25%" align="center"> + </el-table-column> + <el-table-column label="淇敼鏃堕棿" prop="updateTime" sortable style="width: 25%" align="center"/> + <el-table-column label="淇敼浜�" prop="updater" sortable style="width: 25%" align="center"/> + </el-table> + + <pagination + v-show="total>0" + :total="total" + :page.sync="queryParams.pageNum" + :limit.sync="queryParams.pageSize" + @pagination="getList" + style="background: #FEF7FC;" + /> + </div> + </div> + </div> </div> </template> <script> + +import{getShouye} from "@/api/shouye"; + export default { - name: "index" + name: "index", + data() { + return { + // 閬僵灞� + disabled: false, + loading: true, + formData:[], + // 閫変腑鏁扮粍 + ids: [], + // 闈炲崟涓鐢� + single: true, + // 闈炲涓鐢� + multiple: true, + // 鏄剧ず鎼滅储鏉′欢 + showSearch: true, + // 鎬绘潯鏁� + total: 0, + // 琛ㄦ牸鏁版嵁 + infoList: [], + // 寮瑰嚭灞傛爣棰� + title: "", + // 鏄惁鏄剧ず寮瑰嚭灞� + open: false, + // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛� + openDataScope: false, + menuExpand: false, + menuNodeAll: false, + deptExpand: true, + deptNodeAll: false, + // 鏃ユ湡鑼冨洿 + dateRange: [], + // 鏁版嵁鑼冨洿閫夐」 + fot:[".jpg",".jif"], + fileList:[], + fileListOther:[], + dsb:true, + btn:false, + formDat: { + module: undefined, + updateTime: undefined, + updater: undefined + }, + // 鑿滃崟鍒楄〃 + menuOptions: [], + // 閮ㄩ棬鍒楄〃 + deptOptions: [], + // 鏌ヨ鍙傛暟 + queryParams: { + pageNum: 1, + pageSize: 10, + }, + // 琛ㄥ崟鍙傛暟 + form: {}, + defaultProps: { + children: "children", + label: "label" + }, + typeOptions: [], + + }; + }, + created() { + this.getList() + }, + methods: { + //闅旇鍙樿壊 + tableRowClassName({ row, rowIndex }) { + if (rowIndex % 2 == 0) { + return "statistics-warning-row1"; + } else { + return "statistics-warning-row"; + } + }, + + /** 鏌ヨ瑙掕壊鍒楄〃 */ + getList() { + this.loading = true; + // console.log(this.queryParams) + // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => { + // console.log("111") + getShouye(this.queryParams).then(response => { + // alert(123) + // console.log("222") + this.infoList = response.data.data; + // console.log(this.infoList) + this.total = response.data.total; + this.loading = false; + } + ); + }, + + getRowId(row) + { + return row.id + }, + + // 澶氶�夋閫変腑鏁版嵁 + handleSelectionChange(selection) { + this.ids = selection.map(item => item.id) + console.log(this.ids) + this.single = selection.length!=1 + this.multiple = !selection.length + }, + + + }, } </script> <style scoped> +.app-container{ + background-color: #FEF7FC; +} +.el-table__row.statistics-warning-row { + background: #E0EEFE; + +} +.el-table__row.statistics-warning-row1 { + background: #FFEFF2; + +} +.text{ + font-size: 16px; + line-height: 24px; + text-align: center; +} +.bkg_image img{ + width: 100%; + height: 100%; + object-fit: cover; + margin: -5px; +} +.bkg_image { + position: relative; /* 璁剧疆鐩稿瀹氫綅 */ +} +.overlay { + position: absolute; /* 璁剧疆缁濆瀹氫綅 */ + top: 10px; + left: 10px; + width: 100%; + height: 90%; + background-color: rgba(255, 255, 255, 0.5); /* 鍗婇�忔槑棰滆壊锛屽彲鏍规嵁闇�姹傝皟鏁撮�忔槑搴� */ + z-index: 1; /* 灏嗚〃鏍肩疆浜庡浘鐗囦笂鏂� */ +} </style> -- Gitblit v1.9.1