diff --git a/src/assets/images/base/stablet.png b/src/assets/images/base/stablet.png new file mode 100644 index 0000000..19d6893 Binary files /dev/null and b/src/assets/images/base/stablet.png differ diff --git a/src/assets/images/topic/aCol.png b/src/assets/images/topic/aCol.png new file mode 100644 index 0000000..5fb9fdb Binary files /dev/null and b/src/assets/images/topic/aCol.png differ diff --git a/src/assets/images/topic/c1.png b/src/assets/images/topic/c1.png new file mode 100644 index 0000000..a203869 Binary files /dev/null and b/src/assets/images/topic/c1.png differ diff --git a/src/assets/images/topic/c2.png b/src/assets/images/topic/c2.png new file mode 100644 index 0000000..ba82ad1 Binary files /dev/null and b/src/assets/images/topic/c2.png differ diff --git a/src/assets/images/topic/c3.png b/src/assets/images/topic/c3.png new file mode 100644 index 0000000..7e576d8 Binary files /dev/null and b/src/assets/images/topic/c3.png differ diff --git a/src/assets/images/topic/c4.png b/src/assets/images/topic/c4.png new file mode 100644 index 0000000..3256c04 Binary files /dev/null and b/src/assets/images/topic/c4.png differ diff --git a/src/assets/images/topic/c5.png b/src/assets/images/topic/c5.png new file mode 100644 index 0000000..4a7620d Binary files /dev/null and b/src/assets/images/topic/c5.png differ diff --git a/src/assets/images/topic/c6.png b/src/assets/images/topic/c6.png new file mode 100644 index 0000000..e427608 Binary files /dev/null and b/src/assets/images/topic/c6.png differ diff --git a/src/assets/images/topic/c7.png b/src/assets/images/topic/c7.png new file mode 100644 index 0000000..15815c1 Binary files /dev/null and b/src/assets/images/topic/c7.png differ diff --git a/src/assets/images/topic/c8.png b/src/assets/images/topic/c8.png new file mode 100644 index 0000000..2a09b04 Binary files /dev/null and b/src/assets/images/topic/c8.png differ diff --git a/src/assets/images/topic/car.png b/src/assets/images/topic/car.png new file mode 100644 index 0000000..b63ab61 Binary files /dev/null and b/src/assets/images/topic/car.png differ diff --git a/src/assets/images/topic/carai.png b/src/assets/images/topic/carai.png new file mode 100644 index 0000000..b63ab61 Binary files /dev/null and b/src/assets/images/topic/carai.png differ diff --git a/src/assets/images/topic/caran.png b/src/assets/images/topic/caran.png new file mode 100644 index 0000000..db7a778 Binary files /dev/null and b/src/assets/images/topic/caran.png differ diff --git a/src/assets/images/topic/carb.png b/src/assets/images/topic/carb.png new file mode 100644 index 0000000..d287f62 Binary files /dev/null and b/src/assets/images/topic/carb.png differ diff --git a/src/assets/images/topic/carcheck.png b/src/assets/images/topic/carcheck.png new file mode 100644 index 0000000..b2a6d0f Binary files /dev/null and b/src/assets/images/topic/carcheck.png differ diff --git a/src/assets/images/topic/cardbody.png b/src/assets/images/topic/cardbody.png new file mode 100644 index 0000000..1a29d6a Binary files /dev/null and b/src/assets/images/topic/cardbody.png differ diff --git a/src/assets/images/topic/cardtop.png b/src/assets/images/topic/cardtop.png new file mode 100644 index 0000000..6dadc53 Binary files /dev/null and b/src/assets/images/topic/cardtop.png differ diff --git a/src/assets/images/topic/cari.png b/src/assets/images/topic/cari.png new file mode 100644 index 0000000..f6b0b36 Binary files /dev/null and b/src/assets/images/topic/cari.png differ diff --git a/src/assets/images/topic/carmid.png b/src/assets/images/topic/carmid.png new file mode 100644 index 0000000..6d8c0b5 Binary files /dev/null and b/src/assets/images/topic/carmid.png differ diff --git a/src/assets/images/topic/carmidr.png b/src/assets/images/topic/carmidr.png new file mode 100644 index 0000000..cf93a90 Binary files /dev/null and b/src/assets/images/topic/carmidr.png differ diff --git a/src/assets/images/topic/carn.png b/src/assets/images/topic/carn.png new file mode 100644 index 0000000..85d3f13 Binary files /dev/null and b/src/assets/images/topic/carn.png differ diff --git a/src/assets/images/topic/carnav.png b/src/assets/images/topic/carnav.png new file mode 100644 index 0000000..a48a7e9 Binary files /dev/null and b/src/assets/images/topic/carnav.png differ diff --git a/src/assets/images/topic/check.png b/src/assets/images/topic/check.png new file mode 100644 index 0000000..c260d68 Binary files /dev/null and b/src/assets/images/topic/check.png differ diff --git a/src/assets/images/topic/col.png b/src/assets/images/topic/col.png new file mode 100644 index 0000000..2060c06 Binary files /dev/null and b/src/assets/images/topic/col.png differ diff --git a/src/assets/images/topic/dzuo.png b/src/assets/images/topic/dzuo.png new file mode 100644 index 0000000..238aeb4 Binary files /dev/null and b/src/assets/images/topic/dzuo.png differ diff --git a/src/assets/images/topic/stablet.png b/src/assets/images/topic/stablet.png new file mode 100644 index 0000000..19d6893 Binary files /dev/null and b/src/assets/images/topic/stablet.png differ diff --git a/src/assets/images/topic/stbg.png b/src/assets/images/topic/stbg.png new file mode 100644 index 0000000..8d15649 Binary files /dev/null and b/src/assets/images/topic/stbg.png differ diff --git a/src/assets/images/topic/stbtm.png b/src/assets/images/topic/stbtm.png new file mode 100644 index 0000000..4f881fa Binary files /dev/null and b/src/assets/images/topic/stbtm.png differ diff --git a/src/assets/images/topic/stgl.png b/src/assets/images/topic/stgl.png new file mode 100644 index 0000000..e9a3ff5 Binary files /dev/null and b/src/assets/images/topic/stgl.png differ diff --git a/src/assets/images/topic/stmd.png b/src/assets/images/topic/stmd.png new file mode 100644 index 0000000..5a207bb Binary files /dev/null and b/src/assets/images/topic/stmd.png differ diff --git a/src/assets/images/topic/sttop.png b/src/assets/images/topic/sttop.png new file mode 100644 index 0000000..70701c8 Binary files /dev/null and b/src/assets/images/topic/sttop.png differ diff --git a/src/assets/images/topic/styc.png b/src/assets/images/topic/styc.png new file mode 100644 index 0000000..e13e8b0 Binary files /dev/null and b/src/assets/images/topic/styc.png differ diff --git a/src/assets/images/topic/uncheck.png b/src/assets/images/topic/uncheck.png new file mode 100644 index 0000000..5857b02 Binary files /dev/null and b/src/assets/images/topic/uncheck.png differ diff --git a/src/assets/images/topic/编组 32.png b/src/assets/images/topic/编组 32.png deleted file mode 100644 index 63193c1..0000000 Binary files a/src/assets/images/topic/编组 32.png and /dev/null differ diff --git a/src/loveflow/assets/index.less b/src/loveflow/assets/index.less index 91bb5e3..0d3903a 100644 --- a/src/loveflow/assets/index.less +++ b/src/loveflow/assets/index.less @@ -22,6 +22,9 @@ .mt3 { margin-top: 3px; } +.mt20 { + margin-top: 20px; +} .mr6 { margin-right: 6px; } @@ -46,6 +49,9 @@ .mb18 { margin-bottom: 18px; } +.mb16 { + margin-bottom: 16px; +} .mb20 { margin-bottom: 20px; } diff --git a/src/loveflow/assets/paginate.less b/src/loveflow/assets/paginate.less index f1f4e75..eab32b5 100644 --- a/src/loveflow/assets/paginate.less +++ b/src/loveflow/assets/paginate.less @@ -1,54 +1,56 @@ -.gPagination { - background-color: transparent; -} -/deep/.el-pagination { - .el-pagination__total { - color: #ffffff; - height: 34px; - line-height: 34px; +.gMainTable { + .gPagination { + background-color: transparent; } - .el-pagination__sizes { - .el-input__inner { + /deep/.el-pagination { + .el-pagination__total { + color: #ffffff; + height: 34px; + line-height: 34px; + } + .el-pagination__sizes { + .el-input__inner { + height: 32px; + background: transparent; + color: #fff; + border: solid 1px #28847e; + } + } + .btn-prev { height: 32px; + min-width: 32px; background: transparent; color: #fff; border: solid 1px #28847e; } - } - .btn-prev { - height: 32px; - min-width: 32px; - background: transparent; - color: #fff; - border: solid 1px #28847e; - } - .btn-next { - height: 32px; - min-width: 32px; - background: transparent; - color: #fff; - border: solid 1px #28847e; - } - .el-pager { - .number { + .btn-next { height: 32px; min-width: 32px; background: transparent; color: #fff; border: solid 1px #28847e; - &.active { - background: url("~@/assets/companyFile/2121.png") no-repeat !important; - background-size: 100% 100% !important; + } + .el-pager { + .number { + height: 32px; + min-width: 32px; + background: transparent; + color: #fff; + border: solid 1px #28847e; + &.active { + background: url("~@/assets/companyFile/2121.png") no-repeat !important; + background-size: 100% 100% !important; + } } } - } - .el-pagination__jump { - color: #fff; - .el-input__inner { - height: 32px; - background: transparent; + .el-pagination__jump { color: #fff; - border: solid 1px #28847e; + .el-input__inner { + height: 32px; + background: transparent; + color: #fff; + border: solid 1px #28847e; + } } } } diff --git a/src/loveflow/assets/reset.scss b/src/loveflow/assets/reset.scss new file mode 100644 index 0000000..46850a6 --- /dev/null +++ b/src/loveflow/assets/reset.scss @@ -0,0 +1,164 @@ +.loveflowscreen { + .tableWrap { + } + .el-table { + border: none; //solid 1px rgba(82, 107, 127, 0.7); + border-right: none; + border-top: none; + border-bottom: none; + border-top: none; + background: transparent; + font-size: vw(12) !important; + + .el-table__header-wrapper { + .el-table__header { + background: url("~@/assets/images/base/stablet.png") no-repeat center + center; + background-size: 100% 100%; + + thead { + tr { + background: transparent; + th { + font-weight: 500; + font-size: vw(14); + color: #d9e7ff; + .cell { + padding-right: 0; + } + } + } + } + + th { + background: none; + } + td.el-table__cell, + th.el-table__cell.is-leaf { + border-bottom: none//1px solid #526b7f; + } + } + } + + .el-table__body-wrapper { + .el-table__body { + tbody { + color: #ffffff; + tr { + background: transparent; + td { + border-bottom: none; + //border-right-color: rgba(82, 107, 127, 0.7); + } + } + .el-table__row--striped { + .el-table__cell { + background: rgba(61, 85, 102, 0.3); + } + } + } + } + } + + &::after { + display: none; + } + } + .gPagination { + background-color: transparent; + } + .el-pagination { + padding: 2px 0; + .el-pagination__total { + height: auto; + color: #ffffff; + } + .el-pagination__sizes { + .el-input__inner { + background: #3c4b4a; + color: #fff; + } + } + .btn-prev { + background: #3c4b4a; + color: #fff; + } + .btn-next { + background: #3c4b4a; + color: #fff; + } + .el-pager { + .number { + background: #3c4b4a; + color: #fff; + &.active { + background: url("~@/assets/companyFile/2121.png") no-repeat !important; + background-size: 100% 100% !important; + } + } + } + .el-pagination__jump { + color: #fff; + .el-input__inner { + background: #3c4b4a; + color: #fff; + } + } + } + + .gScreenTable { + .gScreenTableWrap { + position: relative; + height: 100%; + overflow: auto; + box-sizing: border-box; + &::-webkit-scrollbar { + display: none; + } + .screenTable { + width: 100%; + height: 100%; + border-spacing: 0; + } + font-size: vw(14); + .thead { + position: sticky; + top: 0; + background-color: #3c4b4a; + .tr { + color: #d9e7ff; + height: 28px; + background: url("~@/assets/images/base/stablet.png") no-repeat center + center; + background-size: 100% 100%; + } + + border: none; + .th { + border: none; + } + } + .tbody { + padding-top: 28px; + color: #ffffff; + border: none; + height: calc(100% - 30px); + overflow-y: scroll; + &::-webkit-scrollbar { + display: none; + } + .tr { + height: vw(32); + .td { + text-align: center; + border: none; + } + + &:nth-child(odd) { + background: rgba(61, 85, 102, 0.3); + } + } + } + } + } +} diff --git a/src/loveflow/components/data/screenTable.vue b/src/loveflow/components/data/screenTable.vue new file mode 100644 index 0000000..1ead605 --- /dev/null +++ b/src/loveflow/components/data/screenTable.vue @@ -0,0 +1,161 @@ + + + diff --git a/src/loveflow/components/echart/pie/six.vue b/src/loveflow/components/echart/pie/six.vue index 8ec04b7..9e7ea65 100644 --- a/src/loveflow/components/echart/pie/six.vue +++ b/src/loveflow/components/echart/pie/six.vue @@ -44,7 +44,7 @@ export default { }, textAlign: "center", left: "47%", - bottom: "20%", + top: 140, }, color: this.chartObj.color, graphic: { diff --git a/src/loveflow/mixins/tableListMixins.js b/src/loveflow/mixins/tableListMixins.js index 9a38e70..7916adf 100644 --- a/src/loveflow/mixins/tableListMixins.js +++ b/src/loveflow/mixins/tableListMixins.js @@ -60,6 +60,21 @@ export const tableListMixins = { personType: "未登记人员", date: "2024-02-26 22:22:22", sc: "正常", + qyT: "企业类型" + i, + cardList: [ + { + name: "矛盾数据", + value: 9, + }, + { + name: "劳资纠纷", + value: 9, + }, + { + name: "特种设备", + value: 9, + }, + ], }); } //console.log(this.dataSource); diff --git a/src/main.js b/src/main.js index 3280529..ca21af7 100644 --- a/src/main.js +++ b/src/main.js @@ -15,10 +15,12 @@ import lkyPagination from "./components/publicModule/lkyPagination" // 本组件 import "@/loveflow/assets/index.less" import "@/loveflow/assets/reset.less" +import "@/loveflow/assets/reset.scss" import * as cusRule from '@/loveflow/rules' import { registerPlugins } from '@/loveflow/plugins/index' import FormDialog from '@/loveflow/components/modal/formDialog.vue' import gMainTable from '@/loveflow/components/data/table.vue' +import gScreenTable from '@/loveflow/components/data/screenTable.vue' import gDict from '@/loveflow/components/data/dict.vue' import gChart from '@/loveflow/components/echart/chart.vue' @@ -36,6 +38,7 @@ Vue.component('lkyTable', lkyTable) Vue.component('lkyPagination',lkyPagination) Vue.component('FormDialog', FormDialog) Vue.component('gMainTable', gMainTable) +Vue.component('gScreenTable', gScreenTable) Vue.component('gDict', gDict) Vue.component('gChart', gChart) const vm = new Vue({ diff --git a/src/router/routes/enterpriseTopic.js b/src/router/routes/enterpriseTopic.js index 0b58825..ad55a86 100644 --- a/src/router/routes/enterpriseTopic.js +++ b/src/router/routes/enterpriseTopic.js @@ -46,6 +46,16 @@ export default [ }, component: () => import("@/views/enterpriseTopic/dangerTransport"), }, + { + path: "/topic/dangerTransport/carDetail", + name: "dangerTransport", + meta: { + head: false, + title: "危险品运输详情", + }, + component: () => + import("@/views/enterpriseTopic/dangerTransport/carDetail"), + }, { path: "/topic/antiAttack", name: "antiAttack", diff --git a/src/views/enterpriseTopic/components/carNum.vue b/src/views/enterpriseTopic/components/carNum.vue new file mode 100644 index 0000000..f2a4801 --- /dev/null +++ b/src/views/enterpriseTopic/components/carNum.vue @@ -0,0 +1,75 @@ + + + diff --git a/src/views/enterpriseTopic/components/colWrap.vue b/src/views/enterpriseTopic/components/colWrap.vue index 345b713..96800af 100644 --- a/src/views/enterpriseTopic/components/colWrap.vue +++ b/src/views/enterpriseTopic/components/colWrap.vue @@ -24,34 +24,35 @@ export default { }, }; - diff --git a/src/views/enterpriseTopic/dangerTransport/carDetail.vue b/src/views/enterpriseTopic/dangerTransport/carDetail.vue new file mode 100644 index 0000000..a1d4721 --- /dev/null +++ b/src/views/enterpriseTopic/dangerTransport/carDetail.vue @@ -0,0 +1,403 @@ + + + + diff --git a/src/views/enterpriseTopic/dangerTransport/index.vue b/src/views/enterpriseTopic/dangerTransport/index.vue index 29cb72b..b860916 100644 --- a/src/views/enterpriseTopic/dangerTransport/index.vue +++ b/src/views/enterpriseTopic/dangerTransport/index.vue @@ -1,5 +1,397 @@ + + diff --git a/src/views/enterpriseTopic/inSecurity/index.vue b/src/views/enterpriseTopic/inSecurity/index.vue index 8a31a7d..45967b5 100644 --- a/src/views/enterpriseTopic/inSecurity/index.vue +++ b/src/views/enterpriseTopic/inSecurity/index.vue @@ -1,5 +1,249 @@ + +