SpaceOfCheng
/
admin
Bevaka 3
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 2 Activity
Bläddra i källkod

xcx

许成详 6 år sedan
förälder
6acbb0dc1f
incheckning
1fe9d73154
11 ändrade filer med 47 tillägg och 32 borttagningar
Unifierad Vy Visa Diff Statistik
  1. 1
    1
      dist/index.html
  2. 1
    1
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  3. 1
    1
      src/components/brokenLineGraph/index.vue
  4. 1
    1
      src/components/brokenLineGraphGroup/index.vue
  5. 2
    2
      src/components/dashboard/index.vue
  6. 6
    4
      src/components/dashboardList/index.vue
  7. 1
    1
      src/components/histogram/index.vue
  8. 1
    1
      src/components/pieDiagram/index.vue
  9. 4
    4
      src/components/ringChart/index.vue
  10. 5
    0
      src/pages/system/cmsManager/majorProjects/edit.vue
  11. 24
    16
      src/pages/system/dashboard/index.vue

+ 1
- 1
dist/index.html Visa fil

1 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.a850e1bbc151e0cbebd3056e3c62c6e5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.796889f82dfcb1df1494.js></script></body></html>
1 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.357bdd103413742520ccc7fc79d8212c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.c14224bc0dde8cfb9cbb.js></script></body></html>

+ 1
- 1
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map Visa fil

1 
-{"version":3,"sources":["webpack:///webpack/bootstrap 54812fbeda491d145170"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,KAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.3ad1d5771e9b13dbdad2.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 54812fbeda491d145170"],"sourceRoot":""}
1 
+{"version":3,"sources":["webpack:///webpack/bootstrap ca0ed46b08c2dad67a94"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,KAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.3ad1d5771e9b13dbdad2.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap ca0ed46b08c2dad67a94"],"sourceRoot":""}

+ 1
- 1
src/components/brokenLineGraph/index.vue Visa fil

32 
         width: _that.$refs.box.clientWidth,
32 
         width: _that.$refs.box.clientWidth,
33 
         height: 400
33 
         height: 400
34 
       })
34 
       })
35 
-      chart.source(_that.data.list)
35 
+      chart.source(_that.data.value)
36 
       chart.scale('y', {
36 
       chart.scale('y', {
37 
         min: 0
37 
         min: 0
38 
       })
38 
       })

+ 1
- 1
src/components/brokenLineGraphGroup/index.vue Visa fil

32 
         width: _that.$refs.box.clientWidth,
32 
         width: _that.$refs.box.clientWidth,
33 
         height: 400,
33 
         height: 400,
34 
       })
34 
       })
35 
-      chart.source(_that.data.list, {
35 
+      chart.source(_that.data.value, {
36 
         month: {
36 
         month: {
37 
           range: [0, 1]
37 
           range: [0, 1]
38 
         }
38 
         }

+ 2
- 2
src/components/dashboard/index.vue Visa fil

65 
         height: 400,
65 
         height: 400,
66 
         padding: [0, 0, 30, 0]
66 
         padding: [0, 0, 30, 0]
67 
       })
67 
       })
