diff --git a/package.json b/package.json index f1e6dec..f2ae4a3 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "author": "Pan ", "scripts": { "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", + "buildSSL:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build", "serve": "vue-cli-service serve", "build:prod": "vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", diff --git a/src/api/gfApi/report.js b/src/api/gfApi/report.js new file mode 100644 index 0000000..fb370f3 --- /dev/null +++ b/src/api/gfApi/report.js @@ -0,0 +1,72 @@ +import request from '@/utils/request' +let tokens = window.sessionStorage.getItem('tokenValue') +export default { + // 监管工作日报 + projectdailypage: function(params) { + return request({ + url: '/gf/projectdaily/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + // 库存日报 + kcrbpage: function(params) { + return request({ + url: '/gf/inventory/kcrbpage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + // 有效电站量曲线图数据 + statisticgroup_area: function() { + return request({ + url: '/gf/home/statisticgroup_area', + method: 'get', + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + // 有效电站量曲线图数据 + statisticgroup_node: function() { + return request({ + url: '/gf/home/statisticgroup_node', + method: 'get', + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + // 有效电站量曲线图数据 + statisticgroup_dataid: function() { + return request({ + url: '/gf/home/statisticgroup_dataid', + method: 'get', + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + // 发电状态情况 + screenindex: function() { + return request({ + url: '/gf/home/screenindex', + method: 'get', + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + } +} diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index b5ddf0c..ddcab3e 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -240,64 +240,104 @@ // }, { alwaysShow: true, - component: 'systemOrder', + component: 'expexcel', meta: { icon: 'el-icon-menu', - title: '工程信息' + title: '数据导出' }, name: '', - path: '/systemOrder', + path: '/expexcel', children: [{ alwaysShow: true, - component: 'index', + component: 'yxdz', meta: { icon: 'el-icon-help', - title: '电站列表' + title: '有效电站' }, - name: 'systemOrder/index', - path: '/systemOrder/index' + name: 'expexcel/yxdz', + path: '/expexcel/yxdz' }, { alwaysShow: true, - component: 'index', + component: 'fdlb', meta: { icon: 'el-icon-help', - title: '项目流程数据' + title: '发电列表' }, - name: 'systemOrder/proj', - path: '/systemOrder/proj' + name: 'expexcel/fdlb', + path: '/expexcel/fdlb' } ] }, { alwaysShow: true, - component: 'expexcel', + component: 'systemOrder', meta: { icon: 'el-icon-menu', - title: '数据导出' + title: '监管报表' }, name: '', - path: '/expexcel', + path: '/systemOrder', children: [{ alwaysShow: true, - component: 'yxdz', + component: 'index', meta: { icon: 'el-icon-help', - title: '有效电站' + title: '电站列表' }, - name: 'expexcel/yxdz', - path: '/expexcel/yxdz' + name: 'systemOrder/index', + path: '/systemOrder/index' }, { alwaysShow: true, - component: 'fdlb', + component: 'index', meta: { icon: 'el-icon-help', - title: '发电列表' + title: '项目流程数据' }, - name: 'expexcel/fdlb', - path: '/expexcel/fdlb' + name: 'systemOrder/proj', + path: '/systemOrder/proj' + }, + { + alwaysShow: true, + component: 'index', + meta: { + icon: 'el-icon-help', + title: '监管工作日报' + }, + name: 'systemOrder/jggzrb', + path: '/systemOrder/jggzrb' + }, + { + alwaysShow: true, + component: 'index', + meta: { + icon: 'el-icon-help', + title: '库存日报' + }, + name: 'systemOrder/kcrb', + path: '/systemOrder/kcrb' } + // { + // alwaysShow: true, + // component: 'index', + // meta: { + // icon: 'el-icon-help', + // title: '出库记录' + // }, + // name: 'systemOrder/kcck', + // path: '/systemOrder/kcck' + // }, + // { + // alwaysShow: true, + // component: 'index', + // meta: { + // icon: 'el-icon-help', + // title: '入库记录' + // }, + // name: 'systemOrder/kcrk', + // path: '/systemOrder/kcrk' + // } ] }, { diff --git a/src/router/index.js b/src/router/index.js index 9241e7d..7425c5e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -264,6 +264,38 @@ export const constantRoutes = [{ meta: { title: '项目流程数据', } + }, + { + path: '/systemOrder/jggzrb', + component: () => import('@/views/systemOrder/jggzrb.vue'), + name: 'systemOrderJggzrb', + meta: { + title: '监管工作日报', + } + }, + { + path: '/systemOrder/kcrb', + component: () => import('@/views/systemOrder/kcrb.vue'), + name: 'systemOrderKcrb', + meta: { + title: '库存日报', + } + }, + { + path: '/systemOrder/kcck', + component: () => import('@/views/systemOrder/kcck.vue'), + name: 'systemOrderKcck', + meta: { + title: '出库记录', + } + }, + { + path: '/systemOrder/kcrk', + component: () => import('@/views/systemOrder/kcrk.vue'), + name: 'systemOrderKcrk', + meta: { + title: '入库记录', + } }] }, { diff --git a/src/utils/index.js b/src/utils/index.js index 4830c04..8a24a75 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -115,3 +115,59 @@ export function param2Obj(url) { }) return obj } + +export function getDateRang(val) { + const now = new Date(); // 当前日期 + const nowDayOfWeek = now.getDay(); // 今天本周的第几天 + const nowDay = now.getDate(); // 当前日 + const nowMonth = now.getMonth(); // 当前月 + const nowYear = now.getFullYear(); // 当前年 + const jd = Math.ceil((nowMonth + 1) / 3); + let startTime; + let endTime; + let customTime = []; + switch (val) { + case 'yesterday': // 昨日 + startTime = new Date(nowYear, nowMonth, nowDay - 1); + endTime = new Date(nowYear, nowMonth, nowDay - 1); + break; + case 'week': // 本周 + startTime = new Date(nowYear, nowMonth, nowDay - nowDayOfWeek); + endTime = new Date(nowYear, nowMonth, nowDay + 6 - nowDayOfWeek); + break; + case 'pastWeek': // 近 7 日 + startTime = new Date(nowYear, nowMonth, nowDay - 6); + endTime = new Date(nowYear, nowMonth, nowDay); + break; + case 'month': // 本月 + startTime = new Date(nowYear, nowMonth, 1); + endTime = new Date(nowYear, nowMonth + 1, 0); + break; + case 'pastMonth': // 近 31 日 + startTime = new Date(nowYear, nowMonth, nowDay - 30); + endTime = new Date(nowYear, nowMonth, nowDay); + break; + case 'quarter': // 本季度 + startTime = new Date(nowYear, (jd - 1) * 3, 1); + endTime = new Date(nowYear, jd * 3, 0); + break; + case 'year': // 今年 + startTime = new Date(nowYear, 0, 1); + endTime = new Date(nowYear, 11, 31); + break; + default: // 自定义时间 + customTime = val.split(' - '); + break; + } + // return customTime.length ? customTime : [formatDate(startTime), formatDate(endTime)]; + return formatDate(startTime) +} + +export function formatDate(date) { + const y = date.getFullYear(); + let m = date.getMonth() + 1; + m = m < 10 ? `0${m}` : m; + let d = date.getDate(); + d = d < 10 ? `0${d}` : d; + return `${y}-${m}-${d}`; +} diff --git a/src/views/systemOrder/index.vue b/src/views/systemOrder/index.vue index c83d578..035a04d 100644 --- a/src/views/systemOrder/index.vue +++ b/src/views/systemOrder/index.vue @@ -23,8 +23,8 @@ - - + + @@ -42,7 +42,7 @@
电站列表
-
电站数量:{{ queryParams.total }}
+
电站数量:{{ queryParams.total }} {{ powerall }}
@@ -134,19 +134,52 @@ search_time: [], witch_data: '', workflow: '', + witch_group: [], phase: '' } }, agentList: [], groupList: [], workflowList: [], - phaseList: [ - { value: '1', label: '进件' }, - { value: '2', label: '签约' }, - { value: '3', label: '交货' }, - { value: '4', label: '完工' }, - { value: '5', label: '并网' } - ] + witchgroupList: [{ + value: '江西余干库', + label: '江西余干库' + }, + { + value: '庄河荣名库', + label: '庄河荣名库' + }, + { + value: '安阳荣名库', + label: '安阳荣名库' + }, + { + value: '曲阜荣名库', + label: '曲阜荣名库' + } + ], + phaseList: [{ + value: '1', + label: '进件' + }, + { + value: '2', + label: '签约' + }, + { + value: '3', + label: '交货' + }, + { + value: '4', + label: '完工' + }, + { + value: '5', + label: '并网' + } + ], + powerall: '' } }, mounted() { @@ -171,7 +204,9 @@ agent_id: '', search_time: [], witch_data: '', - workflow: '' + workflow: '', + witch_group: [], + phase: '' } } this.loadLogList() @@ -203,8 +238,9 @@ this.tableloading = false if (res.code == 200) { console.log('======', res) - this.queryParams.total = res.data.total - this.logList = res.data.records + this.queryParams.total = res.data.pagging.total + this.logList = res.data.pagging.records + this.powerall = '总功率:' + res.data.power } }).catch(e => { this.tableloading = false diff --git a/src/views/systemOrder/jggzrb.vue b/src/views/systemOrder/jggzrb.vue new file mode 100644 index 0000000..3785ea5 --- /dev/null +++ b/src/views/systemOrder/jggzrb.vue @@ -0,0 +1,227 @@ + + + + + diff --git a/src/views/systemOrder/kcck.vue b/src/views/systemOrder/kcck.vue new file mode 100644 index 0000000..3785ea5 --- /dev/null +++ b/src/views/systemOrder/kcck.vue @@ -0,0 +1,227 @@ + + + + + diff --git a/src/views/systemOrder/kcrb.vue b/src/views/systemOrder/kcrb.vue new file mode 100644 index 0000000..2e8d7c2 --- /dev/null +++ b/src/views/systemOrder/kcrb.vue @@ -0,0 +1,164 @@ + + + + diff --git a/src/views/systemOrder/kcrk.vue b/src/views/systemOrder/kcrk.vue new file mode 100644 index 0000000..3785ea5 --- /dev/null +++ b/src/views/systemOrder/kcrk.vue @@ -0,0 +1,227 @@ + + + + +