Merge branch 'master-huijiaxu' into 'master'

容量分析折线图样式调整



See merge request !24

@@ -28,7 +28,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'admin',
             name = data.name;
         }
 
-        admin.req({
+        /*admin.req({
             url: domainName + '/api-web/chart/contrast',
             data: {
                 // resId: '8b4d5cebe8dd47518149829dd31d9239',
@@ -38,7 +38,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'admin',
                 flag: flag
             },
             async: false,
-            success(response) {
+            success(response) {*/
+
+        var response = {
+            "code": 0, "msg": "", "count": 0, "data": null, "map": {
+                "predictionDataList": [[1631860200000, 0.58], [1631862000000, 0.58], [1631863800000, 0.58], [1631865600000, 0.57], [1631867400000, 0.57], [1631869200000, 0.56], [1631871000000, 0.56], [1631872800000, 0.56], [1631874600000, 0.56], [1631876400000, 0.56], [1631878200000, 0.56], [1631880000000, 0.55], [1631881800000, 0.55], [1631883600000, 0.54], [1631885400000, 0.52], [1631887200000, 0.51], [1631889000000, 0.5], [1631890800000, 0.5], [1631892600000, 0.49], [1631894400000, 0.5], [1631896200000, 0.5], [1631898000000, 0.51], [1631899800000, 0.52], [1631901600000, 0.53], [1631903400000, 0.53], [1631905200000, 0.54], [1631907000000, 0.53], [1631908800000, 0.53], [1631910600000, 0.53], [1631912400000, 0.53], [1631914200000, 0.53], [1631916000000, 0.53], [1631917800000, 0.54], [1631919600000, 0.55], [1631921400000, 0.56], [1631923200000, 0.56], [1631925000000, 0.57], [1631926800000, 0.57], [1631928600000, 0.57], [1631930400000, 0.56], [1631932200000, 0.56], [1631934000000, 0.56], [1631935800000, 0.56], [1631937600000, 0.56], [1631939400000, 0.57], [1631941200000, 0.58], [1631943000000, 0.59], [1631944800000, 0.6], [1631946600000, 0.61], [1631948400000, 0.62], [1631950200000, 0.63], [1631952000000, 0.63], [1631953800000, 0.64], [1631955600000, 0.65], [1631957400000, 0.65], [1631959200000, 0.66], [1631961000000, 0.67], [1631962800000, 0.67], [1631964600000, 0.68], [1631966400000, 0.68], [1631968200000, 0.68], [1631970000000, 0.67], [1631971800000, 0.66], [1631973600000, 0.66], [1631975400000, 0.65], [1631977200000, 0.65], [1631979000000, 0.65], [1631980800000, 0.65], [1631982600000, 0.66], [1631984400000, 0.67], [1631986200000, 0.68], [1631988000000, 0.68], [1631989800000, 0.69], [1631991600000, 0.69], [1631993400000, 0.69], [1631995200000, 0.68], [1631997000000, 0.67], [1631998800000, 0.67], [1632000600000, 0.67], [1632002400000, 0.67], [1632004200000, 0.67], [1632006000000, 0.67], [1632007800000, 0.67], [1632009600000, 0.67], [1632011400000, 0.67], [1632013200000, 0.67], [1632015000000, 0.66], [1632016800000, 0.64], [1632018600000, 0.63], [1632020400000, 0.62], [1632022200000, 0.61], [1632024000000, 0.61], [1632025800000, 0.61], [1632027600000, 0.61], [1632029400000, 0.61], [1632031200000, 0.62], [1632033000000, 0.62], [1632034800000, 0.62], [1632036600000, 0.62], [1632038400000, 0.61], [1632040200000, 0.61], [1632042000000, 0.6], [1632043800000, 0.6], [1632045600000, 0.6], [1632047400000, 0.6], [1632049200000, 0.6], [1632051000000, 0.59], [1632052800000, 0.59], [1632054600000, 0.58], [1632056400000, 0.56], [1632058200000, 0.55], [1632060000000, 0.53], [1632061800000, 0.52], [1632063600000, 0.51], [1632065400000, 0.51], [1632067200000, 0.51], [1632069000000, 0.51], [1632070800000, 0.51], [1632072600000, 0.52], [1632074400000, 0.52], [1632076200000, 0.52], [1632078000000, 0.52], [1632079800000, 0.51], [1632081600000, 0.51], [1632083400000, 0.5], [1632085200000, 0.49], [1632087000000, 0.49], [1632088800000, 0.49], [1632090600000, 0.49], [1632092400000, 0.49], [1632094200000, 0.5], [1632096000000, 0.5], [1632097800000, 0.5], [1632099600000, 0.49], [1632101400000, 0.49], [1632103200000, 0.48], [1632105000000, 0.47], [1632106800000, 0.46], [1632108600000, 0.46], [1632110400000, 0.46], [1632112200000, 0.46], [1632114000000, 0.47], [1632115800000, 0.48], [1632117600000, 0.48], [1632119400000, 0.49], [1632121200000, 0.5], [1632123000000, 0.5], [1632124800000, 0.5], [1632126600000, 0.5], [1632128400000, 0.5], [1632130200000, 0.51], [1632132000000, 0.51], [1632133800000, 0.52], [1632135600000, 0.52], [1632137400000, 0.52], [1632139200000, 0.52], [1632141000000, 0.52], [1632142800000, 0.51], [1632144600000, 0.5], [1632146400000, 0.5], [1632148200000, 0.49], [1632150000000, 0.48], [1632151800000, 0.48], [1632153600000, 0.49], [1632155400000, 0.5], [1632157200000, 0.51], [1632159000000, 0.51], [1632160800000, 0.52], [1632162600000, 0.53], [1632164400000, 0.53], [1632166200000, 0.52], [1632168000000, 0.52], [1632169800000, 0.51], [1632171600000, 0.51], [1632173400000, 0.51], [1632175200000, 0.51], [1632177000000, 0.51], [1632178800000, 0.52], [1632180600000, 0.52], [1632182400000, 0.52], [1632184200000, 0.52], [1632186000000, 0.52], [1632187800000, 0.51], [1632189600000, 0.5], [1632191400000, 0.49], [1632193200000, 0.48], [1632195000000, 0.48], [1632196800000, 0.47], [1632198600000, 0.48], [1632200400000, 0.48], [1632202200000, 0.48], [1632204000000, 0.49], [1632205800000, 0.49], [1632207600000, 0.49], [1632209400000, 0.49], [1632211200000, 0.49], [1632213000000, 0.49], [1632214800000, 0.49], [1632216600000, 0.49], [1632218400000, 0.49], [1632220200000, 0.49], [1632222000000, 0.49], [1632223800000, 0.48], [1632225600000, 0.48], [1632227400000, 0.47], [1632229200000, 0.46], [1632231000000, 0.45], [1632232800000, 0.43], [1632234600000, 0.42], [1632236400000, 0.41], [1632238200000, 0.41], [1632240000000, 0.41], [1632241800000, 0.41], [1632243600000, 0.42], [1632245400000, 0.43], [1632247200000, 0.43], [1632249000000, 0.43], [1632250800000, 0.43], [1632252600000, 0.43], [1632254400000, 0.42], [1632256200000, 0.41], [1632258000000, 0.41], [1632259800000, 0.4], [1632261600000, 0.4], [1632263400000, 0.41], [1632265200000, 0.41], [1632267000000, 0.42], [1632268800000, 0.42], [1632270600000, 0.42], [1632272400000, 0.42], [1632274200000, 0.41], [1632276000000, 0.41], [1632277800000, 0.4], [1632279600000, 0.39], [1632281400000, 0.39], [1632283200000, 0.39], [1632285000000, 0.4], [1632286800000, 0.41], [1632288600000, 0.42], [1632290400000, 0.43], [1632292200000, 0.44], [1632294000000, 0.44], [1632295800000, 0.45], [1632297600000, 0.45], [1632299400000, 0.46], [1632301200000, 0.46], [1632303000000, 0.47], [1632304800000, 0.48], [1632306600000, 0.49], [1632308400000, 0.49], [1632310200000, 0.5], [1632312000000, 0.5], [1632313800000, 0.5], [1632315600000, 0.5], [1632317400000, 0.49], [1632319200000, 0.49], [1632321000000, 0.49], [1632322800000, 0.48], [1632324600000, 0.49], [1632326400000, 0.5], [1632328200000, 0.51], [1632330000000, 0.52], [1632331800000, 0.54], [1632333600000, 0.55], [1632335400000, 0.56], [1632337200000, 0.56], [1632339000000, 0.56], [1632340800000, 0.56], [1632342600000, 0.56], [1632344400000, 0.56], [1632346200000, 0.56], [1632348000000, 0.57], [1632349800000, 0.58], [1632351600000, 0.58], [1632353400000, 0.59], [1632355200000, 0.6], [1632357000000, 0.6], [1632358800000, 0.6], [1632360600000, 0.6], [1632362400000, 0.59], [1632364200000, 0.58], [1632366000000, 0.58], [1632367800000, 0.58], [1632369600000, 0.58], [1632371400000, 0.58], [1632373200000, 0.59], [1632375000000, 0.59], [1632376800000, 0.6], [1632378600000, 0.6], [1632380400000, 0.61], [1632382200000, 0.61], [1632384000000, 0.61], [1632385800000, 0.6], [1632387600000, 0.6], [1632389400000, 0.6], [1632391200000, 0.6], [1632393000000, 0.6], [1632394800000, 0.6], [1632396600000, 0.6], [1632398400000, 0.59], [1632400200000, 0.58], [1632402000000, 0.57], [1632403800000, 0.55], [1632405600000, 0.53], [1632407400000, 0.52], [1632409200000, 0.51], [1632411000000, 0.5], [1632412800000, 0.5], [1632414600000, 0.5], [1632416400000, 0.5], [1632418200000, 0.5], [1632420000000, 0.5], [1632421800000, 0.49], [1632423600000, 0.49], [1632425400000, 0.48], [1632427200000, 0.46], [1632429000000, 0.45], [1632430800000, 0.44], [1632432600000, 0.43], [1632434400000, 0.42], [1632436200000, 0.42], [1632438000000, 0.41], [1632439800000, 0.41], [1632441600000, 0.4], [1632443400000, 0.4], [1632445200000, 0.38], [1632447000000, 0.37], [1632448800000, 0.35], [1632450600000, 0.34], [1632452400000, 0.32], [1632454200000, 0.31], [1632456000000, 0.31], [1632457800000, 0.3], [1632459600000, 0.3], [1632461400000, 0.3], [1632463200000, 0.3], [1632465000000, 0.3], [1632466800000, 0.3], [1632468600000, 0.3], [1632470400000, 0.29], [1632472200000, 0.29], [1632474000000, 0.28], [1632475800000, 0.28], [1632477600000, 0.28], [1632479400000, 0.28], [1632481200000, 0.28], [1632483000000, 0.28], [1632484800000, 0.27], [1632486600000, 0.26], [1632488400000, 0.25], [1632490200000, 0.24], [1632492000000, 0.23], [1632493800000, 0.22], [1632495600000, 0.21], [1632497400000, 0.21], [1632499200000, 0.22], [1632501000000, 0.22], [1632502800000, 0.23], [1632504600000, 0.24], [1632506400000, 0.25], [1632508200000, 0.25], [1632510000000, 0.25], [1632511800000, 0.25], [1632513600000, 0.25], [1632515400000, 0.25], [1632517200000, 0.25], [1632519000000, 0.25], [1632520800000, 0.25], [1632522600000, 0.26], [1632524400000, 0.27], [1632526200000, 0.28], [1632528000000, 0.28], [1632529800000, 0.29], [1632531600000, 0.29], [1632533400000, 0.29], [1632535200000, 0.28], [1632537000000, 0.28], [1632538800000, 0.28], [1632540600000, 0.28], [1632542400000, 0.28], [1632544200000, 0.29], [1632546000000, 0.3], [1632547800000, 0.31], [1632549600000, 0.32], [1632551400000, 0.33], [1632553200000, 0.34], [1632555000000, 0.35], [1632556800000, 0.35], [1632558600000, 0.36], [1632560400000, 0.36], [1632562200000, 0.37], [1632564000000, 0.38], [1632565800000, 0.38], [1632567600000, 0.39], [1632569400000, 0.4], [1632571200000, 0.4], [1632573000000, 0.4], [1632574800000, 0.39], [1632576600000, 0.38], [1632578400000, 0.38], [1632580200000, 0.37], [1632582000000, 0.37], [1632583800000, 0.37], [1632585600000, 0.37], [1632587400000, 0.38], [1632589200000, 0.39], [1632591000000, 0.4], [1632592800000, 0.4], [1632594600000, 0.41], [1632596400000, 0.41], [1632598200000, 0.4], [1632600000000, 0.4], [1632601800000, 0.39], [1632603600000, 0.39], [1632605400000, 0.39], [1632607200000, 0.38], [1632609000000, 0.39], [1632610800000, 0.39], [1632612600000, 0.39], [1632614400000, 0.39], [1632616200000, 0.39], [1632618000000, 0.38], [1632619800000, 0.38], [1632621600000, 0.36], [1632623400000, 0.35], [1632625200000, 0.34], [1632627000000, 0.33], [1632628800000, 0.33], [1632630600000, 0.33], [1632632400000, 0.33], [1632634200000, 0.33], [1632636000000, 0.34], [1632637800000, 0.34], [1632639600000, 0.34], [1632641400000, 0.33], [1632643200000, 0.33], [1632645000000, 0.33], [1632646800000, 0.32], [1632648600000, 0.32], [1632650400000, 0.32], [1632652200000, 0.32], [1632654000000, 0.31], [1632655800000, 0.31], [1632657600000, 0.3], [1632659400000, 0.29], [1632661200000, 0.28], [1632663000000, 0.27], [1632664800000, 0.25], [1632666600000, 0.24], [1632668400000, 0.23], [1632670200000, 0.23], [1632672000000, 0.22], [1632673800000, 0.23], [1632675600000, 0.23], [1632677400000, 0.24], [1632679200000, 0.24], [1632681000000, 0.24], [1632682800000, 0.24], [1632684600000, 0.23], [1632686400000, 0.22], [1632688200000, 0.22], [1632690000000, 0.21], [1632691800000, 0.21], [1632693600000, 0.21], [1632695400000, 0.21], [1632697200000, 0.21], [1632699000000, 0.22], [1632700800000, 0.22], [1632702600000, 0.22], [1632704400000, 0.21], [1632706200000, 0.21], [1632708000000, 0.2], [1632709800000, 0.19], [1632711600000, 0.18], [1632713400000, 0.18], [1632715200000, 0.18], [
+                    1632717000000, 0.18], [1632718800000, 0.19], [1632720600000, 0.19], [1632722400000, 0.2], [1632724200000, 0.21], [1632726000000, 0.21], [1632727800000, 0.22], [1632729600000, 0.22], [1632731400000, 0.22], [1632733200000, 0.22], [1632735000000, 0.23], [1632736800000, 0.23], [1632738600000, 0.24], [1632740400000, 0.24], [1632742200000, 0.24], [1632744000000, 0.24], [1632745800000, 0.24], [1632747600000, 0.23], [1632749400000, 0.22], [1632751200000, 0.22], [1632753000000, 0.21], [1632754800000, 0.2], [1632756600000, 0.2], [1632758400000, 0.21], [1632760200000, 0.22], [1632762000000, 0.22], [1632763800000, 0.23], [1632765600000, 0.24], [1632767400000, 0.25], [1632769200000, 0.25], [1632771000000, 0.24], [1632772800000, 0.24], [1632774600000, 0.23], [1632776400000, 0.23], [1632778200000, 0.23], [1632780000000, 0.23], [1632781800000, 0.23], [1632783600000, 0.24], [1632785400000, 0.24], [1632787200000, 0.24], [1632789000000, 0.24], [1632790800000, 0.24], [1632792600000, 0.23], [1632794400000, 0.22], [1632796200000, 0.21], [1632798000000, 0.2], [1632799800000, 0.2], [1632801600000, 0.19], [1632803400000, 0.19], [1632805200000, 0.2], [1632807000000, 0.2], [1632808800000, 0.21], [1632810600000, 0.21], [1632812400000, 0.21], [1632814200000, 0.21], [1632816000000, 0.21], [1632817800000, 0.21], [1632819600000, 0.21], [1632821400000, 0.2], [1632823200000, 0.2], [1632825000000, 0.2], [1632826800000, 0.2], [1632828600000, 0.2], [1632830400000, 0.2], [1632832200000, 0.19], [1632834000000, 0.18], [1632835800000, 0.17], [1632837600000, 0.15], [1632839400000, 0.14], [1632841200000, 0.13], [1632843000000, 0.13], [1632844800000, 0.13], [1632846600000, 0.13], [1632848400000, 0.14], [1632850200000, 0.14], [1632852000000, 0.15], [1632853800000, 0.15], [1632855600000, 0.15], [1632857400000, 0.14], [1632859200000, 0.14], [1632861000000, 0.13], [1632862800000, 0.13], [1632864600000, 0.12], [1632866400000, 0.12], [1632868200000, 0.13], [1632870000000, 0.13], [1632871800000, 0.14], [1632873600000, 0.14], [1632875400000, 0.14], [1632877200000, 0.14], [1632879000000, 0.13], [1632880800000, 0.13], [1632882600000, 0.12], [1632884400000, 0.11], [1632886200000, 0.11], [1632888000000, 0.11], [1632889800000, 0.12], [1632891600000, 0.13], [1632893400000, 0.14], [1632895200000, 0.15], [1632897000000, 0.16], [1632898800000, 0.16], [1632900600000, 0.17], [1632902400000, 0.17], [1632904200000, 0.18], [1632906000000, 0.18], [1632907800000, 0.19], [1632909600000, 0.2], [1632911400000, 0.2], [1632913200000, 0.21], [1632915000000, 0.22], [1632916800000, 0.22], [1632918600000, 0.22], [1632920400000, 0.22], [1632922200000, 0.21], [1632924000000, 0.21], [1632925800000, 0.2], [1632927600000, 0.2], [1632929400000, 0.21], [1632931200000, 0.22], [1632933000000, 0.23], [1632934800000, 0.24], [1632936600000, 0.25], [1632938400000, 0.27], [1632940200000, 0.28], [1632942000000, 0.28], [1632943800000, 0.28], [1632945600000, 0.28], [1632947400000, 0.28], [1632949200000, 0.28], [1632951000000, 0.28], [1632952800000, 0.29], [1632954600000, 0.3], [1632956400000, 0.3], [1632958200000, 0.31], [1632960000000, 0.32], [1632961800000, 0.32], [1632963600000, 0.32], [1632965400000, 0.32], [1632967200000, 0.31], [1632969000000, 0.3], [1632970800000, 0.3], [1632972600000, 0.29], [1632974400000, 0.29], [1632976200000, 0.3], [1632978000000, 0.3], [1632979800000, 0.31], [1632981600000, 0.32], [1632983400000, 0.32], [1632985200000, 0.33], [1632987000000, 0.33], [1632988800000, 0.32], [1632990600000, 0.32], [1632992400000, 0.32], [1632994200000, 0.32], [1632996000000, 0.32], [1632997800000, 0.32], [1632999600000, 0.32], [1633001400000, 0.32], [1633003200000, 0.31], [1633005000000, 0.3], [1633006800000, 0.29], [1633008600000, 0.27], [1633010400000, 0.25], [1633012200000, 0.24], [1633014000000, 0.23], [1633015800000, 0.22], [1633017600000, 0.22], [1633019400000, 0.22], [1633021200000, 0.22], [1633023000000, 0.22], [1633024800000, 0.22], [1633026600000, 0.21], [1633028400000, 0.21], [1633030200000, 0.19], [1633032000000, 0.18], [1633033800000, 0.17], [1633035600000, 0.16], [1633037400000, 0.15], [1633039200000, 0.14], [1633041000000, 0.14], [1633042800000, 0.13], [1633044600000, 0.13], [1633046400000, 0.12], [1633048200000, 0.12], [1633050000000, 0.1], [1633051800000, 0.09], [1633053600000, 0.07], [1633055400000, 0.06], [1633057200000, 0.04], [1633059000000, 0.03], [1633060800000, 0.02], [1633062600000, 0.02], [1633064400000, 0.02], [1633066200000, 0.02], [1633068000000, 0.02]],
+                "currDataList": [[1631888523000, 2.0], [1631888702000, 1.0], [1631888702000, 1.0], [1631888702000, 1.0], [1631888702000, 1.0], [1631888702000, 1.0], [1631888702000, 1.0], [1631888702000, 1.0], [1631888702000, 1.0], [1631888702000, 1.0], [1631888702000, 1.0], [1631888702000, 1.0], [1631888702000, 1.0], [1631888702000, 1.0], [1631888702000, 1.0], [1631888702000, 1.0], [1631888702000, 1.0], [1631889062000, 1.0], [1631890859000, 1.0], [1631892662000, 1.0], [1631894460000, 1.0], [1631896260000, 1.0], [1631898061000, 1.0], [1631899862000, 1.0], [1631901662000, 1.0], [1631903459000, 1.0], [1631905260000, 1.0], [1631907058000, 1.0], [1631908860000, 1.0], [1631910663000, 1.0], [1631912460000, 1.0], [1631914260000, 1.0], [1631916059000, 1.0], [1631917862000, 1.0], [1631919663000, 1.0], [1631921463000, 1.0], [1631923257000, 1.0], [1631925060000, 1.0], [1631926862000, 1.0], [1631928659000, 1.0], [1631930463000, 1.0], [1631932260000, 1.0], [1631934060000, 1.0], [1631935862000, 1.0], [1631937662000, 1.0], [1631939462000, 1.0], [1631941259000, 1.0], [1631943062000, 1.0], [1631944861000, 1.0], [1631946662000, 1.0], [1631948461000, 1.0], [1631950263000, 2.0], [1631952063000, 3.0], [1631953858000, 1.0], [1631955660000, 1.0], [1631957462000, 2.0], [1631959257000, 1.0], [1631961060000, 1.0], [1631962862000, 2.0], [1631964660000, 1.0], [1631966462000, 1.0], [1631968261000, 1.0], [1631970062000, 3.0], [1631971862000, 2.0], [1631973661000, 1.0], [1631975460000, 1.0], [1631977262000, 2.0], [1631979061000, 1.0], [1631980864000, 1.0], [1631982659000, 1.0], [1631984462000, 3.0], [1631986259000, 1.0], [1631988059000, 1.0], [1631989862000, 2.0], [1631991661000, 3.0], [1631993459000, 1.0], [1631995259000, 1.0], [1631997063000, 1.0], [1631998861000, 1.0], [1632000661000, 1.0], [1632002461000, 1.0], [1632004264000, 2.0], [1632006061000, 1.0], [1632007859000, 1.0], [1632009658000, 1.0], [1632011459000, 1.0], [1632013260000, 1.0], [1632015057000, 1.0], [1632016857000, 2.0], [1632018658000, 1.0], [1632020461000, 1.0], [1632022261000, 1.0], [1632024062000, 1.0], [1632025858000, 1.0], [1632027661000, 1.0], [1632029460000, 1.0], [1632031259000, 1.0], [1632033063000, 2.0], [1632034860000, 1.0], [1632036663000, 2.0], [1632038458000, 1.0], [1632040262000, 2.0], [1632042063000, 1.0], [1632043861000, 2.0], [1632045662000, 3.0], [1632047461000, 1.0], [1632049260000, 1.0], [1632051060000, 2.0], [1632052859000, 1.0], [1632054660000, 2.0], [1632056460000, 2.0], [1632058260000, 2.0], [1632060058000, 1.0], [1632061862000, 1.0], [1632063662000, 1.0], [1632065457000, 1.0], [1632067259000, 1.0], [1632069061000, 2.0], [1632070861000, 2.0], [1632072660000, 2.0], [1632074463000, 1.0], [1632076263000, 1.0], [1632078061000, 1.0], [1632079863000, 2.0], [1632081661000, 1.0], [1632083458000, 2.0], [1632085261000, 1.0], [1632087058000, 2.0], [1632088863000, 2.0], [1632090663000, 2.0], [1632092462000, 2.0], [1632094264000, 1.0], [1632096057000, 2.0], [1632097863000, 1.0], [1632099661000, 2.0], [1632101464000, 1.0], [1632103260000, 1.0], [1632105059000, 1.0], [1632106858000, 2.0], [1632108659000, 1.0], [1632110462000, 3.0], [1632112261000, 2.0], [1632114061000, 3.0], [1632115859000, 1.0], [1632117657000, 2.0], [1632119462000, 1.0], [1632121262000, 1.0], [1632123062000, 1.0], [1632124859000, 1.0], [1632126661000, 2.0], [1632128463000, 1.0], [1632130260000, 2.0], [1632132060000, 2.0], [1632133861000, 2.0], [1632135663000, 1.0], [1632137461000, 1.0], [1632139263000, 1.0], [1632141062000, 1.0], [1632142858000, 1.0], [1632144661000, 1.0], [1632146463000, 1.0], [1632148261000, 1.0], [1632150061000, 1.0], [1632151860000, 2.0], [1632153661000, 1.0], [1632155462000, 1.0], [1632157260000, 1.0], [1632159062000, 1.0], [1632160863000, 1.0], [1632162662000, 1.0], [1632164461000, 1.0], [1632166257000, 2.0], [1632168063000, 2.0], [1632169860000, 1.0], [1632171662000, 2.0], [1632173462000, 2.0], [1632175263000, 1.0], [1632177061000, 2.0], [1632178862000, 1.0], [1632180663000, 1.0], [1632182461000, 2.0], [1632184261000, 2.0], [1632186062000, 2.0], [1632187861000, 1.0], [1632189663000, 1.0], [1632191463000, 1.0], [1632193261000, 2.0], [1632195061000, 1.0], [1632196861000, 1.0], [1632198662000, 1.0], [1632200463000, 1.0], [1632202260000, 1.0], [1632204057000, 2.0], [1632205859000, 2.0], [1632207660000, 2.0], [1632209460000, 2.0], [1632211260000, 2.0], [1632213063000, 1.0], [1632214860000, 1.0], [1632216661000, 1.0], [1632218461000, 1.0], [1632220261000, 1.0], [1632222061000, 1.0], [1632223861000, 1.0], [1632225662000, 1.0], [1632227463000, 1.0], [1632229262000, 1.0], [1632231061000, 1.0], [1632232860000, 1.0], [1632234659000, 1.0], [1632236463000, 1.0], [1632238261000, 1.0], [1632240062000, 1.0], [1632241859000, 1.0], [1632243660000, 1.0], [1632245458000, 2.0], [1632247258000, 1.0], [1632249062000, 1.0], [1632250862000, 1.0], [1632252659000, 2.0], [1632254461000, 3.0], [1632256263000, 1.0], [1632258061000, 2.0], [1632259858000, 2.0], [1632261661000, 1.0], [1632263461000, 1.0], [1632265259000, 4.0], [1632267063000, 1.0], [1632268862000, 1.0], [1632270661000, 1.0], [1632272460000, 1.0], [1632274262000, 1.0], [1632276064000, 1.0], [1632277863000, 1.0], [1632279658000, 3.0], [1632281461000, 1.0], [1632283259000, 4.0], [1632285066000, 1.0], [1632286862000, 1.0], [1632288661000, 1.0], [1632290462000, 1.0], [1632292260000, 1.0], [1632294062000, 1.0], [1632295862000, 1.0], [1632297663000, 1.0], [1632299463000, 1.0], [1632301261000, 1.0], [1632303061000, 1.0], [1632304861000, 1.0], [1632306660000, 1.0], [1632308460000, 1.0], [1632310260000, 1.0], [1632312062000, 1.0], [1632313864000, 1.0], [1632315657000, 4.0], [1632317461000, 1.0], [1632319262000, 1.0], [1632321058000, 1.0], [1632322862000, 1.0], [1632324662000, 1.0], [1632326462000, 1.0], [1632328262000, 1.0], [1632330063000, 1.0], [1632331862000, 1.0], [1632333663000, 1.0], [1632335459000, 1.0], [1632337264000, 1.0], [1632339062000, 1.0], [1632340863000, 1.0], [1632342662000, 1.0], [1632344461000, 1.0], [1632346260000, 1.0], [1632348064000, 1.0], [1632349862000, 1.0], [1632351661000, 1.0], [1632353461000, 1.0], [1632355260000, 1.0], [1632357062000, 1.0], [1632358860000, 1.0], [1632360661000, 1.0], [1632362458000, 4.0], [1632364262000, 1.0], [1632366063000, 1.0], [1632367863000, 1.0], [1632369660000, 1.0], [1632371460000, 1.0], [1632373261000, 1.0], [1632375059000, 1.0], [1632376861000, 1.0], [1632378661000, 1.0], [1632380460000, 1.0], [1632382261000, 1.0], [1632384061000, 1.0], [1632385862000, 1.0], [
+                    1632387660000, 1.0], [1632389462000, 1.0], [1632391261000, 1.0], [1632393061000, 1.0], [1632394862000, 1.0], [1632396660000, 1.0], [1632398460000, 1.0], [1632400261000, 1.0], [1632402061000, 1.0], [1632403860000, 1.0], [1632405661000, 1.0], [1632407462000, 1.0], [1632409263000, 1.0], [1632411062000, 1.0], [1632412862000, 1.0], [1632414662000, 1.0], [1632416459000, 1.0], [1632418259000, 1.0], [1632420058000, 1.0], [1632421861000, 1.0], [1632423661000, 1.0], [1632425463000, 1.0], [1632427259000, 1.0], [1632429059000, 1.0], [1632430860000, 1.0], [1632432663000, 1.0], [1632434461000, 1.0], [1632436262000, 1.0], [1632438058000, 2.0], [1632439861000, 1.0], [1632441659000, 1.0], [1632443458000, 1.0], [1632445260000, 1.0], [1632447062000, 1.0], [1632448861000, 1.0], [1632450662000, 1.0], [1632452461000, 1.0], [1632454257000, 3.0], [1632456059000, 1.0], [1632457863000, 1.0], [1632459661000, 1.0], [1632461460000, 1.0], [1632463263000, 1.0]]
+            }, "success": true, "obj": null, "object": null, "str": null, "totalRow": null
+        };
         if (response && response.map) {
             currDataList = response.map.currDataList
             predictionDataList = response.map.predictionDataList
@@ -48,8 +57,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'admin',
         }
         // gte = response.object
         // lte = new Date(data[data.length - 1][0]).getTime()
-            }
-        })
+
+
+        /*    }
+        })*/
 
         var option = {
             xAxis: [{
@@ -58,7 +69,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'admin',
                     color: '#333',
                     show: true,
                     interval: 0,
-                    rotate: 15
+                    formatter(value, index) {
+                        return new Date(value).format('yyyy-MM-dd')
+                    }
                 },
                 axisLine: {
                     lineStyle: {
@@ -123,6 +136,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'admin',
                 trigger: 'axis',
                 axisPointer: {
                     type: 'shadow'
+                },
+                formatter: function (param) {
+                    var tips = new Date(param[0].axisValue).format('yyyy-MM-dd HH:mm:ss') + "<br/>";
+                    $.each(param, function (i, v) {
+                        tips += v.marker + " " + v.seriesName + ":" + v.value[1] + "</br>"
+                    });
+                    return tips;
                 }
             },
             toolbox: {

@@ -62,7 +62,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                     , {title: '表空间使用率', align: 'center', width:250, templet: '#predictionTpsRateTpl'}
                     , {title: '操作', align: 'center',width:200, fixed: 'right',
                         templet: '<div>' +
-                            '<span data-id="{{d.resId}}" class="layui-table-link prediction_database_info" lay-tips="明细">明细</span>'+
+                            '<span data-id="{{d.resId}}" data-resname="{{d.resName}}" class="layui-table-link prediction_database_info" lay-tips="明细">明细</span>'+
                             '</div>'
                     }
                 ]
@@ -71,6 +71,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                 //打开明细列表
                 $('.prediction_database_info').unbind('click').on('click',function () {
                     var resId = $(this).data("id");
+                    var resName = $(this).data("resname");
                     admin.req({
                         url:domainName + '/api-web/prediction/database/detail'
                         ,data:{resId:resId}
@@ -79,7 +80,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                                 var trs = '';
                                 $.each(res.data,function (i,v){
                                     trs += `<tr><td>${i+1}</td><td>${v.tpsName}</td><td>${v.tpsSize}</td><td>${v.tpsUsed}</td><td>${v.tpsFree}</td>
-                                    <td><span class="kpiSubDiv" style="cursor: pointer;text-decoration: underline;color: #1E9FFF;" data-resid=${resId} data-kpiid="KPI64B1610A" data-flag=${v.flag} data-name="使用率">${v.tpsUsedRate}</span></tr>`;
+                                    <td><span class="kpiSubDiv" style="cursor: pointer;text-decoration: underline;color: #1E9FFF;" data-resid=${resId} data-kpiid="KPI64B1610A" data-flag=${v.flag} data-name="${resName}-表空间使用率">${v.tpsUsedRate}</span></tr>`;
                                 });
                                 var tb = `<div class="layui-form" style="padding: 0 10px;">
                                     <table class="layui-table" id="info_table">

@@ -63,7 +63,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                     , {title: '当前 / 推荐配置', align: 'center', width:450, colspan: 3,}
                     , {title: '操作', align: 'center',width:160, fixed: 'right', rowspan: 2,
                         templet: '<div>' +
-                            '<span data-id="{{d.resId}}" class="layui-table-link prediction_server_info" lay-tips="明细">明细</span>'+
+                            '<span data-id="{{d.resId}}" data-resname="{{d.resName}}" class="layui-table-link prediction_server_info" lay-tips="明细">明细</span>'+
                             '</div>'
                     }
                 ], [
@@ -137,6 +137,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                 //打开明细列表
                 $('.prediction_server_info').unbind('click').on('click',function () {
                     var resId = $(this).data("id");
+                    var resName = $(this).data("resname");
                     admin.req({
                         url:domainName + '/api-web/prediction/server/detail'
                         ,data:{resId:resId}
@@ -145,7 +146,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                                 var trs = '';
                                 $.each(res.data,function (i,v){
                                     trs += `<tr><td>${i+1}</td><td>${v.fsName}</td><td>${v.fsSize}</td><td>${v.fsUsed}</td>
-                                    <td><span class="kpiSubDiv" style="cursor: pointer;text-decoration: underline;color: #1E9FFF;" data-resid=${resId} data-kpiid="KPI449F5365" data-flag=${v.flag} data-name="使用率">${v.fsUsedRate}</span></td><td>${v.dailyGrowthRate == 0 ? '-' : v.dailyGrowthRate}</td><td>${v.availableDays == 0 ? '-' : v.availableDays}</td></tr>`;
+                                    <td><span class="kpiSubDiv" style="cursor: pointer;text-decoration: underline;color: #1E9FFF;" data-resid=${resId} data-kpiid="KPI449F5365" data-flag=${v.flag} data-name="${resName}-文件系统使用率">${v.fsUsedRate}</span></td><td>${v.dailyGrowthRate == 0 ? '-' : v.dailyGrowthRate}</td><td>${v.availableDays == 0 ? '-' : v.availableDays}</td></tr>`;
                                 });
                                 var tb = `<div class="layui-form" style="padding: 0 10px;">
                                     <table class="layui-table" id="info_table">

@@ -64,7 +64,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                     , {title: '容量使用率', align: 'center', width:280, templet: '#predictionStorageRateTpl'}
                     , {title: '操作', align: 'center',width:220, fixed: 'right',
                         templet: '<div>' +
-                            '<span data-id="{{d.resId}}" class="layui-table-link prediction_storage_info" lay-tips="明细">明细</span>'+
+                            '<span data-id="{{d.resId}}" data-resname="{{d.resName}}" class="layui-table-link prediction_storage_info" lay-tips="明细">明细</span>'+
                             '</div>'
                     }
                 ]
@@ -73,6 +73,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                 //打开明细列表
                 $('.prediction_storage_info').unbind('click').on('click',function () {
                     var resId = $(this).data("id");
+                    var resName = $(this).data("resname");
                     admin.req({
                         url:domainName + '/api-web/prediction/storage/detail'
                         ,data:{resId:resId}
@@ -81,7 +82,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                                 var trs = '';
                                 $.each(res.data,function (i,v){
                                     trs += `<tr><td>${i+1}</td><td>${v.storageName}</td><td>${v.storageSize}</td><td>${v.storageUsed}</td><td>${v.storageFree}</td>
-                                    <td><span class="kpiSubDiv" style="cursor: pointer;text-decoration: underline;color: #1E9FFF;" data-resid=${resId} data-kpiid="KPI5E148DBE" data-flag=${v.flag} data-name="使用率">${v.storageUsedRate}</span></td></tr>`;
+                                    <td><span class="kpiSubDiv" style="cursor: pointer;text-decoration: underline;color: #1E9FFF;" data-resid=${resId} data-kpiid="KPI5E148DBE" data-flag=${v.flag} data-name="${resName}-容量使用率">${v.storageUsedRate}</span></td></tr>`;
                                 });
                                 var tb = `<div class="layui-form" style="padding: 0 10px;">
                                     <table class="layui-table" id="info_table">

@@ -18,7 +18,7 @@ layui.extend({
   ,admin = layui.admin
   ,tabsPage = admin.tabsPage
   ,view = layui.view
-  ,defaultIndex = ''
+  ,defaultIndex = '/prediction/server'
 
   // 根据 路由渲染页面
   ,renderPage = function(){

@@ -36,7 +36,7 @@
 
 <!--表空间使用率-->
 <script type="text/html" id="predictionTpsRateTpl">
-    <div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI64B1610A" data-flag="tps" data-name="表空间使用率">
+    <div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI64B1610A" data-flag="tps" data-name="{{d.resName}}-表空间使用率">
         <div class="layui-progress layui-progress-big" lay-showpercent="true" style="margin-right: 10px;">
             <div class="layui-progress-bar layui-bg-green"
                  lay-percent="{{ d.tsUsedRate }}%"

@@ -47,7 +47,7 @@
 
 <!--CPU使用率-->
 <script type="text/html" id="predictionCpuRateTpl">
-    <div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI7054BC34" data-flag="cpu" data-name="CPU使用率">
+    <div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI7054BC34" data-flag="cpu" data-name="{{d.resName}}-CPU使用率">
         <div class="layui-progress layui-progress-big" lay-showpercent="true" style="margin-right: 10px;">
             <div class="layui-progress-bar layui-bg-green"
                  lay-percent="{{ d.cpuRate }}%"
@@ -59,7 +59,7 @@
 </script>
 <!--内存使用率-->
 <script type="text/html" id="predictionMemoryRateTpl">
-    <div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI31CB8D97" data-flag="mem" data-name="内存使用率">
+    <div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI31CB8D97" data-flag="mem" data-name="{{d.resName}}-内存使用率">
         <div class="layui-progress layui-progress-big" lay-showpercent="true" style="margin-right: 10px;">
             <div class="layui-progress-bar layui-bg-green"
                  lay-percent="{{ d.memRate }}%"
@@ -71,7 +71,7 @@
 </script>
 <!--文件系统使用率-->
 <script type="text/html" id="predictionFileSysStemRateTpl">
-    <div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI449F5365" data-flag="fs"  data-name="文件系统使用率">
+    <div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI449F5365" data-flag="fs"  data-name="{{d.resName}}-文件系统使用率">
         <div class="layui-progress layui-progress-big" lay-showpercent="true" style="margin-right: 10px;">
             <div class="layui-progress-bar layui-bg-green"
                  lay-percent="{{ d.fsRate }}%"

@@ -36,7 +36,7 @@
 
 <!--容量使用率-->
 <script type="text/html" id="predictionStorageRateTpl">
-    <div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI5E148DBE" data-flag="storage" data-name="容量使用率">
+    <div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI5E148DBE" data-flag="storage" data-name="{{d.resName}}-容量使用率">
         <div class="layui-progress layui-progress-big" lay-showpercent="true" style="margin-right: 10px;">
             <div class="layui-progress-bar layui-bg-green"
                  lay-percent="{{ d.storageUsedRate }}%"