diff --git a/src/api/dataStatistics/carbon.js b/src/api/dataStatistics/carbon.js new file mode 100644 index 0000000..91931dd --- /dev/null +++ b/src/api/dataStatistics/carbon.js @@ -0,0 +1,25 @@ +import request from "@/router/axios"; + +export const getCarborList = (query) => { + return request({ + url: "/api/blade-lims/carbonEmissionPlan/page", + method: "get", + params: query, + }); +}; + +export const saveCarbon = (data) => { + return request({ + url: "/api/blade-lims/carbonEmissionPlan/saveCarbon", + method: "post", + data, + }); +}; + +export const deleteCarbon = (id) => { + return request({ + url: "/api/blade-lims/carbonEmissionPlan/deleteById", + method: "get", + params: { id }, + }); +}; diff --git a/src/api/dataStatistics/carbonIntensity.js b/src/api/dataStatistics/carbonIntensity.js new file mode 100644 index 0000000..a8f09af --- /dev/null +++ b/src/api/dataStatistics/carbonIntensity.js @@ -0,0 +1,25 @@ +import request from "@/router/axios"; + +export const getIntensity = (query) => { + return request({ + url: "/api/blade-lims/carbonIntensity/page", + method: "get", + params: query, + }); +}; + +export const saveIntensity = (data) => { + return request({ + url: "/api/blade-lims/carbonIntensity/saveCarbon", + method: "post", + data, + }); +}; + +export const deleteIntensity = (id) => { + return request({ + url: "/api/blade-lims/carbonIntensity/deleteById", + method: "get", + params: { id }, + }); +}; diff --git a/src/api/dataStatistics/carbonTrend.js b/src/api/dataStatistics/carbonTrend.js new file mode 100644 index 0000000..386155b --- /dev/null +++ b/src/api/dataStatistics/carbonTrend.js @@ -0,0 +1,25 @@ +import request from "@/router/axios"; + +export const getTrendList = (query) => { + return request({ + url: "/api/blade-lims/carbonEmission/page", + method: "get", + params: query, + }); +}; + +export const saveTrend = (data) => { + return request({ + url: "/api/blade-lims/carbonEmission/saveCarbon", + method: "post", + data, + }); +}; + +export const deleteTrend = (id) => { + return request({ + url: "/api/blade-lims/carbonEmission/deleteById", + method: "get", + params: { id }, + }); +}; diff --git a/src/const/capital/productclass.js b/src/const/capital/productclass.js index a59ac04..2449fe5 100644 --- a/src/const/capital/productclass.js +++ b/src/const/capital/productclass.js @@ -147,14 +147,14 @@ export const tableOption = { // value: 1, slot: true, }, - { - label: "危险品", - prop: "danger", - type: "switch", - overHidden: true, - span: 8, - dicData: statisticsTypeDic, - }, + // { + // label: "危险品", + // prop: "danger", + // type: "switch", + // overHidden: true, + // span: 8, + // dicData: statisticsTypeDic, + // }, { label: "排序", prop: "sort", diff --git a/src/router/axios.js b/src/router/axios.js index c7e3158..0c96024 100644 --- a/src/router/axios.js +++ b/src/router/axios.js @@ -5,16 +5,16 @@ * isSerialize是否开启form表单提交 * isToken是否需要token */ -import axios from 'axios'; -import store from '@/store/'; -import router from '@/router/router'; -import {serialize} from '@/util/util'; -import {getToken} from '@/util/auth'; -import {Message} from 'element-ui'; -import website from '@/config/website'; -import {Base64} from 'js-base64'; -import NProgress from 'nprogress'; -import 'nprogress/nprogress.css'; +import axios from "axios"; +import store from "@/store/"; +import router from "@/router/router"; +import { serialize } from "@/util/util"; +import { getToken } from "@/util/auth"; +import { Message } from "element-ui"; +import website from "@/config/website"; +import { Base64 } from "js-base64"; +import NProgress from "nprogress"; +import "nprogress/nprogress.css"; //默认超时时间 axios.defaults.timeout = 60000; @@ -26,100 +26,110 @@ axios.defaults.validateStatus = function (status) { axios.defaults.withCredentials = true; // NProgress 配置 NProgress.configure({ - showSpinner: false + showSpinner: false, }); //http request拦截 -axios.interceptors.request.use(config => { - //开启 progress bar - NProgress.start(); - const meta = (config.meta || {}); - const isToken = meta.isToken === false; - config.headers['Authorization'] = `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`; - //让每个请求携带token - if (getToken() && !isToken) { - config.headers[website.tokenHeader] = 'bearer ' + getToken() - } - //headers中配置text请求 - if (config.text === true) { - config.headers["Content-Type"] = "text/plain"; - } - //headers中配置serialize为true开启序列化 - if (config.method === 'post' && meta.isSerialize === true) { - config.data = serialize(config.data); +axios.interceptors.request.use( + (config) => { + //开启 progress bar + NProgress.start(); + const meta = config.meta || {}; + const isToken = meta.isToken === false; + config.headers["Authorization"] = `Basic ${Base64.encode( + `${website.clientId}:${website.clientSecret}` + )}`; + //让每个请求携带token + if (getToken() && !isToken) { + config.headers[website.tokenHeader] = "bearer " + getToken(); + } + //headers中配置text请求 + if (config.text === true) { + config.headers["Content-Type"] = "text/plain"; + } + //headers中配置serialize为true开启序列化 + if (config.method === "post" && meta.isSerialize === true) { + config.data = serialize(config.data); + } + return config; + }, + (error) => { + return Promise.reject(error); } - return config -}, error => { - return Promise.reject(error) -}); +); //http response 拦截 -axios.interceptors.response.use(res => { - // console.log(res); - //关闭 progress bar - NProgress.done(); - //获取状态码 - const status = res.data.code || res.status; - const statusWhiteList = website.statusWhiteList || []; - const message = res.data.msg || res.data.error_description || '未知错误'; - //如果在白名单里则自行catch逻辑处理 - if (statusWhiteList.includes(status)) return Promise.reject(res); - //如果是401则跳转到登录页面 - if (status === 401) store.dispatch('FedLogOut').then(() => router.push({path: '/login'})); - // 如果请求为非200否者默认统一处理 - if (status !== 200) { - if(status === 413) { - Message({ - message: '上传的文件过大！', - type: 'error', - duration: 1500 - }); - }else { - Message({ - message: message, - type: 'error' - }); +axios.interceptors.response.use( + (res) => { + // console.log(res); + //关闭 progress bar + NProgress.done(); + //获取状态码 + const status = res.data.code || res.status; + const statusWhiteList = website.statusWhiteList || []; + const message = res.data.msg || res.data.error_description || "未知错误"; + console.log("status ===>", status); + //如果在白名单里则自行catch逻辑处理 + if (statusWhiteList.includes(status)) return Promise.reject(res); + //如果是401则跳转到登录页面 + if (status === 401) + store.dispatch("FedLogOut").then(() => router.push({ path: "/login" })); + // 如果请求为非200否者默认统一处理 + if (status != 200) { + if (status === 413) { + Message({ + message: "上传的文件过大！", + type: "error", + duration: 1500, + }); + } else { + Message({ + message: message, + type: "error", + }); + } + return Promise.reject(new Error(message)); } - return Promise.reject(new Error(message)) - } - return res; -}, error => { - NProgress.done(); - switch (error.res.status) { - case 400: - Message({ - message: error.res.data, - type:'error', - duration: 1500, - customClass:'element-error-message-zindex' - }) - break - case 401: - router.push({name:'login'}) - break - case 405: - Message({ - message: 'http请求方式有误', - type:'error', - duration: 1500, - customClass:'element-error-message-zindex' - }) - break + return res; + }, + (error) => { + NProgress.done(); + switch (error.res.status) { + case 400: + Message({ + message: error.res.data, + type: "error", + duration: 1500, + customClass: "element-error-message-zindex", + }); + break; + case 401: + router.push({ name: "login" }); + break; + case 405: + Message({ + message: "http请求方式有误", + type: "error", + duration: 1500, + customClass: "element-error-message-zindex", + }); + break; case 500: Message({ - message: '服务器错误，请稍后再试', - type:'error', - customClass:'element-error-message-zindex' - }) - break + message: "服务器错误，请稍后再试", + type: "error", + customClass: "element-error-message-zindex", + }); + break; case 501: Message({ - message: '服务器不支持当前请求所需要的某个功能', - type:'error', + message: "服务器不支持当前请求所需要的某个功能", + type: "error", duration: 1500, - customClass:'element-error-message-zindex' - }) - break + customClass: "element-error-message-zindex", + }); + break; + } + return Promise.reject(new Error(error)); } - return Promise.reject(new Error(error)); -}); +); export default axios; diff --git a/src/views/capital/shenlingList.vue b/src/views/capital/shenlingList.vue index e0e51d7..9f69112 100644 --- a/src/views/capital/shenlingList.vue +++ b/src/views/capital/shenlingList.vue @@ -503,7 +503,7 @@ export default { // 获取委托单所有状态及其对应的数量 this.getUserInfo() // 加载左侧树数据 - this.loadLeftTreeData(2) + // this.loadLeftTreeData(2) let currentStatus = this.$route.query.entrustStatus // if( this.$store.state.client.shenlingPage){ // this.page[0].current = this.$store.state.client.shenlingPage.page diff --git a/src/views/dataStatistics/carbon.vue b/src/views/dataStatistics/carbon.vue new file mode 100644 index 0000000..e540850 --- /dev/null +++ b/src/views/dataStatistics/carbon.vue @@ -0,0 +1,454 @@ + + + + + diff --git a/src/views/dataStatistics/carbonIntensity.vue b/src/views/dataStatistics/carbonIntensity.vue new file mode 100644 index 0000000..74b2e14 --- /dev/null +++ b/src/views/dataStatistics/carbonIntensity.vue @@ -0,0 +1,385 @@ + + + + + diff --git a/src/views/dataStatistics/carbonTrend.vue b/src/views/dataStatistics/carbonTrend.vue new file mode 100644 index 0000000..26fabd4 --- /dev/null +++ b/src/views/dataStatistics/carbonTrend.vue @@ -0,0 +1,401 @@ + + + + + diff --git a/src/views/energySources/component/header.vue b/src/views/energySources/component/header.vue index ef38ca0..d6eb0cd 100644 --- a/src/views/energySources/component/header.vue +++ b/src/views/energySources/component/header.vue @@ -12,7 +12,7 @@ {{ $moment().format('dddd') }}
- 11℃ 多云转晴 + {{temp}}℃ {{text}}
@@ -23,23 +23,29 @@