diff --git a/components.d.ts b/components.d.ts index 8265dc8..7f1699f 100644 --- a/components.d.ts +++ b/components.d.ts @@ -10,30 +10,17 @@ declare module 'vue' { ElButton: typeof import('element-plus/es')['ElButton'] ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] - ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] - ElCol: typeof import('element-plus/es')['ElCol'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] - ElDialog: typeof import('element-plus/es')['ElDialog'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] - ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] - ElOption: typeof import('element-plus/es')['ElOption'] - ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] - ElProgress: typeof import('element-plus/es')['ElProgress'] - ElRow: typeof import('element-plus/es')['ElRow'] - ElSelect: typeof import('element-plus/es')['ElSelect'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - ElTag: typeof import('element-plus/es')['ElTag'] - ElTimeline: typeof import('element-plus/es')['ElTimeline'] - ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] - ElUpload: typeof import('element-plus/es')['ElUpload'] EquipCard: typeof import('./src/components/equipCard.vue')['default'] EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default'] FooterInfo: typeof import('./src/components/FooterInfo/index.vue')['default'] diff --git a/env.d.ts b/env.d.ts index f218ff3..d959db4 100644 --- a/env.d.ts +++ b/env.d.ts @@ -1,2 +1,3 @@ /// -declare module "nprogress" \ No newline at end of file +declare module "nprogress" + diff --git a/src/components/Navmenu/index.vue b/src/components/Navmenu/index.vue index dde9197..5d73515 100644 --- a/src/components/Navmenu/index.vue +++ b/src/components/Navmenu/index.vue @@ -11,7 +11,7 @@ { name: '企业专区', routerName: '/home' } ] - const navMenuClick = (name) => { + const navMenuClick = (name: any) => { router.push({ name }) } diff --git a/src/router/index.ts b/src/router/index.ts index b6e8fb8..bf18401 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -80,7 +80,7 @@ const routes: Array = [ { path: '/equipList', name: 'equipList', - component: () => import('@/views/equip/list.vue'), + component: () => import('views/equip/list.vue'), meta: { title: '' } diff --git a/src/views/EnterpriseCertification.vue b/src/views/EnterpriseCertification.vue index 687c273..8e6baf5 100644 --- a/src/views/EnterpriseCertification.vue +++ b/src/views/EnterpriseCertification.vue @@ -327,7 +327,7 @@ - + > @@ -405,14 +405,14 @@
-
+ diff --git a/src/views/user/orderManagement/orderCom/timeLineHorizontal.vue b/src/views/user/orderManagement/orderCom/timeLineHorizontal.vue index 8d5f0bf..1d6112b 100644 --- a/src/views/user/orderManagement/orderCom/timeLineHorizontal.vue +++ b/src/views/user/orderManagement/orderCom/timeLineHorizontal.vue @@ -3,9 +3,13 @@
工程进度
- - + +
{{ item.title }}
@@ -15,86 +19,84 @@
\ No newline at end of file + + :deep(.el-timeline-item__timestamp) { + font-size: 14px; + font-weight: normal; + } + + .active { + border: none !important; + + :deep(.el-timeline-item__node) { + // background-color: $main-color; + background-color: v-bind('props.themeColor'); + } + + :deep(.el-timeline-item__tail) { + // border-color: $main-color; + // background-color: v-bind('props.themeColor'); + } + } + + // 有active样式的下一个li + .active + li { + :deep(.el-timeline-item__node) { + background-color: v-bind('props.themeColor'); + } + } + diff --git a/src/views/user/orderManagementCz/index.vue b/src/views/user/orderManagementCz/index.vue index 82a3355..95faf07 100644 --- a/src/views/user/orderManagementCz/index.vue +++ b/src/views/user/orderManagementCz/index.vue @@ -3,12 +3,12 @@ const queryParams = ref({}) import PagingComponent from 'components/PagingComponent/index.vue' import { getOrderListApi } from 'http/api/usercenter/seekorder' - import zhCn from 'element-plus/dist/locale/zh-cn.mjs' + // import zhCn from 'element-plus/dist/locale/zh-cn.mjs' const router = useRouter() - const pageSize = ref(20) - const pageNumber = ref(1) + const pageSize: any = ref(20) + const pageNumber: any = ref(1) const total: any = ref(0) // 获取数据列表 @@ -27,19 +27,24 @@ } /* 确认按钮 */ - const confirmBtn = (row:any) => { - router.push({ name: 'orderConfirm',query:{ - orderId:row.orderId - } }) - + const confirmBtn = (row: any) => { + router.push({ + name: 'orderConfirm', + query: { + orderId: row.orderId + } + }) } /* 查看按钮 */ - const clickPreviewDetails = (row:any) => { + const clickPreviewDetails = (row: any) => { console.log('查看') - router.push({ name: 'orderDetails',query:{ - orderId:row.orderId - } }) + router.push({ + name: 'orderDetails', + query: { + orderId: row.orderId + } + }) } const tableData: any = ref([{ address: '客户单位' }]) @@ -50,35 +55,34 @@