diff --git a/src/assets/css/index.css b/src/assets/css/index.css index 9e918ab337da00f3f5b86a68bc939e0cb97b42f1..e06a711ad528b05d0d77253779f7ca33926a7b14 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -1263,10 +1263,12 @@ border-radius:8px; background-color: #fff; } + +/* .el-picker-panel__footer { border-top: 1px solid #3f4864 !important; background-color: #242c43 !important; -} +} */ .el-picker-panel__icon-btn { color: #202531; @@ -1294,10 +1296,7 @@ border-radius:8px; .el-picker-panel__body .el-input__inner { height: 24px !important; line-height: 24px !important; - background-color: #1a2236 !important; border-radius: 12px !important; - border: solid 1px #3f4864 !important; - color: #e3e5ef !important; font-size: 12px; } @@ -1331,12 +1330,12 @@ border-radius:8px; .el-time-panel { border-radius: 8px !important; - border: 1px solid #3f4864 !important; - background-color: #242c43 !important; + /* border: 1px solid #3f4864 !important; + background-color: #242c43 !important; */ } .el-time-panel__footer { - border: 1px solid #3f4864 !important; + /* border: 1px solid #3f4864 !important; */ } .el-time-panel__btn.confirm { @@ -1353,8 +1352,8 @@ border-radius:8px; } .el-time-spinner__item:hover:not(.disabled):not(.active) { - background-color: #264dd9 !important; - border-radius: 12px !important; + /* background-color: #264dd9 !important; */ + /* border-radius: 12px !important; */ color: #f4f7fc; } diff --git a/src/components/table/bg-filter-form.vue b/src/components/table/bg-filter-form.vue deleted file mode 100644 index 03bd47b50fcccdce23881a0b435ecc496c9523c4..0000000000000000000000000000000000000000 --- a/src/components/table/bg-filter-form.vue +++ /dev/null @@ -1,375 +0,0 @@ - - - - diff --git a/src/components/table/bg-pagination.vue b/src/components/table/bg-pagination.vue deleted file mode 100644 index 406985c75eb77463e9c16d32c4eda623423d3628..0000000000000000000000000000000000000000 --- a/src/components/table/bg-pagination.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - diff --git a/src/components/table/bg-table-href.vue b/src/components/table/bg-table-href.vue deleted file mode 100644 index e308678b908792ebe65f953cb356ccc454f17445..0000000000000000000000000000000000000000 --- a/src/components/table/bg-table-href.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - - - diff --git a/src/components/table/bg-table-list.vue b/src/components/table/bg-table-list.vue deleted file mode 100644 index 2b9787352c7d45019a2e4640d972938fe11ecbbf..0000000000000000000000000000000000000000 --- a/src/components/table/bg-table-list.vue +++ /dev/null @@ -1,61 +0,0 @@ - - - - diff --git a/src/components/table/bg-table.vue b/src/components/table/bg-table.vue deleted file mode 100644 index 0a7cb74cbb38ad025ca78bee6beaab9f48f95613..0000000000000000000000000000000000000000 --- a/src/components/table/bg-table.vue +++ /dev/null @@ -1,148 +0,0 @@ - - - diff --git a/src/components/warn-detail/env.js b/src/components/warn-detail/env.js new file mode 100644 index 0000000000000000000000000000000000000000..c8c7e0e86d7f2ce5736da9f07e48d94ce9d23e4e --- /dev/null +++ b/src/components/warn-detail/env.js @@ -0,0 +1,8 @@ +export const STATUS_OBJ = { + success: "已恢复", + error: '未恢复' +} +export const PUSH_STATUS = { + success: '成功', + error: '失败' +} \ No newline at end of file diff --git a/src/components/warn-detail/index.vue b/src/components/warn-detail/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..36f5ed1b7c1bdc4d1521ed45eb017b421a1944b4 --- /dev/null +++ b/src/components/warn-detail/index.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/src/components/warn-detail/info.vue b/src/components/warn-detail/info.vue new file mode 100644 index 0000000000000000000000000000000000000000..1c3e852e7e6830da80a6dc0e9049da308a306866 --- /dev/null +++ b/src/components/warn-detail/info.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/src/components/warn-detail/tab.vue b/src/components/warn-detail/tab.vue new file mode 100644 index 0000000000000000000000000000000000000000..069ab3ffb9fbba1d75c64c060ab6d36d33853277 --- /dev/null +++ b/src/components/warn-detail/tab.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/page/main/work-order/business-work-order-list/close-work-order.vue b/src/page/main/ticket/business-ticket-list/close-ticket.vue similarity index 100% rename from src/page/main/work-order/business-work-order-list/close-work-order.vue rename to src/page/main/ticket/business-ticket-list/close-ticket.vue diff --git a/src/page/main/ticket/business-ticket-list/detail/index.vue b/src/page/main/ticket/business-ticket-list/detail/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..2da67e8d6d8815701d90a1b07102106aac9699f7 --- /dev/null +++ b/src/page/main/ticket/business-ticket-list/detail/index.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/page/main/ticket/business-ticket-list/index.vue b/src/page/main/ticket/business-ticket-list/index.vue index 3ab120b251839bebaa62124f59d5a47a3565d5c8..fabf7a8363be34b87d16f56d6c1b79204ddc97d7 100644 --- a/src/page/main/ticket/business-ticket-list/index.vue +++ b/src/page/main/ticket/business-ticket-list/index.vue @@ -1,7 +1,314 @@ - + + + diff --git a/src/page/main/ticket/business-ticket-manage/detail/index.vue b/src/page/main/ticket/business-ticket-manage/detail/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..ca964f08c5c9460ecc777ce6ecc20069c272d04c --- /dev/null +++ b/src/page/main/ticket/business-ticket-manage/detail/index.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/page/main/ticket/business-ticket-manage/index.vue b/src/page/main/ticket/business-ticket-manage/index.vue index e7bc842880bceff9ddf5b10d97962582644f1b0c..ee47834fa3ec63c9ad4d89a51277be9eff78bf0e 100644 --- a/src/page/main/ticket/business-ticket-manage/index.vue +++ b/src/page/main/ticket/business-ticket-manage/index.vue @@ -1,7 +1,385 @@ - + - + diff --git a/src/page/main/work-order/modules/detail.vue b/src/page/main/ticket/modules/detail.vue similarity index 100% rename from src/page/main/work-order/modules/detail.vue rename to src/page/main/ticket/modules/detail.vue diff --git a/src/page/main/work-order/modules/feedback.vue b/src/page/main/ticket/modules/feedback.vue similarity index 100% rename from src/page/main/work-order/modules/feedback.vue rename to src/page/main/ticket/modules/feedback.vue diff --git a/src/page/main/ticket/modules/warn-detail.vue b/src/page/main/ticket/modules/warn-detail.vue new file mode 100644 index 0000000000000000000000000000000000000000..68c6de1dbd62fc8f96d907df1c66361faf704369 --- /dev/null +++ b/src/page/main/ticket/modules/warn-detail.vue @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/src/page/main/ticket/my-business-ticket/detail/index.vue b/src/page/main/ticket/my-business-ticket/detail/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..31b216e1f94acee7d03b93ae4c61ed947135ceb9 --- /dev/null +++ b/src/page/main/ticket/my-business-ticket/detail/index.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/page/main/ticket/my-business-ticket/index.vue b/src/page/main/ticket/my-business-ticket/index.vue index d2ee9ae172d1a689888ca216dda242c8564cf6d7..270b456e88922efe851b97abbfdea1e1cd0d717e 100644 --- a/src/page/main/ticket/my-business-ticket/index.vue +++ b/src/page/main/ticket/my-business-ticket/index.vue @@ -1,7 +1,312 @@ - + + + diff --git a/src/page/main/ticket/my-warn-ticket/detail/index.vue b/src/page/main/ticket/my-warn-ticket/detail/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..4f0102f5642700ed75f50e247c0c66c51964a640 --- /dev/null +++ b/src/page/main/ticket/my-warn-ticket/detail/index.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/src/page/main/ticket/my-warn-ticket/index.vue b/src/page/main/ticket/my-warn-ticket/index.vue index ea40ff5d364c3883764fe23f51a10f0a99e16344..77a61e02ce5dbfe1df939d5e4163af5520d42068 100644 --- a/src/page/main/ticket/my-warn-ticket/index.vue +++ b/src/page/main/ticket/my-warn-ticket/index.vue @@ -1,7 +1,349 @@ - + + + diff --git a/src/page/main/work-order/business-work-order-list/index.vue b/src/page/main/work-order/business-work-order-list/index.vue deleted file mode 100644 index e217a9c55e3186b0cf6ec56d08cbaa57e004d40c..0000000000000000000000000000000000000000 --- a/src/page/main/work-order/business-work-order-list/index.vue +++ /dev/null @@ -1,257 +0,0 @@ - - - - - diff --git a/src/page/main/work-order/business-work-order-manage/detail.vue b/src/page/main/work-order/business-work-order-manage/detail.vue deleted file mode 100644 index 395bcd618d384fa8616ab7fa86f22fc8dbbe967a..0000000000000000000000000000000000000000 --- a/src/page/main/work-order/business-work-order-manage/detail.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/page/main/work-order/business-work-order-manage/index.vue b/src/page/main/work-order/business-work-order-manage/index.vue deleted file mode 100644 index 4777aa577a7ad89d2eb23e6ef579328d8adaf976..0000000000000000000000000000000000000000 --- a/src/page/main/work-order/business-work-order-manage/index.vue +++ /dev/null @@ -1,324 +0,0 @@ - - - - - diff --git a/src/page/main/work-order/my-alert-work-order/detail.vue b/src/page/main/work-order/my-alert-work-order/detail.vue deleted file mode 100644 index 4d2bdab76a30240d417d29b1c27a1b814f69aa51..0000000000000000000000000000000000000000 --- a/src/page/main/work-order/my-alert-work-order/detail.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/page/main/work-order/my-alert-work-order/index.vue b/src/page/main/work-order/my-alert-work-order/index.vue deleted file mode 100644 index 4bc6529422e541062ee659aeffa5d4d17b41d7e1..0000000000000000000000000000000000000000 --- a/src/page/main/work-order/my-alert-work-order/index.vue +++ /dev/null @@ -1,285 +0,0 @@ - - - - - diff --git a/src/page/main/work-order/my-business-work-order/detail.vue b/src/page/main/work-order/my-business-work-order/detail.vue deleted file mode 100644 index 0fb0a2a59fded0ecf9a3ee4420a2202cc89e1b0c..0000000000000000000000000000000000000000 --- a/src/page/main/work-order/my-business-work-order/detail.vue +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/src/page/main/work-order/my-business-work-order/index.vue b/src/page/main/work-order/my-business-work-order/index.vue deleted file mode 100644 index 874df9ce54ac2d71cdc7d864c1ebf8e59e0e541c..0000000000000000000000000000000000000000 --- a/src/page/main/work-order/my-business-work-order/index.vue +++ /dev/null @@ -1,258 +0,0 @@ - - - - - diff --git a/src/router/index.js b/src/router/index.js index 174ad3737e0577cfb9bf9ff1171c4f238491f067..c0dd1870579f14058e9b7a2c0982722d24f43ee7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,63 +2,7 @@ //不用新增父路由的文件,父路由全部由parent/parent.vue来支撑 import { createRouter, createWebHashHistory } from "vue-router"; import store from "../store"; -let work_order = [{ - path: '/work-order', - name: 'work-order', - component: () => - import ("../page/parent/parent.vue"), - redirect: "/work-order/my-alert", - children: [{ - path: '/work-order/my-alert', - name: 'my-alert', - show: true, - component: () => - import ("../page/main/work-order/my-alert-work-order/index.vue") - }, - { - path: '/work-order/my-alert-detail', - name: 'my-alert-detail', - show: true, - component: () => - import ("../page/main/work-order/my-alert-work-order/detail.vue") - }, - { - path: '/work-order/my-business', - name: 'my-business', - show: true, - component: () => - import ("../page/main/work-order/my-business-work-order/index.vue") - }, - { - path: '/work-order/my-business-detail', - name: 'my-business-detail', - show: true, - component: () => - import ("../page/main/work-order/my-business-work-order/detail.vue") - }, - { - path: '/work-order/business-list', - name: 'business-list', - show: true, - component: () => - import ("../page/main/work-order/business-work-order-list/index.vue") - }, - { - path: '/work-order/business-manage', - name: 'business-manage', - show: true, - component: () => - import ("../page/main/work-order/business-work-order-manage/index.vue") - }, - { - path: '/work-order/business-manage-detail', - name: 'business-manage-detail', - show: true, - component: () => - import ("../page/main/work-order/business-work-order-manage/detail.vue") - }, - ] -}] + //写入初始必须有的路由 //或者隐藏式路由,不会表现在菜单上,但是需要存在的路由 @@ -95,7 +39,6 @@ const routes = [{ component: () => import ("../page/404.vue"), }, - ...work_order ]; //重新创建router @@ -181,7 +124,6 @@ export function generateRoutes() { redirect: '/404' }) - console.log(router.getRoutes()); }