diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js index c5b855f..518f1b0 100644 --- a/hb_client/src/router/index.js +++ b/hb_client/src/router/index.js @@ -163,6 +163,12 @@ export const asyncRoutes = [ name: 'productprocess', component: () => import('@/views/mtm/productprocess'), meta: { title: '产品管理', icon: 'product', perms: ['mtm_productprocess'] } + }, + { + path: 'knowledgeBase', + name: 'knowledgeBase', + component: () => import('@/views/mtm/knowledgeBase'), + meta: { title: '知识库', icon: 'procedure', perms: ['mtm_process'] } } ] @@ -291,61 +297,61 @@ export const asyncRoutes = [ name: 'record', component: () => import('@/views/em/record'), meta: { title: '校准检定记录', icon: 'calibrationRecord', perms: ['em_record'] } + }, + { + path: 'maintenance', + name: 'maintenance', + component: () => import('@/views/em/maintenance'), + meta: { title: '设备维修', icon: 'calibrationRecord', perms: ['em_record'] } } ] }, - // { - // path: '/safeEnviro', - // component: Layout, - // redirect: '/safeEnviro/hiddenDanger', - // name: 'safeEnviro', - // meta: { title: '安环管理', icon: 'equipment', perms: ['employee_manage'] }, - // children: [ - // { - // path: 'hiddenDanger', - // name: 'hiddenDanger', - // component: () => import('@/views/safeEnviro/hiddenDanger'), - // meta: { title: '隐患排查', icon: 'equipment', perms: ['employee_manage'] } - // }, - // { - // path: 'riskControl', - // name: 'riskControl', - // component: () => import('@/views/safeEnviro/riskControl'), - // meta: { title: '风险管控', icon: 'equipment', perms: ['employee_manage'] } - // }, - // { - // path: 'Education', - // name: 'Education', - // component: () => import('@/views/safeEnviro/Education'), - // meta: { title: '教育培训', icon: 'equipment', perms: ['employee_manage'] } - // } , - // { - // path: 'environmetManage', - // name: 'environmetManage', - // component: () => import('@/views/safeEnviro/environmetManage'), - // meta: { title: '环境管理', icon: 'equipment', perms: ['employee_manage'] } - // } , - // { - // path: 'intelligentAlarm', - // name: 'intelligentAlarm', - // component: () => import('@/views/safeEnviro/intelligentAlarm'), - // meta: { title: '智能报警', icon: 'equipment', perms: ['employee_manage'] } - // } - // ] - // }, + { + path: '/safeEnviro', + component: Layout, + redirect: '/safeEnviro/hiddenDanger', + name: 'safeEnviro', + meta: { title: '安环管理', icon: 'equipment', perms: ['employee_manage'] }, + children: [ + { + path: 'hiddenDanger', + name: 'hiddenDanger', + component: () => import('@/views/safeEnviro/hiddenDanger'), + meta: { title: '隐患排查', icon: 'equipment', perms: ['employee_manage'] } + }, + { + path: 'riskControl', + name: 'riskControl', + component: () => import('@/views/safeEnviro/riskControl'), + meta: { title: '风险管控', icon: 'equipment', perms: ['employee_manage'] } + }, + { + path: 'Education', + name: 'Education', + component: () => import('@/views/safeEnviro/Education'), + meta: { title: '教育培训', icon: 'equipment', perms: ['employee_manage'] } + } , + { + path: 'environmetManage', + name: 'environmetManage', + component: () => import('@/views/safeEnviro/environmetManage'), + meta: { title: '环境管理', icon: 'equipment', perms: ['employee_manage'] } + } , + { + path: 'intelligentAlarm', + name: 'intelligentAlarm', + component: () => import('@/views/safeEnviro/intelligentAlarm'), + meta: { title: '智能报警', icon: 'equipment', perms: ['employee_manage'] } + } + ] + }, { path: '/sam', component: Layout, - redirect: '/sam/customer', + redirect: '/sam/contract', name: 'sam', meta: { title: '销售管理', icon: 'sale', perms: ['sam_manage'] }, children: [ - { - path: 'customer', - name: 'customer', - component: () => import('@/views/sam/customer'), - meta: { title: '客户管理', icon: 'customer', perms: ['sam_customer'] } - }, { path: 'contract', name: 'contract', @@ -360,7 +366,6 @@ export const asyncRoutes = [ meta: { title: '合同详情'}, hidden: true } - , { path: 'order', @@ -393,6 +398,27 @@ export const asyncRoutes = [ } ] }, + { + path: '/customerManage', + component: Layout, + redirect: '/customerManage/customer', + name: 'customerManage', + meta: { title: '客户管理', icon: 'materialStatistics' }, + children: [ + { + path: 'customer', + name: 'customer', + component: () => import('@/views/customerManage/customer'), + meta: { title: '客户信息', icon: 'materialStatistics'} + }, + { + path: 'feedback', + name: 'feedback', + component: () => import('@/views/customerManage/feedback'), + meta: { title: '客户反馈', icon: 'materialStatistics'} + }, + ] + }, { path: '/qm', component: Layout, @@ -459,21 +485,21 @@ export const asyncRoutes = [ ] }, - // { - // path: '/energyManage', - // component: Layout, - // redirect: '/energyManage/energy', - // name: 'energyManage', - // meta: { title: '能源管理', icon: 'materialStatistics' }, - // children: [ - // { - // path: 'energy', - // name: 'energy', - // component: () => import('@/views/energyManage/energy'), - // meta: { title: '能源统计', icon: 'materialStatistics'} - // }, - // ] - // }, + { + path: '/energyManage', + component: Layout, + redirect: '/energyManage/energy', + name: 'energyManage', + meta: { title: '能源管理', icon: 'materialStatistics' }, + children: [ + { + path: 'energy', + name: 'energy', + component: () => import('@/views/energyManage/energy'), + meta: { title: '能源统计', icon: 'materialStatistics'} + }, + ] + }, { path: '/personnel', component: Layout, @@ -554,6 +580,12 @@ export const asyncRoutes = [ component: () => import('@/views/inm/product'), meta: { title: '成品库', icon: 'finishedProduct', perms: ['inm_product'] } }, + { + path: 'logistics', + name: 'logistics', + component: () => import('@/views/inm/logistics'), + meta: { title: '物流信息', icon: 'finishedProduct', perms: ['inm_product'] } + }, ] }, @@ -570,6 +602,13 @@ export const asyncRoutes = [ component: () => import('@/views/procurement/vendor'), meta: { title: '供应商', icon: 'supplier', perms: ['pum_vendor'] } }, + { + path: 'vendorDetails/:id', + name: 'vendorDetails', + component: () => import('@/views/procurement/vendorDetails'), + meta: { title: '供应商详情页'}, + hidden: true + }, { path: 'puorder', name: 'puorder', @@ -610,6 +649,12 @@ export const asyncRoutes = [ component: () => import('@/views/statistics/personStatistics'), meta: { title: '人员统计', icon: 'personStatistics', perms: ['statistics_personStatistics'] } }, + { + path: 'sales', + name: 'sales', + component: () => import('@/views/statistics/sales'), + meta: { title: '销售统计', icon: 'personStatistics', perms: ['statistics_personStatistics'] } + }, /* { path: 'costStatistics', name: 'costStatistics', diff --git a/hb_client/src/views/afterService/customerTracking.vue b/hb_client/src/views/afterService/customerTracking.vue deleted file mode 100644 index e69de29..0000000 diff --git a/hb_client/src/views/afterService/workOrder.vue b/hb_client/src/views/afterService/workOrder.vue deleted file mode 100644 index e69de29..0000000 diff --git a/hb_client/src/views/sam/customer.vue b/hb_client/src/views/customerManage/customer.vue similarity index 93% rename from hb_client/src/views/sam/customer.vue rename to hb_client/src/views/customerManage/customer.vue index 6b591cf..b358c5b 100644 --- a/hb_client/src/views/sam/customer.vue +++ b/hb_client/src/views/customerManage/customer.vue @@ -47,17 +47,17 @@ v-el-height-adaptive-table="{bottomOffset: 42}" > - + - + - + - + - + - + +
+ +
+ + 新增 + + + + 搜索 + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + \ No newline at end of file diff --git a/hb_client/src/views/em/maintenance.vue b/hb_client/src/views/em/maintenance.vue new file mode 100644 index 0000000..0c41981 --- /dev/null +++ b/hb_client/src/views/em/maintenance.vue @@ -0,0 +1,254 @@ + + + \ No newline at end of file diff --git a/hb_client/src/views/energyManage/energy.vue b/hb_client/src/views/energyManage/energy.vue index 947ad4a..0197bee 100644 --- a/hb_client/src/views/energyManage/energy.vue +++ b/hb_client/src/views/energyManage/energy.vue @@ -77,7 +77,7 @@ :height="domHeight" > - + @@ -105,7 +105,7 @@ - + - +
@@ -143,6 +143,16 @@
{{ item }}
+ + + + + + + +
+ {{ item }}
{{ itemtd }}
+ @@ -192,6 +202,17 @@ ['动力','1573','360','919','189','410','187','741'], ], + thLists1:['工序','电耗','消耗单位','产量','单位消耗'], + trList1:[ + ['冷加工','589','kwh','260','2.27'], + ['热弯','736','kwh','260','2.83'], + ['化学钢化','706','kwh','100','7.06'], + ['物理钢化','10362','kwh','160','64.76'], + ['镀膜','736','kwh','260','2.83'], + ['夹层','340','kwh','130','2.62'], + ['包边','360','kwh','120','3.00'], + ['装框','235','kwh','100','2.35'], + ], cdata: { xData: ["办公用电", "照明", "空调", "动力"], seriesData: [ @@ -309,23 +330,13 @@ immediate: true, deep: true }, - methods: { - handleFilter(){ - - }, - getList() { - this.orderLoading = true; - getOrderList(this.orderQuery).then((response) => { - if (response.data) { - this.orderList = response.data; - } - this.orderLoading = false; - }); - }, + created(){ + // let hei = document.getElementsByClassName('app-main')[0].clientHeight; + // this.domHeight =( hei- 100)/2+'px'; }, mounted() { let hei = document.getElementsByClassName('app-main')[0].clientHeight; - this.domHeight =( hei- 60)/2+'px'; + this.domHeight =( hei- 100)/2+'px'; this.getList(); //全场 this.barOptions ={ @@ -458,8 +469,22 @@ }, }] } - - } + }, + methods: { + handleFilter(){ + + }, + getList() { + this.orderLoading = true; + getOrderList(this.orderQuery).then((response) => { + if (response.data) { + this.orderList = response.data; + } + this.orderLoading = false; + }); + }, + }, + } @@ -504,6 +529,7 @@ .tableTr{ width: 100%; display: flex; + border-bottom:1px solid #cccccc; } .trtd{ flex: 1; diff --git a/hb_client/src/views/inm/logistics.vue b/hb_client/src/views/inm/logistics.vue new file mode 100644 index 0000000..9245ea0 --- /dev/null +++ b/hb_client/src/views/inm/logistics.vue @@ -0,0 +1,124 @@ + + + \ No newline at end of file diff --git a/hb_client/src/views/mtm/knowledgeBase.vue b/hb_client/src/views/mtm/knowledgeBase.vue new file mode 100644 index 0000000..11beab5 --- /dev/null +++ b/hb_client/src/views/mtm/knowledgeBase.vue @@ -0,0 +1,193 @@ + + + \ No newline at end of file diff --git a/hb_client/src/views/procurement/vendor.vue b/hb_client/src/views/procurement/vendor.vue index c13b362..c3884aa 100644 --- a/hb_client/src/views/procurement/vendor.vue +++ b/hb_client/src/views/procurement/vendor.vue @@ -74,6 +74,13 @@ > 编辑 + + 详情 + +
+ + + {{vendorItem.name}} + {{vendorItem.contact}} + + {{vendorItem.contact_phone}} + + {{vendorItem.address}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + \ No newline at end of file diff --git a/hb_client/src/views/statistics/sales.vue b/hb_client/src/views/statistics/sales.vue new file mode 100644 index 0000000..c9c9f78 --- /dev/null +++ b/hb_client/src/views/statistics/sales.vue @@ -0,0 +1,346 @@ + + + + + + \ No newline at end of file