From d9122249926c76bb4bb11c09eeef0258c7a839e2 Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Mon, 7 Aug 2023 10:31:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E5=B0=81=E8=A3=851?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/publicModule/lkyTable.vue | 393 +++++++++++++++++++++++ src/main.js | 3 +- src/router/index.js | 7 +- src/views/module/index.vue | 175 ++++++++++ 4 files changed, 576 insertions(+), 2 deletions(-) create mode 100644 src/components/publicModule/lkyTable.vue create mode 100644 src/views/module/index.vue diff --git a/src/components/publicModule/lkyTable.vue b/src/components/publicModule/lkyTable.vue new file mode 100644 index 0000000..f90b317 --- /dev/null +++ b/src/components/publicModule/lkyTable.vue @@ -0,0 +1,393 @@ + + + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 9a4957a..a79074a 100644 --- a/src/main.js +++ b/src/main.js @@ -6,10 +6,11 @@ import router from './router' import store from './store' import Message from './components/message'; import erupload from "./components/upload"; +import lkyTable from "./components/publicModule/lkyTable" // 本组件样式包含普通表格、分页 Vue.use(ElementUI); Vue.use(Message) Vue.component('erupload', erupload) - +Vue.component('lkyTable', lkyTable) const vm = new Vue({ el: '#app', router, diff --git a/src/router/index.js b/src/router/index.js index d1ad40b..d421566 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -67,12 +67,17 @@ const routes = [ name: 'closeLoopDispose', component: () => import('@/views/closeLoopDispose'), }, - // 应用超市 + // 安商惠企 { path:'applySupermarket', name:'applySupermarket', component: () => import('@/views/applySupermarket'), }, + { + path:'module', + name:'module', + component: () => import('@/views/module'), + }, ] }, { diff --git a/src/views/module/index.vue b/src/views/module/index.vue new file mode 100644 index 0000000..59c9a38 --- /dev/null +++ b/src/views/module/index.vue @@ -0,0 +1,175 @@ + + + + \ No newline at end of file From 9e61a3bda738fac919c19d6e23833ebce361ebfd Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Tue, 8 Aug 2023 09:50:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=B0=81=E8=A3=852?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/publicModule/lkyTable.vue | 110 +++++++++++++----- .../applySupermarket/personBack/index.vue | 2 +- src/views/module/index.vue | 70 +++++++---- 3 files changed, 130 insertions(+), 52 deletions(-) diff --git a/src/components/publicModule/lkyTable.vue b/src/components/publicModule/lkyTable.vue index f90b317..765172d 100644 --- a/src/components/publicModule/lkyTable.vue +++ b/src/components/publicModule/lkyTable.vue @@ -2,12 +2,7 @@ @@ -62,27 +73,19 @@ :width="item.width" align="center" > - + - - @@ -97,9 +100,17 @@ {{ operation_text }} + {{ operation_text_second }} @@ -153,6 +164,16 @@ export default { type: Boolean, default: false, }, + // 根据开发需要,二级表头如有要求对单元格文字颜色进行变换,通过该list传达判断条件 + child_color_list: { + type: Array, + default: () => [], + }, + // 根据开发需要,如有要求对单元格文字颜色进行变换,通过该list传达判断条件 + color_list: { + type: Array, + default: () => [], + }, // 单元格名称 table_columns: { type: Array, @@ -163,6 +184,11 @@ export default { type: Boolean, default: false, }, + // 操作单元格是否需要第二个按钮 + table_operation_second: { + type: Boolean, + default: false, + }, // 操作单元格表头名 operation_label: { type: String, @@ -173,6 +199,11 @@ export default { type: String, default: "", }, + // 第二个操作单元格按钮名称 + operation_text_second: { + type: String, + default: "", + }, // 分页可选页数类型 page_sizes: { type: Array, @@ -222,13 +253,34 @@ export default { open(row) { this.$emit("open_event", row); }, - // 如果二级表格需要展示照片的话 - get_child_img_url(row) { - this.$emit("get_child_img_url", row); + // 二级表根据后端返回判断流程状态颜色 + child_style_change(val) { + switch (val) { + case this.child_color_list[0]: + return "#3eba75"; + case this.child_color_list[1]: + return "#FDA722"; + case this.child_color_list[2]: + return "#2eb9ef"; + case this.child_color_list[3]: + return "#e55b5b"; + } + }, + // 根据后端返回判断流程状态颜色 + style_change(val) { + switch (val) { + case this.color_list[0]: + return "#3eba75"; + case this.color_list[1]: + return "#FDA722"; + case this.color_list[2]: + return "#2eb9ef"; + case this.color_list[3]: + return "#e55b5b"; + } }, - // 如果一级表格需要展示照片的话 - get_img_url(row) { - this.$emit("get_img_url", row); + table_link(row) { + this.$emit('table_link',row) }, // 每页多少条 不可随意篡改props值,由调用该组件的父组件执行 方法名定义成size_change handle_size_change(val) { diff --git a/src/views/applySupermarket/personBack/index.vue b/src/views/applySupermarket/personBack/index.vue index b9c0e43..be5cbab 100644 --- a/src/views/applySupermarket/personBack/index.vue +++ b/src/views/applySupermarket/personBack/index.vue @@ -115,7 +115,7 @@ export default { res.rows[i].abnormal_num = res.rows[ i ].examinationResultDetail.substring( - res.rows[i].examinationResultDetail.indexOf("正常,") + 3, + res.rows[i].examinationResultDetail.indexOf("正常,") + 3, res.rows[i].examinationResultDetail.indexOf("人异常") ); console.log(res.rows[i].abnormal_num); diff --git a/src/views/module/index.vue b/src/views/module/index.vue index 59c9a38..18458f6 100644 --- a/src/views/module/index.vue +++ b/src/views/module/index.vue @@ -8,14 +8,19 @@ :table_height="table_height" :table_select="table_select" :table_index="table_index" + :color_list="color_list" + :child_color_list="child_color_list" :table_columns="table_columns" :table_operation="table_operation" + :table_operation_second="table_operation_second" :operation_label="operation_label" :operation_text="operation_text" + :operation_text_second="operation_text_second" :page_sizes="page_sizes" :pageSize="pageSize" :pageNum="pageNum" :total="total" + @table_link="table_link" @open_event="open_event" @size_change="size_change" @num_change="num_change" @@ -26,7 +31,7 @@ export default { data() { return { - table_pagination_width: "60", + table_pagination_width: "75", table_pagination_height: "60", table_data: [ { @@ -35,8 +40,9 @@ export default { idcard: "34567", unit: "最小单位", level: "一级", - pic_child:'https://t12.baidu.com/it/u=2944858655,3260611328&fm=58', - picTwo:'https://t12.baidu.com/it/u=3165178178,1926556480&fm=58', + pic_child: "https://t12.baidu.com/it/u=2944858655,3260611328&fm=58", + pic_two: "https://t12.baidu.com/it/u=3165178178,1926556480&fm=58", + company_level: "审核通过", }, { company: "宁波保润石化公司", @@ -44,8 +50,9 @@ export default { idcard: "34567", unit: "最小单位", level: "四级", - pic_child:'https://t12.baidu.com/it/u=3165178178,1926556480&fm=58', - picTwo:'https://t12.baidu.com/it/u=3165178178,1926556480&fm=58', + pic_child: "https://t12.baidu.com/it/u=3165178178,1926556480&fm=58", + pic_two: "https://t12.baidu.com/it/u=3165178178,1926556480&fm=58", + company_level: "审核中", }, { company: "宁波保润石化公司", @@ -53,8 +60,10 @@ export default { idcard: "34567", unit: "最小单位", level: "一级", - pic_child:'1222.png', - picTwo:'https://t12.baidu.com/it/u=3165178178,1926556480&fm=58', + pic: "https://img2.baidu.com/it/u=1735491135,1421708020&fm=253&app=138&size=w931&n=0&f=JPEG&fmt=auto?sec=1691514000&t=9b750206b13e5b42054a728b0e759fe5", + pic_child: "1222.png", + pic_two: "https://t12.baidu.com/it/u=3165178178,1926556480&fm=58", + company_level: "审核中", }, { company: "宁波保润石化公司", @@ -62,8 +71,10 @@ export default { idcard: "34567", unit: "最小单位", level: "三级", - pic_child:'1222.png', - picTwo:'https://t12.baidu.com/it/u=3165178178,1926556480&fm=58', + pic_child: "1222.png", + pic: "https://t7.baidu.com/it/u=1211026933,587530743&fm=218&app=137&size=f242,150&n=0&f=JPEG&fmt=auto?s=D9934B90441845C2548365530300D0BA&sec=1691514000&t=0d3b6cf3971e24bff2a9ad9909868a3e", + pic_two: "https://t12.baidu.com/it/u=3165178178,1926556480&fm=58", + company_level: "预备审核", }, { company: "宁波保润石化公司", @@ -71,8 +82,9 @@ export default { idcard: "34567", unit: "最小单位", level: "一级", - pic_child:'1222.png', - picTwo:'https://t12.baidu.com/it/u=3165178178,1926556480&fm=58', + pic_child: "1222.png", + pic_two: "https://t12.baidu.com/it/u=3165178178,1926556480&fm=58", + company_level: "预备审核", }, { company: "宁波保润石化公司", @@ -80,14 +92,17 @@ export default { idcard: "34567", unit: "最小单位", level: "二级", - pic:'1000.png', - picTwo:'https://t12.baidu.com/it/u=3165178178,1926556480&fm=58', - pic_child:'1222.png', + pic: "1000.png", + pic_two: "https://t12.baidu.com/it/u=3165178178,1926556480&fm=58", + pic_child: "1222.png", + company_level: "审核驳回", }, ], - table_height: "592", // 表格高度根据实际场景确定高度 + table_height: "550", // 表格高度根据实际场景确定高度 table_select: false, table_index: true, + child_color_list: ["审核驳回", "预备审核", "审核中", "审核通过"], + color_list: ["一级", "二级", "三级", "四级"], table_columns: [ { prop: "company_all", @@ -99,7 +114,7 @@ export default { width: "180", }, { - prop: "personPic", + prop: "pic_child", label: "个人照片", width: "120", picture: true, @@ -118,6 +133,13 @@ export default { prop: "unit", label: "公司单位", width: "180", + link: true, + }, + { + prop: "company_level", + label: "公司次等级", + width: "160", + color: true, }, ], }, @@ -125,6 +147,7 @@ export default { prop: "level", label: "公司等级", width: "80", + color: true, }, { prop: "pic", @@ -133,20 +156,22 @@ export default { picture: true, }, { - prop: "person_pic", + prop: "pic_two", label: "个人照片", width: "100", - picture_two: true, + picture: true, }, ], table_operation: true, + table_operation_second: true, operation_label: "操作", operation_text: "详情", + operation_text_second:'编辑', page_sizes: [4, 6], pageSize: 4, pageNum: 1, total: 8, - pagination_width: "60", + pagination_width: "75", }; }, methods: { @@ -157,6 +182,9 @@ export default { open_event(row) { console.log("row456", row); }, + table_link(row) { + console.log("row777", row); + }, // 分页--每页多少条 size_change(val) { this.pageNum = 1; @@ -170,6 +198,4 @@ export default { }, }, }; - - \ No newline at end of file + \ No newline at end of file From 717fd1f92c475dae0effcddb8dd5de965615d11a Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Wed, 9 Aug 2023 11:05:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=81=E8=A3=85=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/publicModule/lkyDialog.vue | 47 ++++ src/components/publicModule/lkyPagination.vue | 112 +++++++++ src/components/publicModule/lkyTable.vue | 105 ++++---- src/main.js | 2 + src/router/index.js | 13 +- src/router/routes/module.js | 26 ++ src/utils/request.js | 4 +- .../applySupermarket/personBack/index.vue | 74 +++--- src/views/module/components/leftNav.vue | 130 ++++++++++ .../module/components/paginationModule.vue | 37 +++ src/views/module/components/tableModule.vue | 203 ++++++++++++++++ src/views/module/index.vue | 226 +++--------------- .../systemManagement/safeIndex/index.vue | 2 +- 13 files changed, 677 insertions(+), 304 deletions(-) create mode 100644 src/components/publicModule/lkyDialog.vue create mode 100644 src/components/publicModule/lkyPagination.vue create mode 100644 src/router/routes/module.js create mode 100644 src/views/module/components/leftNav.vue create mode 100644 src/views/module/components/paginationModule.vue create mode 100644 src/views/module/components/tableModule.vue diff --git a/src/components/publicModule/lkyDialog.vue b/src/components/publicModule/lkyDialog.vue new file mode 100644 index 0000000..24592b8 --- /dev/null +++ b/src/components/publicModule/lkyDialog.vue @@ -0,0 +1,47 @@ + + + + \ No newline at end of file diff --git a/src/components/publicModule/lkyPagination.vue b/src/components/publicModule/lkyPagination.vue new file mode 100644 index 0000000..e0b53b0 --- /dev/null +++ b/src/components/publicModule/lkyPagination.vue @@ -0,0 +1,112 @@ + + + + \ No newline at end of file diff --git a/src/components/publicModule/lkyTable.vue b/src/components/publicModule/lkyTable.vue index 765172d..b203ddf 100644 --- a/src/components/publicModule/lkyTable.vue +++ b/src/components/publicModule/lkyTable.vue @@ -55,7 +55,7 @@ {{ row[val.prop] }} @@ -87,6 +87,16 @@ {{ row[item.prop] }} + + @@ -132,7 +142,7 @@ + + \ No newline at end of file diff --git a/src/views/module/components/paginationModule.vue b/src/views/module/components/paginationModule.vue new file mode 100644 index 0000000..42e5d58 --- /dev/null +++ b/src/views/module/components/paginationModule.vue @@ -0,0 +1,37 @@ + + + \ No newline at end of file diff --git a/src/views/module/components/tableModule.vue b/src/views/module/components/tableModule.vue new file mode 100644 index 0000000..4111b8b --- /dev/null +++ b/src/views/module/components/tableModule.vue @@ -0,0 +1,203 @@ + + + \ No newline at end of file diff --git a/src/views/module/index.vue b/src/views/module/index.vue index 18458f6..8d370c8 100644 --- a/src/views/module/index.vue +++ b/src/views/module/index.vue @@ -1,201 +1,43 @@ - + \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/systemManagement/safeIndex/index.vue b/src/views/systemManagement/safeIndex/index.vue index 51ae748..daabed9 100644 --- a/src/views/systemManagement/safeIndex/index.vue +++ b/src/views/systemManagement/safeIndex/index.vue @@ -324,7 +324,7 @@ export default { /* card统一样式 */ .el-card.box-card.is-always-shadow { border: 0px; - height: 88.5vh; /* 控制card布局高度,用于适配 */ + height: 88vh; /* 控制card布局高度,用于适配 */ position: relative; background: url("~@/assets/companyFile/22136.png") no-repeat !important; background-size: 100% 100% !important;