Skip to content

D
datamanage
Commit 4841776e by admin
Options

前端文件的提交修改

parent b6255bfa
Showing with 12 additions and 11 deletions
src/main/java/com/zhiwei/manage/servlet/DataController.java
......@@ -194,10 +194,10 @@ public class DataController {
@RequestMapping(value = "/getDayDataByChannel", produces = "application/json;charset=utf-8")
@ResponseBody
public String getDayData(HttpServletRequest request, HttpServletResponse response,long start,long end,String pt) {
// long start = (long) map.get("start");
// long end = (long) map.get("end");
// String pt = String.valueOf(map.get("pt")) ;
public String getDayData(@RequestBody Map<String, Object> map) {
long start = (long) map.get("start");
long end = (long) map.get("end");
String pt = String.valueOf(map.get("pt")) ;
try {
System.out.println(start);
Calendar startTime = Calendar.getInstance();
......
src/main/webapp/datamanage/build/webpack.dev.conf.js
......@@ -46,6 +46,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
new HtmlWebpackPlugin({
filename: 'index.html',
template: 'index.html',
favicon: './static/img/favicon.ico', // 加上这个
inject: true
}),
]
......
src/main/webapp/datamanage/dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>数据管理系统</title><link rel=stylesheet href=./static/css/style.ini.css><link rel=stylesheet href=./static/datepicker/css/datepicker.css><link rel=stylesheet href=./static/datepicker/css/layout.css><link href=./static/css/app.1110b43b4d6602e1038e54a0673af68d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.4c9c1f242f4e8030b0c8.js></script><script type=text/javascript src=./static/js/vendor.c00def797876150978d2.js></script><script type=text/javascript src=./static/js/app.85c40bf5717ea33b9206.js></script></body><script src=./static/js/jquery-1.12.4.min.js></script><script src=./static/js/jquery.easing-master/jquery.easing.min.js></script><script src=./static/js/jquery.transit.js></script><script src=./static/datepicker/js/datepicker.js></script><script src=./static/datepicker/js/eye.js></script><script src=./static/datepicker/js/utils.js></script></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>数据管理系统</title><link rel=stylesheet href=./static/css/style.ini.css><link rel=stylesheet href=./static/datepicker/css/datepicker.css><link rel=stylesheet href=./static/datepicker/css/layout.css><link href=./static/css/app.badf9216d6a785337f67fca0587997e6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.cad76a81e97f000d4f35.js></script><script type=text/javascript src=./static/js/vendor.c00def797876150978d2.js></script><script type=text/javascript src=./static/js/app.865e82b88d339fb6a8b9.js></script></body><script src=./static/js/jquery-1.12.4.min.js></script><script src=./static/js/jquery.easing-master/jquery.easing.min.js></script><script src=./static/js/jquery.transit.js></script><script src=./static/datepicker/js/datepicker.js></script><script src=./static/datepicker/js/eye.js></script><script src=./static/datepicker/js/utils.js></script></html>
\ No newline at end of file
src/main/webapp/datamanage/dist/static/js/app.85c40bf5717ea33b9206.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/datamanage/dist/static/js/app.865e82b88d339fb6a8b9.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/datamanage/dist/static/js/manifest.4c9c1f242f4e8030b0c8.js → src/main/webapp/datamanage/dist/static/js/manifest.cad76a81e97f000d4f35.js
!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var i,u,f,s=0,l=[];s<t.length;s++)u=t[s],o[u]&&l.push(o[u][0]),o[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(t,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=n(n.s=a[s]);return f};var t={},o={2:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(u);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var c=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=c;var a=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+"static/js/"+e+"."+{0:"c00def797876150978d2",1:"85c40bf5717ea33b9206"}[e]+".js";var u=setTimeout(r,12e4);return i.onerror=i.onload=r,a.appendChild(i),c},n.m=e,n.c=t,n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.4c9c1f242f4e8030b0c8.js.map
\ No newline at end of file
!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var i,u,f,s=0,l=[];s<t.length;s++)u=t[s],o[u]&&l.push(o[u][0]),o[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(t,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=n(n.s=a[s]);return f};var t={},o={2:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(u);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var c=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=c;var a=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+"static/js/"+e+"."+{0:"c00def797876150978d2",1:"865e82b88d339fb6a8b9"}[e]+".js";var u=setTimeout(r,12e4);return i.onerror=i.onload=r,a.appendChild(i),c},n.m=e,n.c=t,n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.cad76a81e97f000d4f35.js.map
\ No newline at end of file
src/main/webapp/datamanage/src/components/ChannelData/ChannelData.vue
......@@ -168,12 +168,12 @@ export default {
this.option.legend.data = []
this.option.legend.selected = {}
this.option.series = []
let params = {
let data = {
pt: evt.seriesName,
start: evt.value[0] - (1000 * 60 * 60 * 24 * 3),
end: evt.value[0]
}
requestGetDayDataByChannel(params, {}, (res) => {
requestGetDayDataByChannel({}, data, (res) => {
if (res.data) {
if (res.data.state) {
this.showDetailData = true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment