From a1c7b0645049e2ba3e10ec73f1ff2602d371e382 Mon Sep 17 00:00:00 2001 From: 13218645326 Date: Sat, 9 Dec 2023 23:13:06 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.ts | 2 + src/router/routerData copy.ts | 204 +++++++++++++++ src/router/routerData.ts | 246 +++++++++--------- .../enterpriseType/com/addCom.vue | 5 +- .../enterpriseType/index.vue | 9 +- 5 files changed, 338 insertions(+), 128 deletions(-) create mode 100644 src/router/routerData copy.ts diff --git a/src/main.ts b/src/main.ts index 0e35954..8e2e6a2 100644 --- a/src/main.ts +++ b/src/main.ts @@ -16,3 +16,5 @@ app.use(router) app.use(pinia) app.use(components) app.mount('#app') + + diff --git a/src/router/routerData copy.ts b/src/router/routerData copy.ts new file mode 100644 index 0000000..08481a5 --- /dev/null +++ b/src/router/routerData copy.ts @@ -0,0 +1,204 @@ +export const list: any = [ + { + name: "configManage", + path:'/index/configManage', + meta: { + title: '配置管理', + keepAlive: true, + AuthFlag: true + }, + children: [ + { + path:'/index/configManage/swiperConfig', + name: 'swiperConfig', + component: 'views/configuration/swiperConfig.vue', + meta: { + title: '轮播图配置', + keepAlive: true, + AuthFlag: true + } + }, + { + path:'/index/configManage/specialInformationConfiguration', + name: 'specialInformationConfiguration', + component: 'views/configuration/specialInformationConfiguration/index.vue', + meta: { + title: '专题资讯配置', + keepAlive: true, + AuthFlag: true + } + }, + { + path:'/index/configManage/privacyAgreement', + name: 'privacyAgreement', + component: 'views/configuration/privacyAgreement/index.vue', + meta: { + title: '隐私协议模板管理', + keepAlive: true, + AuthFlag: true + } + }, + ] + }, + { + name: "企业管理", + path:'/index/enterpriseTypeManage', + meta: { + title: '企业管理', + keepAlive: true, + AuthFlag: true + }, + children: [ + + + { + path:'/index/enterpriseTypeManage/enterpriseType', + name: 'configuration', + component: 'views/enterpriseManagement/enterpriseType/index.vue', + meta: { + title: '企业类型', + keepAlive: true, + AuthFlag: true + } + }, + { + path:'/index/enterpriseTypeManage/enterpriseEntryReview', + name: 'enterpriseEntryReview', + component: 'views/enterpriseManagement/enterpriseEntryReview/index.vue', + meta: { + title: '企业入驻审核', + keepAlive: true, + AuthFlag: true + }, + + }, + { + path:'/index/enterpriseTypeManage/businessReview', + name: 'businessReview', + component: 'views/enterpriseManagement/businessReview/index.vue', + meta: { + title: '企业业务开通审核', + keepAlive: true, + AuthFlag: true + } + }, + { + path:'/index/enterpriseTypeManage/enterpriseInfo', + name: 'enterpriseInfo', + component: 'views/enterpriseManagement/enterpriseInfo/index.vue', + meta: { + title: '企业信息', + keepAlive: true, + AuthFlag: true + } + }, + ] + }, + { + name: "企业装备管理", + path:'/index/enterpriseEquipmentManage', + meta: { + title: '企业装备管理', + keepAlive: true, + AuthFlag: true + }, + children: [ + { + path:'/index/enterpriseEquipmentManage/equipmentTypeTemplate', + name: 'equipmentTypeTemplate', + component: 'views/enterpriseEquipmentManage/equipmentTypeTemplate/index.vue', + meta: { + title: '装备类型模板', + keepAlive: true, + AuthFlag: true + } + }, + + { + path:'/index/enterpriseEquipmentManage/equipmentListingApproval', + name: 'equipmentListingApproval', + component: 'views/enterpriseEquipmentManage/equipmentListingApproval/index.vue', + meta: { + title: '装备上架审批', + keepAlive: true, + AuthFlag: true + }, + + }, + // iotEquipmentManagement + { + path:'/index/enterpriseEquipmentManage/iotEquipmentManagement', + name: 'iotEquipmentManagement', + component: 'views/enterpriseEquipmentManage/iotEquipmentManagement/index.vue', + meta: { + title: 'iot设备管理', + keepAlive: true, + AuthFlag: true + } + } + ] + }, + { + name: "orderManagement", + path:'/index/orderManagement', + component: 'views/orderManagement/index.vue', + meta: { + title: '订单管理', + keepAlive: true, + AuthFlag: true + }, + children: [] + }, + { + name: "systemManage", + path:'/index/systemManage', + meta: { + title: '系统管理', + keepAlive: true, + AuthFlag: true + }, + children: [ + { + path:'/index/systemManage/systemVersion', + name: 'systemVersion', + component: 'views/systemManage/systemVersion/index.vue', + meta: { + title: '系统版本管理', + keepAlive: true, + AuthFlag: true + } + }, + { + path:'/index/systemManage/userManage', + name: 'userManage', + component: 'views/systemManage/userManage/index.vue', + meta: { + title: '用户管理', + keepAlive: true, + AuthFlag: true + } + } , + { + path:'/index/systemManage/systemLog', + name: 'systemLog', + component: 'views/systemManage/systemLog/index.vue', + meta: { + title: '系统日志', + keepAlive: true, + AuthFlag: true + } + } , + { + name: "lonLatPick", + path: 'lonLatPick', + component: () => import('views/enterpriseManagement/lonLatPick/index.vue'), + meta: { + title: '经纬度拾取', + keepAlive: true, + AuthFlag: true + }, + } + ] + } + +] \ No newline at end of file diff --git a/src/router/routerData.ts b/src/router/routerData.ts index 08481a5..6adb115 100644 --- a/src/router/routerData.ts +++ b/src/router/routerData.ts @@ -1,45 +1,45 @@ export const list: any = [ - { - name: "configManage", - path:'/index/configManage', - meta: { - title: '配置管理', - keepAlive: true, - AuthFlag: true - }, - children: [ - { - path:'/index/configManage/swiperConfig', - name: 'swiperConfig', - component: 'views/configuration/swiperConfig.vue', - meta: { - title: '轮播图配置', - keepAlive: true, - AuthFlag: true - } - }, - { - path:'/index/configManage/specialInformationConfiguration', - name: 'specialInformationConfiguration', - component: 'views/configuration/specialInformationConfiguration/index.vue', - meta: { - title: '专题资讯配置', - keepAlive: true, - AuthFlag: true - } - }, - { - path:'/index/configManage/privacyAgreement', - name: 'privacyAgreement', - component: 'views/configuration/privacyAgreement/index.vue', - meta: { - title: '隐私协议模板管理', - keepAlive: true, - AuthFlag: true - } - }, - ] - }, + // { + // name: "configManage", + // path:'/index/configManage', + // meta: { + // title: '配置管理', + // keepAlive: true, + // AuthFlag: true + // }, + // children: [ + // { + // path:'/index/configManage/swiperConfig', + // name: 'swiperConfig', + // component: 'views/configuration/swiperConfig.vue', + // meta: { + // title: '轮播图配置', + // keepAlive: true, + // AuthFlag: true + // } + // }, + // { + // path:'/index/configManage/specialInformationConfiguration', + // name: 'specialInformationConfiguration', + // component: 'views/configuration/specialInformationConfiguration/index.vue', + // meta: { + // title: '专题资讯配置', + // keepAlive: true, + // AuthFlag: true + // } + // }, + // { + // path:'/index/configManage/privacyAgreement', + // name: 'privacyAgreement', + // component: 'views/configuration/privacyAgreement/index.vue', + // meta: { + // title: '隐私协议模板管理', + // keepAlive: true, + // AuthFlag: true + // } + // }, + // ] + // }, { name: "企业管理", path:'/index/enterpriseTypeManage', @@ -103,16 +103,16 @@ export const list: any = [ AuthFlag: true }, children: [ - { - path:'/index/enterpriseEquipmentManage/equipmentTypeTemplate', - name: 'equipmentTypeTemplate', - component: 'views/enterpriseEquipmentManage/equipmentTypeTemplate/index.vue', - meta: { - title: '装备类型模板', - keepAlive: true, - AuthFlag: true - } - }, + // { + // path:'/index/enterpriseEquipmentManage/equipmentTypeTemplate', + // name: 'equipmentTypeTemplate', + // component: 'views/enterpriseEquipmentManage/equipmentTypeTemplate/index.vue', + // meta: { + // title: '装备类型模板', + // keepAlive: true, + // AuthFlag: true + // } + // }, { path:'/index/enterpriseEquipmentManage/equipmentListingApproval', @@ -126,79 +126,79 @@ export const list: any = [ }, // iotEquipmentManagement - { - path:'/index/enterpriseEquipmentManage/iotEquipmentManagement', - name: 'iotEquipmentManagement', - component: 'views/enterpriseEquipmentManage/iotEquipmentManagement/index.vue', - meta: { - title: 'iot设备管理', - keepAlive: true, - AuthFlag: true - } - } + // { + // path:'/index/enterpriseEquipmentManage/iotEquipmentManagement', + // name: 'iotEquipmentManagement', + // component: 'views/enterpriseEquipmentManage/iotEquipmentManagement/index.vue', + // meta: { + // title: 'iot设备管理', + // keepAlive: true, + // AuthFlag: true + // } + // } ] }, - { - name: "orderManagement", - path:'/index/orderManagement', - component: 'views/orderManagement/index.vue', - meta: { - title: '订单管理', - keepAlive: true, - AuthFlag: true - }, - children: [] - }, - { - name: "systemManage", - path:'/index/systemManage', - meta: { - title: '系统管理', - keepAlive: true, - AuthFlag: true - }, - children: [ - { - path:'/index/systemManage/systemVersion', - name: 'systemVersion', - component: 'views/systemManage/systemVersion/index.vue', - meta: { - title: '系统版本管理', - keepAlive: true, - AuthFlag: true - } - }, - { - path:'/index/systemManage/userManage', - name: 'userManage', - component: 'views/systemManage/userManage/index.vue', - meta: { - title: '用户管理', - keepAlive: true, - AuthFlag: true - } - } , - { - path:'/index/systemManage/systemLog', - name: 'systemLog', - component: 'views/systemManage/systemLog/index.vue', - meta: { - title: '系统日志', - keepAlive: true, - AuthFlag: true - } - } , - { - name: "lonLatPick", - path: 'lonLatPick', - component: () => import('views/enterpriseManagement/lonLatPick/index.vue'), - meta: { - title: '经纬度拾取', - keepAlive: true, - AuthFlag: true - }, - } - ] - } + // { + // name: "orderManagement", + // path:'/index/orderManagement', + // component: 'views/orderManagement/index.vue', + // meta: { + // title: '订单管理', + // keepAlive: true, + // AuthFlag: true + // }, + // children: [] + // }, + // { + // name: "systemManage", + // path:'/index/systemManage', + // meta: { + // title: '系统管理', + // keepAlive: true, + // AuthFlag: true + // }, + // children: [ + // { + // path:'/index/systemManage/systemVersion', + // name: 'systemVersion', + // component: 'views/systemManage/systemVersion/index.vue', + // meta: { + // title: '系统版本管理', + // keepAlive: true, + // AuthFlag: true + // } + // }, + // { + // path:'/index/systemManage/userManage', + // name: 'userManage', + // component: 'views/systemManage/userManage/index.vue', + // meta: { + // title: '用户管理', + // keepAlive: true, + // AuthFlag: true + // } + // } , + // { + // path:'/index/systemManage/systemLog', + // name: 'systemLog', + // component: 'views/systemManage/systemLog/index.vue', + // meta: { + // title: '系统日志', + // keepAlive: true, + // AuthFlag: true + // } + // } , + // { + // name: "lonLatPick", + // path: 'lonLatPick', + // component: () => import('views/enterpriseManagement/lonLatPick/index.vue'), + // meta: { + // title: '经纬度拾取', + // keepAlive: true, + // AuthFlag: true + // }, + // } + // ] + // } ] \ No newline at end of file diff --git a/src/views/enterpriseManagement/enterpriseType/com/addCom.vue b/src/views/enterpriseManagement/enterpriseType/com/addCom.vue index 38ffe9f..049c1f5 100644 --- a/src/views/enterpriseManagement/enterpriseType/com/addCom.vue +++ b/src/views/enterpriseManagement/enterpriseType/com/addCom.vue @@ -33,6 +33,7 @@ const form = reactive({ name: '', status: false }) +let editId = "" // const validatorLink = (rule: any, value: any, callback: any) => { // if (linkReg.test(value)) { // callback() @@ -54,7 +55,8 @@ const publishFn = () => { if (valid) { const params = { name: form.name, - status: form.status ? '1' : '0' + status: form.status ? '1' : '0', + id:editId } const res = await apiAddOrUpdateCompanyType(params) console.log("res-apiAddOrUpdateCompanyType", res) @@ -99,6 +101,7 @@ const edit = (val:any) => { addShow.value = true form.name = val.name form.status=val.status=='1' ?true : false + editId=val.id } defineExpose({ diff --git a/src/views/enterpriseManagement/enterpriseType/index.vue b/src/views/enterpriseManagement/enterpriseType/index.vue index 96d79ec..08d9818 100644 --- a/src/views/enterpriseManagement/enterpriseType/index.vue +++ b/src/views/enterpriseManagement/enterpriseType/index.vue @@ -41,8 +41,7 @@ import addCom from "./com/addCom.vue" import { ElConfirmBeforeOpert } from "utils/elementCom" import { ElMessage } from 'element-plus' import { apiSelectCompanyTypeList, apiDeleteCompanyType, apiExportExcel, apiAddOrUpdateCompanyType } from "http/api/enterprise" -import { rejects } from "assert" -import { fa } from "element-plus/es/locale" + const addComRef = ref() const paginationInfo = reactive({ pageNum: 1, @@ -123,7 +122,8 @@ const beforeChange = (ev: any) => { return new Promise((resolve, reject) => { apiAddOrUpdateCompanyType({ name: ev.name, - status: ev.status ? '1' : '0' + status: ev.status ? '1' : '0', + id:ev.id }).then((res: any) => { if(res.code == 200){ resolve(true) @@ -154,7 +154,8 @@ const initTableList = async () => { tableListInfo.list = res.rows.map((ele: any) => { const item = { ...ele, - status: ele.status == '1' ? true : false + status: ele.status == '1' ? true : false, + id:ele.id } return item })