68 
-      chart.source(_that.data.list)
68 
+      chart.source(_that.data.value)
69
69
70 
       chart.coord('polar', {
70 
       chart.coord('polar', {
71 
         startAngle: -9 / 8 * Math.PI,
71 
         startAngle: -9 / 8 * Math.PI,
122 
       chart.guide().arc({
122 
       chart.guide().arc({
123 
         zIndex: 1,
123 
         zIndex: 1,
124 
         start: [0, 0.945],
124 
         start: [0, 0.945],
125 
-        end: [_that.data.list[0].value, 0.945],
125 
+        end: [_that.data.value[0].value, 0.945],
126 
         style: {
126 
         style: {
127 
           stroke: '#1890FF',
127 
           stroke: '#1890FF',
128 
           lineWidth: 18
128 
           lineWidth: 18

+ 6
- 4
src/components/dashboardList/index.vue Visa fil

1 
 <template>
1 
 <template>
2 
   <div class="dashboardList">
2 
   <div class="dashboardList">
3 
     <ul class="flex-h">
3 
     <ul class="flex-h">
4 
-      <li class="flex-item" v-for="(item,index) in data.list" :key="index">
4 
+      <li class="flex-item">
5 
         <div :style="{background:colorList[index%colorList.length]}">
5 
         <div :style="{background:colorList[index%colorList.length]}">
6 
           <div class="centerLabel">
6 
           <div class="centerLabel">
7 
-            <span>{{item.name}}</span>
8 
-            <span>{{item.value}}</span>
7 
+            <span>{{data.title}}</span>
8 
+            <span>{{data.value}}</span>
9 
           </div>
9 
           </div>
10 
         </div>
10 
         </div>
11 
       </li>
11 
       </li>
23 
     }
23 
     }
24 
   },
24 
   },
25 
   mounted () {
25 
   mounted () {
26 
-    this.$nextTick(function () {})
26 
+    this.$nextTick(function () {
27 
+      console.log(JSON.stringify(this.data))
28 
+    })
27 
   },
29 
   },
28 
   methods: {
30 
   methods: {
29 
   }
31 
   }

+ 1
- 1
src/components/histogram/index.vue Visa fil

32 
         width: _that.$refs.box.clientWidth,
32 
         width: _that.$refs.box.clientWidth,
33 
         height: 400
33 
         height: 400
34 
       })
34 
       })
35 
-      chart.source(_that.data.list)
35 
+      chart.source(_that.data.value)
36 
       chart.scale('y', {
36 
       chart.scale('y', {
37 
         tickInterval: 20
37 
         tickInterval: 20
38 
       })
38 
       })

+ 1
- 1
src/components/pieDiagram/index.vue Visa fil

32 
         width: _that.$refs.box.clientWidth,
32 
         width: _that.$refs.box.clientWidth,
33 
         height: 400
33 
         height: 400
34 
       })
34 
       })
35 
-      chart.source(_that.data.list, {
35 
+      chart.source(_that.data.value, {
36 
         percent: {
36 
         percent: {
37 
           formatter: function formatter (val) {
37 
           formatter: function formatter (val) {
38 
             val = val * 100 + '%'
38 
             val = val * 100 + '%'

+ 4
- 4
src/components/ringChart/index.vue Visa fil

32 
         width: _that.$refs.box.clientWidth,
32 
         width: _that.$refs.box.clientWidth,
33 
         height: 400
33 
         height: 400
34 
       })
34 
       })
35 
-      chart.source(_that.data.list, {
35 
+      chart.source(_that.data.value, {
36 
         percent: {
36 
         percent: {
37 
           formatter: function formatter (val) {
37 
           formatter: function formatter (val) {
38 
             val = val * 100 + '%'
38 
             val = val * 100 + '%'
49 
         itemTpl: '<li><span style="background-color:{color};" class="g2-tooltip-marker"></span>{name}: {value}</li>'
49 
         itemTpl: '<li><span style="background-color:{color};" class="g2-tooltip-marker"></span>{name}: {value}</li>'
50 
       })
50 
       })
51 
       var num = 0
51 
       var num = 0
52 
-      for (var n = 0; n < _that.data.list.length; n++) {
53 
-        num += _that.data.list[n].count
52 
+      for (var n = 0; n < _that.data.value.length; n++) {
53 
+        num += _that.data.value[n].count
54 
       }
54 
       }
55 
       // 辅助文本
55 
       // 辅助文本
56 
       chart.guide().html({
56 
       chart.guide().html({
74 
         stroke: '#fff'
74 
         stroke: '#fff'
75 
       })
75 
       })
76 
       chart.render()
76 
       chart.render()
77 
-      interval.setSelected(_that.data.list[0])
77 
+      interval.setSelected(_that.data.value[0])
78 
     },
78 
     },
79 
   }
79 
   }
80 
 }
80 
 }

+ 5
- 0
src/pages/system/cmsManager/majorProjects/edit.vue Visa fil

7 
           <div class="flex-item">
7 
           <div class="flex-item">
8 
             <div style="width:50%">
8 
             <div style="width:50%">
9 
               <el-select v-model="CaseId" placeholder="请选择" @change="caseChange">
9 
               <el-select v-model="CaseId" placeholder="请选择" @change="caseChange">
10 
+                <el-option
11 
+                  key=""
12 
+                  label="全部案场"
13 
+                  value="">
14 
+                </el-option>
10 
                 <el-option
15 
                 <el-option
11 
                   v-for="item in caseList"
16 
                   v-for="item in caseList"
12 
                   :key="item.CaseId"
17 
                   :key="item.CaseId"

+ 24
- 16
src/pages/system/dashboard/index.vue Visa fil

13 
     <div class="flex-h" v-for="(item,index) in pageData" :key="index">
13 
     <div class="flex-h" v-for="(item,index) in pageData" :key="index">
14 
       <div class="flex-item" v-for="(subItem,subIndex) in item" :key="subIndex">
14 
       <div class="flex-item" v-for="(subItem,subIndex) in item" :key="subIndex">
15 
         <div v-if="subItem.type === 'dashboardList'">
15 
         <div v-if="subItem.type === 'dashboardList'">
16 
-          <dashboardList :data="subItem.data" :index="index + '-' + subIndex"></dashboardList>
16 
+          <dashboardList :data="subItem" :index="index + '-' + subIndex"></dashboardList>
17 
         </div>
17 
         </div>
18 
-        <div v-if="subItem.type === 'histogram'">
19 
-          <histogram :data="subItem.data" :index="index + '-' + subIndex"></histogram>
18 
+        <!-- <div v-if="subItem.type === 'histogram' && subItem.value.length">
19 
+          <histogram :data="subItem.value" :index="index + '-' + subIndex"></histogram>
20 
         </div>
20 
         </div>
21 
-        <div v-if="subItem.type === 'pieDiagram'">
22 
-          <pieDiagram :data="subItem.data" :index="index + '-' + subIndex"></pieDiagram>
21 
+        <div v-if="subItem.type === 'pieDiagram' && subItem.value.length">
22 
+          <pieDiagram :data="subItem.value" :index="index + '-' + subIndex"></pieDiagram>
23 
         </div>
23 
         </div>
24 
-        <div v-if="subItem.type === 'brokenLineGraph'">
25 
-          <brokenLineGraph :data="subItem.data" :index="index + '-' + subIndex"></brokenLineGraph>
24 
+        <div v-if="subItem.type === 'brokenLineGraph' && subItem.value.length">
25 
+          <brokenLineGraph :data="subItem.value" :index="index + '-' + subIndex"></brokenLineGraph>
26 
         </div>
26 
         </div>
27 
-        <div v-if="subItem.type === 'ringChart'">
28 
-          <ringChart :data="subItem.data" :index="index + '-' + subIndex"></ringChart>
27 
+        <div v-if="subItem.type === 'ringChart' && subItem.value.length">
28 
+          <ringChart :data="subItem.value" :index="index + '-' + subIndex"></ringChart>
29 
         </div>
29 
         </div>
30 
-        <div v-if="subItem.type === 'dashboard'">
31 
-          <dashboard :data="subItem.data" :index="index + '-' + subIndex"></dashboard>
32 
-        </div>
33 
-        <div v-if="subItem.type === 'brokenLineGraphGroup'">
34 
-          <brokenLineGraphGroup :data="subItem.data" :index="index + '-' + subIndex"></brokenLineGraphGroup>
30 
+        <div v-if="subItem.type === 'dashboard' && subItem.value.length">
31 
+          <dashboard :data="subItem.value" :index="index + '-' + subIndex"></dashboard>
35 
         </div>
32 
         </div>
33 
+        <div v-if="subItem.type === 'brokenLineGraphGroup' && subItem.value.length">
34 
+          <brokenLineGraphGroup :data="subItem.value" :index="index + '-' + subIndex"></brokenLineGraphGroup>
35 
+        </div> -->
36 
       </div>
36 
       </div>
37 
     </div>
37 
     </div>
38 
   </div>
38 
   </div>
124 
       this.getDashboardData({
124 
       this.getDashboardData({
125 
         caseid: id
125 
         caseid: id
126 
       }).then((res) => {
126 
       }).then((res) => {
127 
-        console.log(JSON.stringify(res))
127 
+        this.pageData = []
128 
+        for (var n = 0; n < res.length; n++) {
129 
+          this.pageData.push([])
130 
+          for (var a = 0; a < res[n].length; a++) {
131 
+            if (res[n][a].type !== 'dashboardList' && res[n][a].value === null) res[n][a].value = []
132 
+            this.pageData[n].push(res[n][a])
133 
+          }
134 
+        }
135 
+        // console.log(JSON.stringify(this.pageData))
128 
       })
136 
       })
129 
     },
137 
     },
130 
     getBottomData (id, type) {
138 
     getBottomData (id, type) {
132 
         caseid: id,
140 
         caseid: id,
133 
         statype: type
141 
         statype: type
134 
       }).then((res) => {
142 
       }).then((res) => {
135 
-        console.log(JSON.stringify(res))
143 
+        // console.log(JSON.stringify(res))
136 
       })
144 
       })
137 
     },
145 
     },
138 
   }
146 
   }