diff --git a/index.html b/index.html
index 2841419..ed7cd08 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0, minimum-scale=1.0,user-scalable=no">
-    <title>晟华大屏监控</title>
+    <title>宁德华弘大屏监控</title>
   </head>
   <body class="clearfix">
     <div id="app"></div>
diff --git a/src/components/time.vue b/src/components/time.vue
index 76c84b5..a2688e7 100644
--- a/src/components/time.vue
+++ b/src/components/time.vue
@@ -52,8 +52,8 @@ export default {
 <style lang="stylus" scoped>
 .data_box
   position absolute
-  right 30px
-  top 21px
+  right 15px
+  top 30px
   width 300px
   height 39px
   display: flex
diff --git a/src/images/bg-button.png b/src/images/bg-button.png
new file mode 100644
index 0000000..359b9cf
Binary files /dev/null and b/src/images/bg-button.png differ
diff --git a/src/images/bg-button_left.png b/src/images/bg-button_left.png
deleted file mode 100755
index 020af41..0000000
Binary files a/src/images/bg-button_left.png and /dev/null differ
diff --git a/src/images/bg-button_right.png b/src/images/bg-button_right.png
deleted file mode 100755
index 03a448d..0000000
Binary files a/src/images/bg-button_right.png and /dev/null differ
diff --git a/src/images/bg-center_right.jpg b/src/images/bg-center.jpg
similarity index 100%
rename from src/images/bg-center_right.jpg
rename to src/images/bg-center.jpg
diff --git a/src/images/bg-center_left.jpg b/src/images/bg-center_left.jpg
deleted file mode 100755
index 8bcb478..0000000
Binary files a/src/images/bg-center_left.jpg and /dev/null differ
diff --git a/src/images/bg-home_left.jpg b/src/images/bg-home_left.jpg
deleted file mode 100755
index 3fd728c..0000000
Binary files a/src/images/bg-home_left.jpg and /dev/null differ
diff --git a/src/images/bg-home_right.jpg b/src/images/bg-home_right.jpg
deleted file mode 100755
index e556348..0000000
Binary files a/src/images/bg-home_right.jpg and /dev/null differ
diff --git a/src/images/bg-m_1.png b/src/images/bg-m_1.png
deleted file mode 100644
index 1147072..0000000
Binary files a/src/images/bg-m_1.png and /dev/null differ
diff --git a/src/images/bg-title_1.png b/src/images/bg-title_1.png
deleted file mode 100644
index 894950c..0000000
Binary files a/src/images/bg-title_1.png and /dev/null differ
diff --git a/src/images/bg-title_3.png b/src/images/bg-title_3.png
deleted file mode 100644
index d74e26a..0000000
Binary files a/src/images/bg-title_3.png and /dev/null differ
diff --git a/src/images/bg-top_left.png b/src/images/bg-top_left.png
deleted file mode 100755
index 25faa8a..0000000
Binary files a/src/images/bg-top_left.png and /dev/null differ
diff --git a/src/images/bg-top_right.png b/src/images/bg-top_right.png
deleted file mode 100755
index d3ca752..0000000
Binary files a/src/images/bg-top_right.png and /dev/null differ
diff --git a/src/images/bg-login.jpg b/src/images/bg.jpg
similarity index 100%
rename from src/images/bg-login.jpg
rename to src/images/bg.jpg
diff --git a/src/images/gl-bg_1.png b/src/images/gl-bg_1.png
deleted file mode 100644
index b214fa7..0000000
Binary files a/src/images/gl-bg_1.png and /dev/null differ
diff --git a/src/images/gl-bg_2.png b/src/images/gl-bg_2.png
deleted file mode 100644
index acd54aa..0000000
Binary files a/src/images/gl-bg_2.png and /dev/null differ
diff --git a/src/images/gl-bg_3.png b/src/images/gl-bg_3.png
deleted file mode 100644
index 1d84749..0000000
Binary files a/src/images/gl-bg_3.png and /dev/null differ
diff --git a/src/images/header.png b/src/images/header.png
new file mode 100644
index 0000000..2ed32eb
Binary files /dev/null and b/src/images/header.png differ
diff --git a/src/images/header_bg.png b/src/images/header_bg.png
new file mode 100644
index 0000000..a48bdb4
Binary files /dev/null and b/src/images/header_bg.png differ
diff --git a/src/images/light_1.png b/src/images/light_1.png
deleted file mode 100644
index 4bd2887..0000000
Binary files a/src/images/light_1.png and /dev/null differ
diff --git a/src/images/message-bg.png b/src/images/message-bg.png
deleted file mode 100644
index 23e2d5e..0000000
Binary files a/src/images/message-bg.png and /dev/null differ
diff --git a/src/images/pie-bg_1.png b/src/images/pie-bg_1.png
deleted file mode 100644
index 6017ef6..0000000
Binary files a/src/images/pie-bg_1.png and /dev/null differ
diff --git a/src/images/pie_1.png b/src/images/pie_1.png
deleted file mode 100644
index d50866d..0000000
Binary files a/src/images/pie_1.png and /dev/null differ
diff --git a/src/images/pointer.png b/src/images/pointer.png
deleted file mode 100644
index 7638f70..0000000
Binary files a/src/images/pointer.png and /dev/null differ
diff --git a/src/images/top.png b/src/images/top.png
new file mode 100644
index 0000000..4d6d9f2
Binary files /dev/null and b/src/images/top.png differ
diff --git a/src/main.js b/src/main.js
index 2636a52..e7b2fec 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,12 +9,14 @@ import * as echarts from 'echarts'
 import 'default-passive-events'
 import VueParticles from 'vue-particles'
 import scroll from 'vue-seamless-scroll'
-import {Message} from 'element-ui'
+import {Message, Select, Option} from 'element-ui'
 
 Vue.prototype.$echarts = echarts
 Vue.use(VueParticles)
 Vue.use(scroll)
 Vue.prototype.$message = Message
+Vue.use(Select)
+Vue.use(Option)
 Vue.config.productionTip = false
 /* eslint-disable no-new */
 new Vue({
diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue
index dba0eb4..b34bad5 100644
--- a/src/pages/Setup.vue
+++ b/src/pages/Setup.vue
@@ -35,11 +35,16 @@
               </div>
               <div class="inputOuter">
                 <label>设备看板</label>
-                <!-- <select name="equipment" v-model="equipId">
-                  <option :value="e.id" v-for="e in equipment" :key="e.id">{{e.name}}</option>
-                </select> -->
                 <div class="select-wraper">
-                  <selectOpt :option="option" :index="index" @change="change"></SelectOpt>
+                  <!-- <selectOpt :option="option" :index="index" @change="change"></SelectOpt> -->
+                    <el-select v-model="value" placeholder="请选择">
+                      <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
                 </div>
               </div>
             </div>
@@ -63,8 +68,8 @@ export default {
     return {
       loginname: '',
       password: '',
-      option: [{index: '1', label: '新-左'}, {index: '2', label: '新-右'}],
-      index: this.$store.getters.equipId,
+      options: [{value: '1', label: '主页'}],
+      value: this.$store.getters.equipId,
       baseUrl: this.$store.getters.baseUrl,
       setTime: this.$store.getters.setTime / 1000,
       fullscreen: false
@@ -76,9 +81,6 @@ export default {
       const screenHeight = window.screen.height
       alert('宽：' + screenWidth + ';' + '高：' + screenHeight + ';')
     },
-    change (e) {
-      this.index = e
-    },
     _config () {
       if (this.setTime > 10800) {
         this.$message({
@@ -90,13 +92,11 @@ export default {
       let obj = {
         baseUrl: this.baseUrl,
         setTime: this.setTime * 1000,
-        equipId: this.index
+        equipId: this.value
       }
       this.$store.dispatch('setConfig', obj)
-      if (this.index === '1') {
-        this.$router.push('/lindex')
-      } else if (this.index === '2') {
-        this.$router.push('/rindex')
+      if (this.value === '1') {
+        this.$router.push('/home')
       }
       let element = document.documentElement
       if (this.fullscreen) {
@@ -133,7 +133,7 @@ export default {
   position relative
   _wh(100%, 100%)
   z-index 1
-  background center / 100% 100% url('../images/bg-login.jpg') no-repeat
+  background center / 100% 100% url('../images/bg.jpg') no-repeat
 .lizi
   position absolute
   top 0
@@ -181,20 +181,22 @@ export default {
   width 100%
 .inputOuter
   _fj(row)
-  height 38px
-  line-height 38px
+  height 40px
+  line-height 40px
   width 100%
   margin-bottom 12px
-.inputStyle, .select-wraper
-  _wh(calc(100% - 116px), 38px)
-  font-size 15px
+.inputStyle
+  _wh(calc(100% - 116px), 40px)
+  font-size 14px
   background none
-  line-height 38px
-  color #999999
-  text-indent 10px
+  line-height 40px
+  color #606266
+  padding 0 15px
   border none
   box-sizing border-box
   background-color #ffffff
+.select-wraper
+  _wh(calc(100% - 116px), 40px)
 .submit
   width 100%
   background-color #2778f3
@@ -215,6 +217,8 @@ export default {
 label
   width 115px
   font-size 15px
-  line-height 38px
+  line-height 40px
   color #333333
+.el-select
+  width 100%
 </style>
diff --git a/src/pages/modules/home/left/left.vue b/src/pages/modules/home.vue
similarity index 56%
rename from src/pages/modules/home/left/left.vue
rename to src/pages/modules/home.vue
index 1e0fe3d..eb9b2b4 100644
--- a/src/pages/modules/home/left/left.vue
+++ b/src/pages/modules/home.vue
@@ -1,118 +1,139 @@
 <template>
-    <div class="left_wraper">
-        <div class="item_wraper">
-            <div class="title_wraper">
-                <p>今日生产</p>
-            </div>
-            <div class="content_wraper flexbetween">
-                <div class="module_one_wraper">
-                    <div class="pie_wraper_1">
-                      <!-- <div class="pie_inner_1">
-                        <div class="light_1"></div>
-                        <p>{{ orderFulfillmentRate }}<span>%</span></p>
-                      </div> -->
-                      <div class="echart_wraper_1">
-                        <div id="new_home_echart_1" style="width: 100%; height: 100%;"></div>
-                      </div>
-                      <div class="pie_title_1">订单完成</div>
-                    </div>
-                </div>
-                <div class="line_1"></div>
-                <div class="module_two_wraper">
-                  <div class="module_two_item_wraper">
-                    <div class="module_two_item_lable">混料</div>
-                    <div class="module_two_item_content">
-                      <div class="module_two_item_p_l">{{todayMixProduction.real}}吨</div>
-                      <div class="module_two_item_p_r">{{todayMixProduction.plan}}吨</div>
-                    </div>
-                  </div>
-                  <div class="module_two_item_wraper">
-                    <div class="module_two_item_lable">成型</div>
-                    <div class="module_two_item_content">
-                      <div class="module_two_item_p_l">{{todayPressProduction.real}}块</div>
-                      <div class="module_two_item_p_r">{{todayPressProduction.plan}}块</div>
-                    </div>
-                  </div>
-                  <div class="module_two_item_wraper">
-                    <div class="module_two_item_lable">包装</div>
-                    <div class="module_two_item_content">
-                      <div class="module_two_item_p_l">{{todaySortProduction.real}}块</div>
-                      <div class="module_two_item_p_r">{{todaySortProduction.plan}}快</div>
-                    </div>
-                  </div>
-                </div>
-                <div class="module_three_wraper">
-                  <div class="module_three_text">今日共需生产<span>{{todayTotalPlan}}</span>块，物料种类<span>{{ materialCountSize }}</span>种，已完成包装<span>{{ sortCompleted }}</span>托，共<span>{{ sortCompletedQty }}</span>块，<span>{{ sortMaterialCountSize }}</span>个物料，完成率<span>{{fulfillmentRate}}%</span>。</div>
-                </div>
-            </div>
-        </div>
-        <div class="item_wraper flexbetween">
-            <div class="l_item_wraper">
+  <div class="n_container">
+      <div class="n_header">
+          <div class="n_header_h1">
+              <h1>生产监控中心</h1>
+          </div>
+          <div class="n_header_h2">
+              <h2>宁德华弘新材料科技有限公司</h2>
+          </div>
+          <v-time></v-time>
+      </div>
+      <div class="left_bg"></div>
+      <div class="right_bg"></div>
+      <div class="button_bg"></div>
+      <div class="n_body_container">
+          <div class="n_left_wraper">
+            <div class="w_wraper">
+              <div class="item_wraper">
                 <div class="title_wraper">
-                    <p>当日混料</p>
+                  <p>当日混料</p>
                 </div>
                 <div class="content_wraper">
-                  <div class="echart_wraper">
+                  <div class="w_wraper">
+                      <div id="new_home_echart_1" style="width: 100%; height: 100%;"></div>
+                  </div>
+                </div>
+              </div>
+              <div class="item_wraper">
+                <div class="title_wraper">
+                  <p>当日成品</p>
+                </div>
+                <div class="content_wraper">
+                  <div class="w_wraper">
                       <div id="new_home_echart_2" style="width: 100%; height: 100%;"></div>
                   </div>
                 </div>
-            </div>
-            <div class="l_item_wraper">
+              </div>
+              <div class="item_wraper">
                 <div class="title_wraper">
-                    <p>当日成品</p>
+                  <p>历史分析</p>
                 </div>
                 <div class="content_wraper">
-                  <div class="echart_wraper">
+                  <div class="w_wraper">
                       <div id="new_home_echart_3" style="width: 100%; height: 100%;"></div>
                   </div>
                 </div>
+              </div>
             </div>
-        </div>
-        <div class="item_wraper flexbetween">
-            <div class="l_item_wraper">
+          </div>
+          <div class="n-center_wraper"></div>
+          <div class="n_right_wraper">
+            <div class="w_wraper">
+              <div class="item_wraper">
                 <div class="title_wraper">
-                    <p>库存量监控</p>
+                  <p>设备运行统计</p>
                 </div>
-                <div class="content_wraper content_wraper_1">
+                <div class="content_wraper relative">
                   <div class="pie_wraper_2">
-                    <div class="echart_wraper">
+                    <div class="w_wraper">
                       <div id="new_home_echart_4" style="width: 100%; height: 100%;"></div>
                     </div>
                   </div>
-                  <!-- <div class="pie_legend">
-                    <div class="pie_legend_item" v-for="(e, i) in inventory" :key="i" :class="'pie_legend_item_bg_' + (i + 1)">
-                      <p class="pie_legend_txt_1">{{ e.materialCode }}</p>
+                  <div class="pie_legend">
+                    <div class="pie_legend_item" v-for="(e, i) in stateStatistics.fourState" :key="i" :class="'pie_legend_item_bg_' + (i + 1)">
+                      <p class="pie_legend_txt_1">{{ e.stateName }}</p>
                       <div class="pie_legend_txt_wraper">
-                        <p class="pie_legend_txt_2">{{ e.qty }}</p>
+                        <p class="pie_legend_txt_2">{{ e.status }}</p>
                         <p class="pie_legend_txt_3">{{ e.rate }}</p>
                       </div>
                     </div>
-                  </div> -->
+                  </div>
                 </div>
-            </div>
-            <div class="l_item_wraper">
+              </div>
+              <div class="item_wraper">
                 <div class="title_wraper">
-                    <p>历史分析</p>
+                  <p>30天故障-TOP10</p>
                 </div>
-                <div class="content_wraper">
-                  <div class="echart_wraper">
+                <div class="content_wraper content_wraper_1">
+                  <div class="w_wraper">
                       <div id="new_home_echart_5" style="width: 100%; height: 100%;"></div>
                   </div>
                 </div>
+              </div>
+              <div class="item_wraper">
+                <div class="title_wraper">
+                    <p>设备报警信息</p>
+                </div>
+                <div class="content_wraper" style="padding: 0">
+                  <div class="scroll_wrap">
+                    <ul class="scroll_tab_1">
+                      <li>设备编号</li>
+                      <li>设备名称</li>
+                      <li>报警原因</li>
+                      <li>报警时间</li>
+                    </ul>
+                    <div class="scroll_container_1">
+                      <vue-seamless-scroll :data="deviceWorkOrder" :class-option="defaultOption1">
+                        <ul class="scroll-ul_1">
+                          <li v-for="(e, i) in deviceWorkOrder" :key="i">
+                          <div class="scroll-ul_1_div">{{e.deviceCode}}</div>
+                          <div class="scroll-ul_1_div">{{e.deviceName}}</div>
+                          <div class="scroll-ul_1_div">
+                            <span class="state" :class="'state_' + e.status"></span>
+                            <p class="state_name">{{['关机', '待机', '生产中', '故障'][Number(e.status)]}}</p>
+                          </div>
+                          <div class="scroll-ul_1_div">{{e.startTime}}</div>
+                          </li>
+                        </ul>
+                      </vue-seamless-scroll>
+                    </div>
+                  </div>
+                </div>
             </div>
-        </div>
-    </div>
+            </div>
+          </div>
+      </div>
+  </div>
 </template>
 
 <script>
-// import { homepageDataLeft } from '@js/mork2.js'
-import { homepageDataLeft } from '@js/getData2.js'
+import { homepageDataLeft, homepageDataRight } from '@js/mork2.js'
+// import { homepageDataLeft } from '@js/getData2.js'
 import symbol1 from '@img/symbol_1.png'
 import symbol2 from '@img/symbol_2.png'
 import symbol3 from '@img/symbol_3.png'
 import symbol4 from '@img/symbol_4.png'
 import lineSelected from '@img/line_selected.png'
+import bg1 from '@img/bg1.png'
+import bg2 from '@img/bg2.png'
+import bg3 from '@img/bg3.png'
+import bg4 from '@img/bg4.png'
+import vTime from '@components/time.vue'
 export default {
+  components: {
+    vTime
+  },
   data () {
     return {
       interTime: this.$store.getters.setTime,
@@ -134,11 +155,33 @@ export default {
       chart2Timer: null,
       chart3Timer: null,
       chart4Timer: null,
-      chart5Timer: null
+      chart5Timer: null,
+      chart7Timer: null,
+      chart9Timer: null,
+      capacityRate: [], // 设备产能利用
+      stateStatistics: {}, // 设备运行统计
+      deviceWorkOrder: [], // 设备工单生产
+      areaDeviceStatus: [{process: '混料'}, {process: '压制'}, {process: '干燥'}, {process: '包装'}], // 工序设备状态
+      top10Of30Days: [] // 30天故障top10
+    }
+  },
+  computed: {
+    defaultOption1 () {
+      return {
+        step: 0.4, // 数值越大速度滚动越快
+        limitMoveNum: 95, // 开始无缝滚动的数据量 this.dataList.length
+        hoverStop: true, // 是否开启鼠标悬停stop
+        direction: 1, // 0向下 1向上 2向左 3向右
+        openWatch: true, // 开启数据实时监控刷新dom
+        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
+        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
+        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
+      }
     }
   },
   created () {
     this._homepageDataLeft()
+    this._homepageDataRight()
     this.refresh()
   },
   beforeDestroy () {
@@ -186,111 +229,56 @@ export default {
       this.setEchart1()
       this.setEchart2()
       this.setEchart3()
+      // this.setEchart4()
+      // this.setEchart5()
+    },
+    async _homepageDataRight () {
+      let res = await homepageDataRight()
+      clearInterval(this.chart7Timer)
+      clearInterval(this.chart9Timer)
+      this.capacityRate = [...res.capacityRate]
+      res.stateStatistics.fourState.map(el => {
+        let rate = Number(el.status) * 100 / Number(res.stateStatistics.count)
+        rate = rate.toFixed(2) + '%'
+        this.$set(el, 'rate', rate)
+      })
+      this.stateStatistics = res.stateStatistics
+      this.deviceWorkOrder = [...res.deviceWorkOrder]
+      this.areaDeviceStatus.map((e, i) => {
+        if (i === 0) {
+          this.$set(e, 'running', res.areaDeviceStatus.mix.running)
+          this.$set(e, 'pausing', res.areaDeviceStatus.mix.pausing)
+          this.$set(e, 'shutdown', res.areaDeviceStatus.mix.shutdown)
+          this.$set(e, 'inTrouble', res.areaDeviceStatus.mix.inTrouble)
+        }
+        if (i === 1) {
+          this.$set(e, 'running', res.areaDeviceStatus.press.running)
+          this.$set(e, 'pausing', res.areaDeviceStatus.press.pausing)
+          this.$set(e, 'shutdown', res.areaDeviceStatus.press.shutdown)
+          this.$set(e, 'inTrouble', res.areaDeviceStatus.press.inTrouble)
+        }
+        if (i === 2) {
+          this.$set(e, 'running', res.areaDeviceStatus.dry.running)
+          this.$set(e, 'pausing', res.areaDeviceStatus.dry.pausing)
+          this.$set(e, 'shutdown', res.areaDeviceStatus.dry.shutdown)
+          this.$set(e, 'inTrouble', res.areaDeviceStatus.dry.inTrouble)
+        }
+        if (i === 3) {
+          this.$set(e, 'running', res.areaDeviceStatus.sort.running)
+          this.$set(e, 'pausing', res.areaDeviceStatus.sort.pausing)
+          this.$set(e, 'shutdown', res.areaDeviceStatus.sort.shutdown)
+          this.$set(e, 'inTrouble', res.areaDeviceStatus.sort.inTrouble)
+        }
+      })
+      this.top10Of30Days = [...res.top10Of30Days]
+      this.top10Of30Days.map((e, i) => {
+        this.$set(e, 'sort', i + 1)
+      })
+      this.top10Of30Days = this.top10Of30Days.reverse()
       this.setEchart4()
       this.setEchart5()
     },
     setEchart1 () {
-      let value = this.orderFulfillmentRate
-      let option = {
-        grid: {
-          top: 0,
-          left: 0,
-          right: 0,
-          bottom: 0,
-          containLabel: true
-        },
-        title: {
-          text: `{a|${value}}{b|%}`,
-          x: 'center',
-          y: 'center',
-          textStyle: {
-            rich: {
-              a: {
-                fontSize: 36,
-                color: '#DBE7F6',
-                fontFamily: 'YouSheBiaoTiHei'
-              },
-              b: {
-                fontSize: 20,
-                padding: [9, 0, 0, 3],
-                color: '#fff',
-                fontFamily: 'YouSheBiaoTiHei'
-              }
-            }
-          }
-        },
-        series: [{
-          name: '进度',
-          type: 'pie',
-          radius: ['76%', '100%'],
-          center: ['50%', '50%'],
-          clockwise: false,
-          label: {
-            show: false
-          },
-          data: [{
-            name: '已完成',
-            value: value,
-            itemStyle: {
-              decal: {
-                color: '#3D92ED',
-                backgroundColor: '#1774E8',
-                dashArrayX: [1, 0],
-                dashArrayY: [1, 4],
-                rotation: -Math.PI / 4
-              }
-            }
-          }, {
-            name: '未完成',
-            value: 100 - value,
-            itemStyle: {
-              decal: {
-                color: '#597491',
-                backgroundColor: '#2f5175',
-                dashArrayX: [1, 0],
-                dashArrayY: [2, 4],
-                rotation: -Math.PI / 4
-              }
-            },
-            emphasis: {
-              disabled: true
-            }
-          }]
-        }, {
-          type: 'pie',
-          radius: ['99%', '100%'],
-          clockwise: false,
-          itemStyle: {
-            color: '#45B1F1'
-          },
-          label: {
-            show: false
-          },
-          data: [1]
-        }, {
-          type: 'pie',
-          radius: ['75%', '76%'],
-          clockwise: false,
-          itemStyle: {
-            color: '#45B1F1'
-          },
-          label: {
-            show: false
-          },
-          data: [1]
-        }]
-      }
-      if (document.getElementById('new_home_echart_1') == null) {
-        return
-      }
-      this.$echarts.dispose(document.getElementById('new_home_echart_1'))
-      let echart = this.$echarts.init(document.getElementById('new_home_echart_1'))
-      echart.setOption(option)
-      window.addEventListener('resize', () => {
-        echart.resize()
-      })
-    },
-    setEchart2 () {
       let img = {
         imgSrc1: symbol1,
         imgSrc2: symbol2
@@ -425,11 +413,11 @@ export default {
           }
         ]
       }
-      if (document.getElementById('new_home_echart_2') == null) {
+      if (document.getElementById('new_home_echart_1') == null) {
         return
       }
-      this.$echarts.dispose(document.getElementById('new_home_echart_2'))
-      let echart = this.$echarts.init(document.getElementById('new_home_echart_2'))
+      this.$echarts.dispose(document.getElementById('new_home_echart_1'))
+      let echart = this.$echarts.init(document.getElementById('new_home_echart_1'))
       echart.setOption(option)
       this.chart2Timer = setInterval(() => {
         if (option.dataZoom[0].endValue >= barData1.length - 1) {
@@ -445,7 +433,7 @@ export default {
         echart.resize()
       })
     },
-    setEchart3 () {
+    setEchart2 () {
       let barName = []
       let barData1 = []
       let barData2 = []
@@ -623,11 +611,11 @@ export default {
           }
         ]
       }
-      if (document.getElementById('new_home_echart_3') == null) {
+      if (document.getElementById('new_home_echart_2') == null) {
         return
       }
-      this.$echarts.dispose(document.getElementById('new_home_echart_3'))
-      let echart = this.$echarts.init(document.getElementById('new_home_echart_3'))
+      this.$echarts.dispose(document.getElementById('new_home_echart_2'))
+      let echart = this.$echarts.init(document.getElementById('new_home_echart_2'))
       echart.setOption(option)
       this.chart3Timer = setInterval(() => {
         if (option.dataZoom[0].endValue >= barData1.length - 1) {
@@ -643,163 +631,7 @@ export default {
         echart.resize()
       })
     },
-    setEchart4 () {
-      let colors = ['#1980EA', '#67D470', '#B4C9EF', '#BCBF5C', '#EF5252', '#6d5edd', '#bf41bb']
-      let seriesData = []
-      let seriesName = []
-      this.inventory.map((e, i) => {
-        seriesData.push({name: e.materialCode, value: e.qty})
-        seriesName.push({name: e.materialCode})
-      })
-      let total = 0
-      this.inventory.map(e => {
-        total = total + e.qty
-      }, 0)
-      let option = {
-        color: colors,
-        grid: {
-          top: 0,
-          left: 0,
-          right: 0,
-          bottom: 0,
-          containLabel: true
-        },
-        title: {
-          x: '23.5%',
-          y: '39%',
-          width: '200',
-          height: '70',
-          text: '总数',
-          subtext: total,
-          textAlign: 'center',
-          textStyle: {
-            fontSize: 14,
-            lineHeight: 20,
-            color: '#A8C3E6',
-            fontFamily: 'SourceHanSansCN-Regular'
-          },
-          subtextStyle: {
-            fontSize: 30,
-            lineHeight: 36,
-            color: '#DBE7F6',
-            fontFamily: 'YouSheBiaoTiHei'
-          }
-        },
-        legend: {
-          show: true,
-          type: 'scroll',
-          orient: 'vertical',
-          right: 10,
-          top: 0,
-          itemGap: 18,
-          icon: 'rect',
-          itemWidth: 8,
-          itemHeight: 8,
-          data: seriesName,
-          formatter: (name) => {
-            let total = 0
-            let target
-            for (let i = 0; i < seriesData.length; i++) {
-              total += seriesData[i].value
-              if (seriesData[i].name === name) {
-                target = seriesData[i].value
-              }
-            }
-            var arr = [
-              '{name|' + name + '}\n',
-              '{value|' + target + '}',
-              '{rate|' + ((target / total) * 100).toFixed(2) + '%}'
-            ]
-            return arr.join('  ')
-          },
-          textStyle: {
-            rich: {
-              name: {
-                fontSize: 12,
-                lineHeight: 20,
-                padding: [20, 0, 0, 0],
-                fontFamily: 'SourceHanSansCN-Regular',
-                wordWrap: 'break-word',
-                color: '#9BB9DD',
-                align: 'left'
-              },
-              value: {
-                fontSize: 20,
-                lineHeight: 20,
-                padding: [10, 0, 0, 0],
-                color: '#DFECFB',
-                fontFamily: 'YouSheBiaoTiHei',
-                align: 'left'
-              },
-              rate: {
-                align: 'right',
-                fontSize: 16,
-                lineHeight: 20,
-                padding: [10, 0, 0, 0],
-                fontFamily: 'SourceHanSansCN-Regular',
-                color: '#9BB9DD'
-              }
-            }
-          },
-          pageTextStyle: {
-            fontSize: 12,
-            color: 'RGBA(86, 114, 157, 0.9)'
-          },
-          // pageButtonPosition: 'start',
-          pageButtonItemGap: 0,
-          pageIconSize: 0
-        },
-        series: [{
-          name: '库存量监控',
-          type: 'pie',
-          radius: ['61%', '69%'],
-          center: ['24.5%', '49%'],
-          labelLine: {
-            show: false
-          },
-          tooltip: {
-            show: false
-          },
-          itemStyle: {
-            borderColor: 'RGBA(27, 58, 98, .5)',
-            borderWidth: 2
-          },
-          label: {
-            show: false
-          },
-          selectedMode: 'single',
-          selectedOffset: 20,
-          data: seriesData
-        }]
-      }
-      if (document.getElementById('new_home_echart_4') == null) {
-        return
-      }
-      this.$echarts.dispose(document.getElementById('new_home_echart_4'))
-      let echart = this.$echarts.init(document.getElementById('new_home_echart_4'))
-      echart.setOption(option)
-      let bu = 0
-      this.chart4Timer = setInterval(() => {
-        if (bu > seriesData.length - 1) {
-          bu = 0
-        }
-        // echart.dispatchAction({
-        //   type: 'select',
-        //   seriesIndex: 0,
-        //   dataIndex: bu
-        // })
-        echart.dispatchAction({
-          type: 'legendScroll',
-          seriesIndex: 0,
-          scrollDataIndex: bu
-        })
-        bu++
-      }, 2000)
-      window.addEventListener('resize', () => {
-        echart.resize()
-      })
-    },
-    setEchart5 () {
+    setEchart3 () {
       let img = {
         imgSrc1: symbol3,
         imgSrc2: symbol4,
@@ -868,7 +700,6 @@ export default {
         },
         xAxis: {
           type: 'category',
-          // boundaryGap: false,
           axisTick: {
             show: false
           },
@@ -888,28 +719,6 @@ export default {
             // align: 'right',
             fontFamily: 'SourceHanSansCN-Regular',
             margin: 10
-            // formatter: (value) => {
-            //   let str = ''
-            //   let num = 5
-            //   let valLength = value.length
-            //   let rowNum = Math.ceil(valLength / num)
-            //   if (rowNum > 1) {
-            //     for (let i = 0; i < rowNum; i++) {
-            //       let temp = ''
-            //       let start = i * num
-            //       let end = start + num
-            //       if (i === rowNum - 1) {
-            //         temp = value.substring(start, end)
-            //       } else {
-            //         temp = value.substring(start, end) + '\n'
-            //       }
-            //       str += temp
-            //     }
-            //     return str
-            //   } else {
-            //     return value
-            //   }
-            // }
           },
           data: barName
         },
@@ -1004,11 +813,11 @@ export default {
           }
         ]
       }
-      if (document.getElementById('new_home_echart_5') == null) {
+      if (document.getElementById('new_home_echart_3') == null) {
         return
       }
-      this.$echarts.dispose(document.getElementById('new_home_echart_5'))
-      let echart = this.$echarts.init(document.getElementById('new_home_echart_5'))
+      this.$echarts.dispose(document.getElementById('new_home_echart_3'))
+      let echart = this.$echarts.init(document.getElementById('new_home_echart_3'))
       echart.setOption(option)
       let len = 0
       this.chart5Timer = setInterval(() => {
@@ -1037,189 +846,609 @@ export default {
       window.addEventListener('resize', () => {
         echart.resize()
       })
+    },
+    setEchart4 () {
+      let colors = ['#1980EA', '#67D470', '#B4C9EF', '#EF5252', '#BCBF5C', '#6d5edd', '#bf41bb']
+      let seriesData = this.stateStatistics.fourState
+      seriesData.map((el, i) => {
+        el.value = el.status
+        el.name = el.stateName
+      })
+      let total = this.stateStatistics.count
+      let option = {
+        color: colors,
+        grid: {
+          top: 0,
+          left: 0,
+          right: 0,
+          bottom: 0,
+          containLabel: true
+        },
+        title: {
+          text: `{a|总数}\n{b|${total}}`,
+          x: 'center',
+          y: '39%',
+          textStyle: {
+            rich: {
+              a: {
+                fontSize: 16,
+                lineHeight: 20,
+                color: '#A8C3E6',
+                fontFamily: 'SourceHanSansCN-Regular'
+              },
+              b: {
+                fontSize: 30,
+                lineHeight: 36,
+                color: '#DBE7F6',
+                fontFamily: 'YouSheBiaoTiHei'
+              }
+            }
+          }
+        },
+        series: [{
+          name: '设备运行统计',
+          type: 'pie',
+          radius: ['61%', '69%'],
+          center: ['50%', '50%'],
+          labelLine: {
+            show: false
+          },
+          tooltip: {
+            show: false
+          },
+          itemStyle: {
+            borderColor: 'RGBA(27, 58, 98, .5)',
+            borderWidth: 2
+          },
+          label: {
+            show: false
+          },
+          selectedMode: 'single',
+          selectedOffset: 20,
+          data: seriesData
+        }]
+      }
+      if (document.getElementById('new_home_echart_4') == null) {
+        return
+      }
+      this.$echarts.dispose(document.getElementById('new_home_echart_4'))
+      let echart = this.$echarts.init(document.getElementById('new_home_echart_4'))
+      echart.setOption(option)
+      window.addEventListener('resize', () => {
+        echart.resize()
+      })
+    },
+    setEchart5 () {
+      let ydata = []
+      let xdata = []
+      let total = 0
+      this.top10Of30Days.map(el => {
+        total = Math.max(total, Number(el.count))
+      })
+      let data = []
+      this.top10Of30Days.map(el => {
+        ydata.push(el.device_name)
+        xdata.push({name: el.device_name, value: el.count, sort: el.sort})
+        data.push({value: total, num: el.count})
+      })
+      let img = {
+        bg1: bg1,
+        bg2: bg2,
+        bg3: bg3,
+        bg4: bg4
+      }
+      let colorArray = [
+        {
+          top: '#537BCB',
+          bottom: '#ADC0E6'
+        },
+        {
+          top: '#537BCB',
+          bottom: '#ADC0E6'
+        },
+        {
+          top: '#537BCB',
+          bottom: '#ADC0E6'
+        },
+        {
+          top: '#537BCB',
+          bottom: '#ADC0E6'
+        },
+        {
+          top: '#537BCB',
+          bottom: '#ADC0E6'
+        },
+        {
+          top: '#537BCB',
+          bottom: '#ADC0E6'
+        },
+        {
+          top: '#537BCB',
+          bottom: '#ADC0E6'
+        },
+        {
+          top: '#6B4C43',
+          bottom: '#B8A590'
+        },
+        {
+          top: '#3261FB',
+          bottom: '#6BB5FB'
+        }, {
+          top: '#8C620F',
+          bottom: '#C7B51C'
+        }
+      ]
+      let option = {
+        grid: {
+          top: 13,
+          left: 0,
+          right: 0,
+          bottom: 0,
+          containLabel: true
+        },
+        xAxis: {
+          splitLine: {
+            show: false
+          },
+          axisLine: {
+            show: false
+          },
+          axisLabel: {
+            show: false
+          },
+          axisTick: {
+            show: false
+          }
+        },
+        yAxis: {
+          type: 'category',
+          data: ydata,
+          axisLine: {
+            show: false
+          },
+          axisTick: {
+            show: false
+          },
+          axisLabel: {
+            show: false
+          },
+          max: total
+        },
+        series: [{
+          type: 'bar',
+          showBackground: true,
+          backgroundStyle: {
+            color: '#FFFFFF',
+            borderWidth: 5
+          },
+          label: {
+            show: true,
+            position: [-2, -32],
+            formatter: (value) => {
+              let o = value.data
+              if (o.sort === 1) {
+                return '{one|' + 'TOP' + o.sort + '} {a|' + o.name + '}'
+              } else if (o.sort === 2) {
+                return '{two|' + 'TOP' + o.sort + '} {a|' + o.name + '}'
+              } else if (o.sort === 3) {
+                return '{three|' + 'TOP' + o.sort + '} {a|' + o.name + '}'
+              } else {
+                return '{four|' + 'TOP' + o.sort + '} {a|' + o.name + '}'
+              }
+            },
+            rich: {
+              // 第一名
+              one: {
+                backgroundColor: {
+                  image: img.bg1
+                },
+                color: '#fff',
+                width: 60,
+                height: 32,
+                fontSize: 16,
+                lineHeight: 16,
+                align: 'center',
+                fontFamily: 'YouSheBiaoTiHei'
+              },
+              // 第二名
+              two: {
+                backgroundColor: {
+                  image: img.bg2
+                },
+                color: '#fff',
+                width: 60,
+                height: 32,
+                fontSize: 16,
+                lineHeight: 16,
+                align: 'center',
+                fontFamily: 'YouSheBiaoTiHei'
+              },
+              // 第三名
+              three: {
+                backgroundColor: {
+                  image: img.bg3
+                },
+                color: '#fff',
+                width: 60,
+                height: 32,
+                fontSize: 16,
+                lineHeight: 16,
+                align: 'center',
+                fontFamily: 'YouSheBiaoTiHei'
+              },
+              four: {
+                backgroundColor: {
+                  image: img.bg4
+                },
+                color: '#fff',
+                width: 60,
+                height: 32,
+                fontSize: 16,
+                lineHeight: 16,
+                align: 'center',
+                fontFamily: 'YouSheBiaoTiHei'
+              },
+              a: {
+                color: '#AEC3DC',
+                height: 32,
+                fontSize: 16,
+                lineHeight: 16,
+                padding: [0, 0, 0, 7],
+                fontFamily: 'SourceHanSansCN-Regular'
+              }
+            }
+          },
+          barWidth: 3,
+          itemStyle: {
+            color: (params) => {
+              let num = colorArray.length
+              return {
+                type: 'linear',
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: colorArray[params.dataIndex % num].bottom
+                  },
+                  {
+                    offset: 1,
+                    color: colorArray[params.dataIndex % num].top
+                  },
+                  {
+                    offset: 0,
+                    color: colorArray[params.dataIndex % num].bottom
+                  },
+                  {
+                    offset: 1,
+                    color: colorArray[params.dataIndex % num].top
+                  },
+                  {
+                    offset: 0,
+                    color: colorArray[params.dataIndex % num].bottom
+                  },
+                  {
+                    offset: 1,
+                    color: colorArray[params.dataIndex % num].top
+                  }
+                ]
+                // globalCoord: false
+              }
+            }
+          },
+          data: xdata
+        }, {
+          name: '背景',
+          type: 'bar',
+          barWidth: 3,
+          barGap: '-100%',
+          itemStyle: {
+            color: '#fff'
+          },
+          z: 1,
+          label: {
+            show: true,
+            position: 'insideTopRight',
+            offset: [0, -32],
+            formatter: (value) => {
+              return '{a|' + value.data.num + '}'
+            },
+            rich: {
+              a: {
+                height: 32,
+                fontSize: 20,
+                lineHeight: 20,
+                align: 'left',
+                fontFamily: 'YouSheBiaoTiHei',
+                color: '#E1F6FF'
+              }
+            }
+          },
+          data: data
+        }],
+        dataZoom: [
+          {
+            yAxisIndex: [0, 1], // 这里是从X轴的0刻度开始
+            show: false, // 是否显示滑动条，不影响使用
+            type: 'slider', // 这个 dataZoom 组件是 slider 型 dataZoom 组件
+            startValue: 9, // 从头开始。
+            endValue: 6 // 展示到第几个。
+          }
+        ]
+      }
+      if (document.getElementById('new_home_echart_5') == null) {
+        return
+      }
+      this.$echarts.dispose(document.getElementById('new_home_echart_5'))
+      let echart = this.$echarts.init(document.getElementById('new_home_echart_5'))
+      echart.setOption(option)
+      this.chart9Timer = setInterval(() => {
+        if (option.dataZoom[0].endValue === 0) {
+          option.dataZoom[0].endValue = 6
+          option.dataZoom[0].startValue = 9
+        } else {
+          option.dataZoom[0].endValue = option.dataZoom[0].endValue - 1
+          option.dataZoom[0].startValue = option.dataZoom[0].startValue - 1
+        }
+        echart.setOption(option)
+      }, 2000)
+      window.addEventListener('resize', () => {
+        echart.resize()
+      })
     }
   }
 }
 </script>
 
 <style lang="stylus" scoped>
-@import '~@style/mixin'
-.left_wraper
-    _wh(100%, 100%)
-.item_wraper
-    _wh(100%, calc((100% - 40px) / 3))
-    margin-bottom 20px
-    &:last-child
-        margin-bottom 0
-.title_wraper
-    _wh(100%, 42px)
-    background center / 100% url('../../../../images/bg-title_1.png') no-repeat
-    padding 6px 44px
-    p
-      font-size 24px
+.n_container
+  position relative
+  width 100%
+  height 100%
+  background center / 100% 100% url('../../images/bg.jpg') no-repeat
+  overflow hidden
+.n_header
+  position absolute
+  left 0
+  top 0
+  width 100%
+  height 181px
+  background center / 100% url('../../images/header_bg.png') no-repeat
+.n_header_h1
+  width: 100%;
+  height: 100%;
+  padding-top 26px
+  h1
+      font-size: 60px;
       font-family: 'YouSheBiaoTiHei';
       font-weight: 400;
       color: transparent;
-      line-height 24px
-      background: linear-gradient(0deg, #F9FEFF 0%, #F5FCFF 53.3154296875%, #BAE9FF 100%);
+      line-height: 44px;
+      opacity: 0.89;
+      letter-spacing 10px
+      background: linear-gradient(0deg, #AAD0F6 0%, #D7E7F5 53.3154296875%, #E0EAF6 100%);
+      filter: drop-shadow(#092F6D 1px 4px 1px);
       -webkit-background-clip: text;
       background-clip: text;
-.content_wraper
-    _wh(100%, calc(100% - 42px))
-    background center / 100% url('../../../../images/bg-m_1.png') no-repeat
-.l_item_wraper
-    _wh(calc(50% - 15.5px), 100%)
-    .title_wraper
-      background center / 100% url('../../../../images/bg-title_2.png') no-repeat
-    .content_wraper
-      padding 20px
-      background center / 100% url('../../../../images/bg-m_2.png') no-repeat
-    .content_wraper_1
-      padding 23px 0 6px 0
-.module_one_wraper
-    _wh(233px, 100%)
-    padding 5px 9px 31px 9px
-.line_1
-    _wh(1px, 204px)
-    background: #E3EDFF;
-    opacity: 0.2;
-.module_two_wraper
-    _wh(calc(100% - 435px), 100%)
-    padding 0 25px 0 30px
-    _fj(,center)
-.module_three_wraper
-    _wh(186px, 214px)
-    margin-right 15px
-    padding 27px 17px 27px 23px
-    background center / 100% url('../../../../images/message-bg.png') no-repeat
-.echart_wraper
-    _wh(100%, 100%)
-.echart_wraper_1
-    _wh(100%, 100%)
-.pie_wraper_1
-    position relative
-    _wh(100%, 100%)
-    padding 28px 27px 27px 28px
-    background center / 100% auto url('../../../../images/pie-bg_1.png') no-repeat
-.pie_wraper_2
-    _wh(100%, 100%)
-    background left center / 222px 222px url('../../../../images/pie-bg_2.png') no-repeat
-.pie_legend
-  _wh(calc(100% - 195px), 100%)
-  margin-left 195px
-  _fj(, center)
-.pie_legend_item
+      text-align center
+.n_header_h2
+  position absolute
+  top 30px
+  left 15px
+  height 31px
+  h2
+      font-size: 32px;
+      font-family: 'YouSheBiaoTiHei';
+      font-weight: 400;
+      color: transparent;
+      line-height: 29px;
+      background: linear-gradient(0deg, #B6C3D3 0%, #E3E9F2 53.3154296875%, #FEFEFE 100%);
+      -webkit-background-clip: text;
+      background-clip: text;
+.left_bg
+  position absolute
+  left 0
+  top 111px
+  width 34px
+  height 839px
+  background center / 100% url('../../images/bg-left.png') no-repeat
+.right_bg
+  position absolute
+  right 0
+  top 111px
+  width 34px
+  height 839px
+  background center / 100% url('../../images/bg-right.png') no-repeat
+.button_bg
+  position absolute
+  left 0
+  bottom 0
   width 100%
+  height 40px
+  background center / 100% url('../../images/bg-button.png') no-repeat
+.n_body_container
+  width 100%
+  height 100%
+  padding 125px 30px 50px 30px
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+.n_left_wraper
+  width 24%
+  height 100%
+.n_right_wraper
+  width 24%
+  height 100%
+.n-center_wraper
+  width calc(52% - 40px)
+  height 100%
+  padding-top 5px
+  background center / 100% 100% url('../../images/bg-center.jpg') no-repeat
+.w_wraper
+  width 100%
+  height 100%
+.item_wraper
+  width 100%
+  height calc((100% - 40px) / 3)
+  margin-bottom 20px
+  &:last-child
+    margin-bottom 0
+.title_wraper
+  width 100%
+  height 42px
+  background center / 100% 100% url('../../images/bg-title_2.png') no-repeat
+  padding 6px 44px
+  p
+    font-size 24px
+    font-family: 'YouSheBiaoTiHei';
+    font-weight: 400;
+    color: transparent;
+    line-height 24px
+    background: linear-gradient(0deg, #F9FEFF 0%, #F5FCFF 53.3154296875%, #BAE9FF 100%);
+    -webkit-background-clip: text;
+    background-clip: text;
+.content_wraper
+  width 100%
+  height calc(100% - 42px)
+  padding 20px
+  background center / 100% 100% url('../../images/bg-m_2.png') no-repeat
+.pie_wraper_2
+  position absolute
+  top 17px
+  left 0
+  width 222px
+  height 222px
+  background center / 100% auto url('../../images/pie-bg_2.png') no-repeat
+.pie_legend
+  width calc(100% - 200px)
+  height 100%
+  margin-left 200px
+  display flex
+  flex-direction row
+  justify-content space-between
+  align-items center
+  flex-wrap: wrap
+.pie_legend_item
+  width 50%
   padding 0 0px 2px 20px
 .pie_legend_item_bg_1
-  background top left / 18px auto url('../../../../images/fk_1.png') no-repeat
+  background top left / 18px auto url('../../images/fk_1.png') no-repeat
 .pie_legend_item_bg_2
-  background top left / 18px auto url('../../../../images/fk_2.png') no-repeat
+  background top left / 18px auto url('../../images/fk_2.png') no-repeat
 .pie_legend_item_bg_3
-  background top left / 18px auto url('../../../../images/fk_3.png') no-repeat
+  background top left / 18px auto url('../../images/fk_3.png') no-repeat
 .pie_legend_item_bg_4
-  background top left / 18px auto url('../../../../images/fk_4.png') no-repeat
-.pie_legend_item_bg_5
-  background top left / 18px auto url('../../../../images/fk_5.png') no-repeat
-.pie_legend_item_bg_6
-  background top left / 18px auto url('../../../../images/fk_6.png') no-repeat
-.pie_legend_item_bg_7
-  background top left / 18px auto url('../../../../images/fk_7.png') no-repeat
+  background top left / 18px auto url('../../images/fk_5.png') no-repeat
 .pie_legend_txt_1
-  font-size: 12px;
-  line-height: 14px
+  font-size: 16px;
+  line-height: 16px
   font-family: 'SourceHanSansCN-Regular';
   color: #9BB9DD;
-  word-wrap: break-word;
+  margin-bottom 8px
 .pie_legend_txt_wraper
-  _wh(100%, 18px)
-  _fj(row)
+  width 100%
 .pie_legend_txt_2
-  font-size 18px
-  line-height: 18px
+  font-size 20px
+  line-height: 20px
   font-family: 'YouSheBiaoTiHei'
   color: transparent;
   background: linear-gradient(0deg, #E5F2FC 0%, #CDEAFC 53.3154296875%, #A0DBFC 100%);
   filter: drop-shadow(rgba(5,28,55,0.42) 0px 2px 8px);
   -webkit-background-clip: text;
   background-clip: text;
+  margin-bottom 8px
 .pie_legend_txt_3
-  font-size: 14px;
-  line-height: 18px
+  font-size: 16px;
+  line-height: 16px
   font-family: 'SourceHanSansCN-Regular';
   color: #9BB9DD;
   opacity: 0.5;
-.pie_inner_1
-    _wh(100%, 100%)
-    background center / 100% url('../../../../images/pie_1.png') no-repeat
-    _fj(,center)
-    p
-      font-size: 36px;
-      line-height 36px
-      font-family: 'YouSheBiaoTiHei';
-      font-weight: 400;
-      color: transparent;
-      text-align: center;
-      background: linear-gradient(0deg, #F9FEFF 0%, #F9FEFF 53.3154296875%, #B5E8FF 100%);
-      filter: drop-shadow(rgba(5,28,55,0.42) 0px 2px 8px)
-      -webkit-background-clip: text;
-      background-clip: text;
-      span
-        font-size 20px
-        line-height 20px
-.light_1
-    position absolute
-    top 47px
-    left -9px
-    _wh(224px, 135px)
-    background center / 100% url('../../../../images/light_1.png') no-repeat
-.pie_title_1
-    position absolute
-    top 204px
-    _wh(calc(100% - 55px), 16px)
-    _font(16px, 16px, #9BB9DD,,)
-    font-family: 'SourceHanSansCN-Regular'
-.module_two_item_wraper
-    _fj(row)
-    _wh(100%, 48px)
-    margin-bottom 14px
+.content_wraper_1
+  padding-bottom: 0
+  .echart_wraper
+    height calc(100% + 21px)
+.scroll_wrap
+    width 100%
+    height 100%
+    padding 20px 20px 5px 20px
+.scroll_tab_1
+  width 100%
+  height 38px
+  background left center / auto 100% url('../../images/table-bg_1.png') no-repeat
+  li
+    float left
+    width 10%
+    font-size 16px;
+    line-height 38px
+    color #AFBED8
+    text-align center
+    font-family: 'SourceHanSansCN-Regular';
+    font-weight: bold;
+    font-style: italic;
+    word-wrap break-word
+    word-break break-all
+    white-space nowrap
+    padding 0 5px
+    overflow hidden
+    box-sizing border-box
     &:nth-child(1)
-      .module_two_item_content
-          background center / 100% url('../../../../images/gl-bg_1.png') no-repeat
+      width 20%
     &:nth-child(2)
-      .module_two_item_content
-          background center / 100% url('../../../../images/gl-bg_2.png') no-repeat
+      width 35%
     &:nth-child(3)
-      .module_two_item_content
-          background center / 100% url('../../../../images/gl-bg_3.png') no-repeat
-.module_two_item_lable
-  _wh(64px, 48px)
-  _font(16px, 48px, #9BB9DD,,left)
-  font-family: 'SourceHanSansCN-Regular'
-.module_two_item_content
-  _fj(row)
-  _wh(calc(100% - 64px), 48px)
-.module_two_item_p_l
-  _wh(50%, 100%)
-  padding-left 20px
-  font-size 24px
-  line-height 48px
-  font-family: 'YouSheBiaoTiHei'
-  color: transparent;
-  background: linear-gradient(0deg, #F9FEFF 0%, #E8F8FF 53.3154296875%, #E8F8FF 100%);
-  filter: drop-shadow(rgba(5,28,55,0.42) 0px 2px 8px);
-  -webkit-background-clip: text;
-  background-clip: text;
-.module_two_item_p_r
-  _wh(50%, 100%)
-  padding-right 10px
-  _font(16px, 48px, #fff,,right)
-  font-family: 'YouSheBiaoTiHei'
-  opacity: 0.3;
-.module_three_text
-  _font(16px, 32px, #fff,,left)
-  font-family: 'SourceHanSansCN-Regular'
-  span
-    color #1980EA
-    font-family: 'YouSheBiaoTiHei'
+      width 20%
+    &:nth-child(4)
+      width 25%
+    .state
+      display block
+      width 20px
+      height 14px
+    .state_name
+      width calc(100% - 20px)
+.scroll_container_1
+  width 100%
+  height calc(100% - 38px)
+  overflow hidden
+.scroll-ul_1
+  li
+    width 100%
+    height 40px
+    border-bottom 1px solid rgba(122,159,224,0.17)
+    &:nth-child(even)
+      background rgba(31,46,73,0.7)
+    &:nth-child(odd)
+      background rgba(31,46,73,0.55)
+    .scroll-ul_1_div
+      float left
+      width 10%
+      height 39px
+      display flex
+      flex-direction row
+      justify-content center
+      align-items center
+      flex-wrap nowrap
+      font-size 16px
+      line-height 16px
+      color #B2BBD7
+      text-align center
+      font-family: 'SourceHanSansCN-Regular';
+      font-style: italic;
+      word-wrap break-word
+      word-break break-all
+      // white-space nowrap
+      padding 0 5px
+      overflow hidden
+      &:nth-child(1)
+        width 20%
+      &:nth-child(2)
+        width 35%
+      &:nth-child(3)
+        width 20%
+      &:nth-child(4)
+        width 25%
+      .state
+        display block
+        width 20px
+        height 14px
+      .state_name
+        width 100%
+        height 20px
 </style>
diff --git a/src/pages/modules/home/left/index.vue b/src/pages/modules/home/left/index.vue
deleted file mode 100644
index 7f326bf..0000000
--- a/src/pages/modules/home/left/index.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<template>
-    <div class="n_container">
-        <!-- <div class="style_block" style="left: calc(100% / 3);top:0;"></div>
-        <div class="style_block" style="background: green;left: calc(100% / 3);top:calc(100% / 3);"></div>
-        <div class="style_block" style="left: calc(100% / 3);bottom: 0"></div>
-        <div class="style_block" style="background: green;left: calc(200% / 3);top:0;"></div>
-        <div class="style_block" style="left: calc(200% / 3);top:calc(100% / 3);"></div>
-        <div class="style_block" style="background: blue;left: calc(200% / 3);bottom: 0"></div>
-        <div class="style_block" style="background: yellow;top: calc(100% / 3);bottom: 0"></div> -->
-        <div class="n_header">
-            <div class="n_header_h1">
-                <h1>生产数据</h1>
-            </div>
-            <div class="n_header_h2">
-                <h2>辽宁晟华耐火材料有限公司</h2>
-            </div>
-        </div>
-        <div class="left_bg"></div>
-        <div class="button_bg"></div>
-        <div class="n_body_container">
-            <div class="n_left_wraper">
-                <left-page></left-page>
-            </div>
-            <div class="n_right_wraper">
-                <right-page></right-page>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-import leftPage from './left.vue'
-import rightPage from './right.vue'
-export default {
-  components: {
-    leftPage,
-    rightPage
-  }
-}
-</script>
-
-<style lang="stylus" scoped>
-.n_container
-    position relative
-    width 100%
-    height 100%
-    background center / 100% url('../../../../images/bg-home_left.jpg') no-repeat
-    overflow hidden
-.n_header
-    position absolute
-    left 0
-    top 0
-    width 100%
-    height 181px
-    background center / 100% url('../../../../images/bg-top_left.png') no-repeat
-.n_header_h1
-    width: 100%;
-    height: 100%;
-    padding-top 26px
-    h1
-        font-size: 60px;
-        font-family: 'YouSheBiaoTiHei';
-        font-weight: 400;
-        color: transparent;
-        line-height: 44px;
-        opacity: 0.89;
-        letter-spacing 18px
-        background: linear-gradient(0deg, #AAD0F6 0%, #D7E7F5 53.3154296875%, #E0EAF6 100%);
-        filter: drop-shadow(#092F6D 1px 4px 1px);
-        -webkit-background-clip: text;
-        background-clip: text;
-        text-align right
-        margin-right -9px
-.n_header_h2
-    position absolute
-    top 18px
-    left 29px
-    width 562px
-    height 31px
-    h2
-        font-size: 42px;
-        font-family: 'YouSheBiaoTiHei';
-        font-weight: 400;
-        color: transparent;
-        line-height: 29px;
-        background: linear-gradient(0deg, #B6C3D3 0%, #E3E9F2 53.3154296875%, #FEFEFE 100%);
-        -webkit-background-clip: text;
-        background-clip: text;
-.left_bg
-    position absolute
-    left 0
-    top 111px
-    width 34px
-    height 839px
-    background center / 100% url('../../../../images/bg-left.png') no-repeat
-.button_bg
-    position absolute
-    left 0
-    bottom 0
-    width 100%
-    height 46px
-    background center / 100% url('../../../../images/bg-button_left.png') no-repeat
-.n_body_container
-    width 100%
-    height 100%
-    padding 125px 0 50px 50px
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-.n_left_wraper
-    width 935px
-    height 100%
-.n_right_wraper
-    width calc(100% - 965px)
-    height 100%
-    padding-top 5px
-</style>
diff --git a/src/pages/modules/home/left/right.vue b/src/pages/modules/home/left/right.vue
deleted file mode 100644
index 2facb0c..0000000
--- a/src/pages/modules/home/left/right.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<template>
-    <div class="right_wraper"></div>
-</template>
-
-<style lang="stylus" scoped>
-@import '~@style/mixin'
-.right_wraper
-    _wh(100%, 100%)
-    background center / 100% 100% url('../../../../images/bg-center_left.jpg') no-repeat
-</style>
diff --git a/src/pages/modules/home/right/index.vue b/src/pages/modules/home/right/index.vue
deleted file mode 100644
index 6778103..0000000
--- a/src/pages/modules/home/right/index.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<template>
-    <div class="n_container">
-        <div class="n_header">
-            <div class="n_header_h1">
-                <h1>控制中心</h1>
-            </div>
-            <v-time></v-time>
-        </div>
-        <div class="right_bg"></div>
-        <div class="button_bg"></div>
-        <div class="n_body_container">
-            <div class="n_left_wraper">
-                <left-page></left-page>
-            </div>
-            <div class="n_right_wraper">
-                <right-page></right-page>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-import leftPage from './left.vue'
-import rightPage from './right.vue'
-import vTime from '@components/time.vue'
-export default {
-  components: {
-    leftPage,
-    rightPage,
-    vTime
-  }
-}
-</script>
-
-<style lang="stylus" scoped>
-.n_container
-    position relative
-    width 100%
-    height 100%
-    background center / 100% url('../../../../images/bg-home_right.jpg') no-repeat
-    overflow hidden
-.n_header
-    position absolute
-    left 0
-    top 0
-    width 100%
-    height 181px
-    background center / 100% url('../../../../images/bg-top_right.png') no-repeat
-.n_header_h1
-    width: 100%;
-    height: 100%;
-    padding-top 26px
-    h1
-        font-size: 60px;
-        font-family: 'YouSheBiaoTiHei';
-        font-weight: 400;
-        color: transparent;
-        line-height: 44px;
-        opacity: 0.89;
-        letter-spacing 18px
-        background: linear-gradient(0deg, #AAD0F6 0%, #D7E7F5 53.3154296875%, #E0EAF6 100%);
-        filter: drop-shadow(#092F6D 1px 4px 1px);
-        -webkit-background-clip: text;
-        background-clip: text;
-        text-align left
-        padding-left 9px
-.right_bg
-    position absolute
-    right 0
-    top 111px
-    width 34px
-    height 839px
-    background center / 100% url('../../../../images/bg-right.png') no-repeat
-.button_bg
-    position absolute
-    left 0
-    bottom 0
-    width 100%
-    height 46px
-    background center / 100% url('../../../../images/bg-button_right.png') no-repeat
-.n_body_container
-    width 100%
-    height 100%
-    padding 125px 50px 50px 0
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-.n_left_wraper
-    width calc(100% - 965px)
-    height 100%
-    padding-top 5px
-.n_right_wraper
-    width 935px
-    height 100%
-</style>
diff --git a/src/pages/modules/home/right/left.vue b/src/pages/modules/home/right/left.vue
deleted file mode 100644
index 0e2b8fb..0000000
--- a/src/pages/modules/home/right/left.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<template>
-    <div class="left_wraper">
-        <div class="table_wraper_1">
-          <div class="scroll_wrap">
-            <div class="scroll_title">
-              <p>生产完成</p>
-            </div>
-            <div class="scroll_container_1">
-              <vue-seamless-scroll :data="productReport" :class-option="defaultOption1">
-                <ul class="scroll-ul_1">
-                  <li v-for="(e, i) in productReport" :key="i">
-                  <div class="scroll-ul_1_div">{{e.create_time}}</div>
-                  <div class="scroll-ul_1_div">{{e.material_code}}</div>
-                  <div class="scroll-ul_1_div">{{e.number}}</div>
-                  </li>
-                </ul>
-              </vue-seamless-scroll>
-            </div>
-          </div>
-        </div>
-        <div class="table_wraper_2">
-          <div class="scroll_wrap">
-            <div class="scroll_title">
-              <p>设备状态</p>
-            </div>
-            <div class="scroll_container_1">
-              <vue-seamless-scroll :data="deviceReport" :class-option="defaultOption1">
-                <ul class="scroll-ul_1 scroll-ul_2">
-                  <li v-for="(e, i) in deviceReport" :key="i">
-                  <div class="scroll-ul_1_div">{{e.failure_time}}</div>
-                  <div class="scroll-ul_1_div">{{e.device_code}}</div>
-                  <div class="scroll-ul_1_div">
-                    <span class="state" :class="'state_' + e.failure_info"></span>
-                    <p class="state_name">{{['关机', '待机', '生产中', '故障'][Number(e.failure_info)]}}</p>
-                  </div>
-                  </li>
-                </ul>
-              </vue-seamless-scroll>
-            </div>
-          </div>
-        </div>
-    </div>
-</template>
-
-<script>
-// import { homepageEquipment } from '@js/mork2.js'
-import { homepageEquipment } from '@js/getData2.js'
-export default {
-  data () {
-    return {
-      interTime: this.$store.getters.setTime,
-      timer: null,
-      productReport: [],
-      deviceReport: []
-    }
-  },
-  computed: {
-    defaultOption1 () {
-      return {
-        step: 0.4, // 数值越大速度滚动越快
-        limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
-        hoverStop: true, // 是否开启鼠标悬停stop
-        direction: 1, // 0向下 1向上 2向左 3向右
-        openWatch: true, // 开启数据实时监控刷新dom
-        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
-        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
-        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
-      }
-    }
-  },
-  created () {
-    this._homepageEquipment()
-    this.refresh()
-  },
-  destroyed () {
-    clearInterval(this.timer)
-  },
-  methods: {
-    refresh () {
-      this.timer = setInterval(() => {
-        this._homepageEquipment()
-      }, this.interTime)
-    },
-    async _homepageEquipment () {
-      let res = await homepageEquipment()
-      this.productReport = [...res.productReport]
-      this.deviceReport = [...res.deviceReport]
-    }
-  }
-}
-</script>
-
-<style lang="stylus" scoped>
-@import '~@style/mixin'
-.left_wraper
-    position relative
-    _wh(100%, 100%)
-    background center / 100% 100% url('../../../../images/bg-center_right.jpg') no-repeat
-.table_wraper_1
-  position absolute
-  top 678px
-  right 408px
-  _wh(358px, 195px)
-.table_wraper_2
-  position absolute
-  top 678px
-  right 30px
-  _wh(358px, 195px)
-.scroll_wrap
-    _wh(100%, 100%)
-.scroll_title
-  _wh(100%, 31px)
-  background center / 100% 100% url('../../../../images/bg-title_3.png') no-repeat
-  padding 8px 8px 0 39px
-  p
-    font-size 20px
-    font-family: 'YouSheBiaoTiHei';
-    font-style: italic;
-    color: transparent;
-    line-height 20px
-    background: linear-gradient(0deg, #F9FEFF 0%, #F5FCFF 53.3154296875%, #BAE9FF 100%);
-    -webkit-background-clip: text;
-    background-clip: text;
-.scroll_container_1
-  width 100%
-  height calc(100% - 31px)
-  overflow hidden
-.scroll-ul_1
-  li
-    _wh(100%, 40px)
-    border-bottom 1px solid rgba(122,159,224,0.17)
-    background-color rgba(31,46,73,0.9)
-    opacity: 0.9
-    .scroll-ul_1_div
-      float left
-      height 40px
-      _fj(row, center)
-      _font(16px, 16px, #B2BBD7,,center)
-      font-family: 'SourceHanSansCN-Regular';
-      font-style: italic;
-      word-wrap break-word
-      word-break break-all
-      // white-space nowrap
-      padding 0 5px
-      overflow hidden
-      &:nth-child(1)
-        width 29%
-      &:nth-child(2)
-        width 51%
-      &:nth-child(3)
-        width 20%
-      .state
-        display block
-        _wh(20px, 14px)
-      .state_name
-        width calc(100% - 20px)
-.scroll-ul_2
-  li
-    .scroll-ul_1_div
-      &:nth-child(1)
-        width 47%
-      &:nth-child(2)
-        width 30%
-      &:nth-child(3)
-        width 23%
-.state_0
-  background center / 100% 100% url('../../../../images/state_0.png') no-repeat
-.state_1
-  background center / 100% 100% url('../../../../images/state_1.png') no-repeat
-.state_2
-  background center / 100% 100% url('../../../../images/state_2.png') no-repeat
-.state_3
-  background center / 100% 100% url('../../../../images/state_3.png') no-repeat
-</style>
diff --git a/src/pages/modules/home/right/right.vue b/src/pages/modules/home/right/right.vue
deleted file mode 100644
index d665733..0000000
--- a/src/pages/modules/home/right/right.vue
+++ /dev/null
@@ -1,1025 +0,0 @@
-<template>
-    <div class="right_wraper">
-        <div class="item_wraper flexbetween">
-            <div class="l_item_wraper">
-                <div class="title_wraper">
-                    <p>设备产能利用</p>
-                </div>
-                <div class="content_wraper">
-                  <div class="echart_wraper">
-                      <div id="new_home_echart_6" style="width: 100%; height: 100%;"></div>
-                  </div>
-                </div>
-            </div>
-            <div class="l_item_wraper">
-                <div class="title_wraper">
-                    <p>设备运行统计</p>
-                </div>
-                <div class="content_wraper relative">
-                  <div class="pie_wraper_2">
-                    <div class="echart_wraper">
-                      <div id="new_home_echart_7" style="width: 100%; height: 100%;"></div>
-                    </div>
-                  </div>
-                  <div class="pie_legend">
-                    <div class="pie_legend_item" v-for="(e, i) in stateStatistics.fourState" :key="i" :class="'pie_legend_item_bg_' + (i + 1)">
-                      <p class="pie_legend_txt_1">{{ e.stateName }}</p>
-                      <div class="pie_legend_txt_wraper">
-                        <p class="pie_legend_txt_2">{{ e.status }}</p>
-                        <p class="pie_legend_txt_3">{{ e.rate }}</p>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-            </div>
-        </div>
-        <div class="item_wraper flexbetween">
-            <div class="l_item_wraper">
-                <div class="title_wraper">
-                    <p>工序设备状态</p>
-                </div>
-                <div class="content_wraper">
-                  <div class="echart_wraper">
-                      <div id="new_home_echart_8" style="width: 100%; height: 100%;"></div>
-                  </div>
-                </div>
-            </div>
-            <div class="l_item_wraper">
-                <div class="title_wraper">
-                    <p>30天故障-TOP10</p>
-                </div>
-                <div class="content_wraper content_wraper_1">
-                  <div class="echart_wraper">
-                      <div id="new_home_echart_9" style="width: 100%; height: 100%;"></div>
-                  </div>
-                </div>
-            </div>
-        </div>
-        <div class="item_wraper">
-            <div class="title_wraper">
-                <p>设备工单生产</p>
-            </div>
-            <div class="content_wraper">
-              <div class="scroll_wrap">
-                <ul class="scroll_tab_1">
-                  <li>工序</li>
-                  <li>设备号</li>
-                  <li>设备名称</li>
-                  <li>状态</li>
-                  <li>生产工单</li>
-                  <li>BOM号</li>
-                  <li>物料</li>
-                  <li>数量</li>
-                  <li>开始时间</li>
-                </ul>
-                <div class="scroll_container_1">
-                  <vue-seamless-scroll :data="deviceWorkOrder" :class-option="defaultOption1">
-                    <ul class="scroll-ul_1">
-                      <li v-for="(e, i) in deviceWorkOrder" :key="i">
-                      <div class="scroll-ul_1_div">{{e.process}}</div>
-                      <div class="scroll-ul_1_div">{{e.deviceCode}}</div>
-                      <div class="scroll-ul_1_div">{{e.deviceName}}</div>
-                      <div class="scroll-ul_1_div">
-                        <span class="state" :class="'state_' + e.status"></span>
-                        <p class="state_name">{{['关机', '待机', '生产中', '故障'][Number(e.status)]}}</p>
-                      </div>
-                      <div class="scroll-ul_1_div">{{e.workOrder}}</div>
-                      <div class="scroll-ul_1_div">{{e.bom}}</div>
-                      <div class="scroll-ul_1_div">{{e.material}}</div>
-                      <div class="scroll-ul_1_div">{{e.qty}}</div>
-                      <div class="scroll-ul_1_div">{{e.startTime}}</div>
-                      </li>
-                    </ul>
-                  </vue-seamless-scroll>
-                </div>
-              </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-// import { homepageDataRight } from '@js/mork2.js'
-import { homepageDataRight } from '@js/getData2.js'
-import bg1 from '@img/bg1.png'
-import bg2 from '@img/bg2.png'
-import bg3 from '@img/bg3.png'
-import bg4 from '@img/bg4.png'
-import pointerImg from '@img/pointer.png'
-export default {
-  data () {
-    return {
-      interTime: this.$store.getters.setTime,
-      timer: null,
-      chart7Timer: null,
-      chart9Timer: null,
-      capacityRate: [], // 设备产能利用
-      stateStatistics: {}, // 设备运行统计
-      deviceWorkOrder: [], // 设备工单生产
-      areaDeviceStatus: [{process: '混料'}, {process: '压制'}, {process: '干燥'}, {process: '包装'}], // 工序设备状态
-      top10Of30Days: [] // 30天故障top10
-    }
-  },
-  computed: {
-    defaultOption1 () {
-      return {
-        step: 0.4, // 数值越大速度滚动越快
-        limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
-        hoverStop: true, // 是否开启鼠标悬停stop
-        direction: 1, // 0向下 1向上 2向左 3向右
-        openWatch: true, // 开启数据实时监控刷新dom
-        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
-        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
-        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
-      }
-    }
-  },
-  created () {
-    this._homepageDataRight()
-    this.refresh()
-  },
-  beforeDestroy () {
-    clearInterval(this.timer)
-    clearInterval(this.chart7Timer)
-    clearInterval(this.chart9Timer)
-  },
-  methods: {
-    refresh () {
-      this.timer = setInterval(() => {
-        this._homepageDataRight()
-      }, this.interTime)
-    },
-    async _homepageDataRight () {
-      let res = await homepageDataRight()
-      clearInterval(this.chart7Timer)
-      clearInterval(this.chart9Timer)
-      this.capacityRate = [...res.capacityRate]
-      res.stateStatistics.fourState.map(el => {
-        let rate = Number(el.status) * 100 / Number(res.stateStatistics.count)
-        rate = rate.toFixed(2) + '%'
-        this.$set(el, 'rate', rate)
-      })
-      this.stateStatistics = res.stateStatistics
-      this.deviceWorkOrder = [...res.deviceWorkOrder]
-      this.areaDeviceStatus.map((e, i) => {
-        if (i === 0) {
-          this.$set(e, 'running', res.areaDeviceStatus.mix.running)
-          this.$set(e, 'pausing', res.areaDeviceStatus.mix.pausing)
-          this.$set(e, 'shutdown', res.areaDeviceStatus.mix.shutdown)
-          this.$set(e, 'inTrouble', res.areaDeviceStatus.mix.inTrouble)
-        }
-        if (i === 1) {
-          this.$set(e, 'running', res.areaDeviceStatus.press.running)
-          this.$set(e, 'pausing', res.areaDeviceStatus.press.pausing)
-          this.$set(e, 'shutdown', res.areaDeviceStatus.press.shutdown)
-          this.$set(e, 'inTrouble', res.areaDeviceStatus.press.inTrouble)
-        }
-        if (i === 2) {
-          this.$set(e, 'running', res.areaDeviceStatus.dry.running)
-          this.$set(e, 'pausing', res.areaDeviceStatus.dry.pausing)
-          this.$set(e, 'shutdown', res.areaDeviceStatus.dry.shutdown)
-          this.$set(e, 'inTrouble', res.areaDeviceStatus.dry.inTrouble)
-        }
-        if (i === 3) {
-          this.$set(e, 'running', res.areaDeviceStatus.sort.running)
-          this.$set(e, 'pausing', res.areaDeviceStatus.sort.pausing)
-          this.$set(e, 'shutdown', res.areaDeviceStatus.sort.shutdown)
-          this.$set(e, 'inTrouble', res.areaDeviceStatus.sort.inTrouble)
-        }
-      })
-      this.top10Of30Days = [...res.top10Of30Days]
-      this.top10Of30Days.map((e, i) => {
-        this.$set(e, 'sort', i + 1)
-      })
-      this.top10Of30Days = this.top10Of30Days.reverse()
-      this.setEchart1()
-      this.setEchart2()
-      this.setEchart3()
-      this.setEchart4()
-    },
-    setEchart1 () {
-      let img = {pointerImg: pointerImg}
-      let cdata = []
-      this.capacityRate.map(el => {
-        cdata.push({name: el.device_name, data: Number(el.numerical).toFixed(0)})
-      })
-      let centerArr = [['25%', '38%'], ['75%', '38%'], ['25%', '89%'], ['75%', '89%']]
-      let topArr = ['39%', '39%', '90%', '90%']
-      let leftArr = ['0%', '50%', '0%', '50%']
-      let titleArr = []
-      let seriesArr = []
-      cdata.forEach((item, index) => {
-        titleArr.push({
-          text: item.name,
-          top: topArr[index],
-          left: leftArr[index],
-          textAlign: 'left',
-          textStyle: {
-            color: '#AEC3DC',
-            fontSize: 16
-          }
-        })
-        seriesArr.push({
-          name: item.name,
-          type: 'gauge',
-          radius: '63%',
-          startAngle: 180,
-          endAngle: 0,
-          min: 0,
-          max: 100,
-          splitNumber: 5,
-          center: centerArr[index],
-          pointer: {// 仪表盘指针
-            icon: 'image://' + img.pointerImg,
-            width: 24,
-            height: 88,
-            length: '90%',
-            offsetCenter: [0, 10]
-          },
-          axisLine: { // 坐标轴线
-            lineStyle: {
-              width: 10,
-              color: [
-                [1 / 5, '#67D470'],
-                [7 / 10, '#1980EA'],
-                [4 / 5, '#13448B'],
-                [1, '#324C66']
-              ]
-            }
-          },
-          axisLabel: {
-            show: true,
-            color: '#3A578D',
-            fontSize: 14,
-            fontFamily: 'SourceHanSansCN-Regular',
-            distance: -8
-          },
-          axisTick: {
-            show: true,
-            splitNumber: 5,
-            distance: 0,
-            lineStyle: {
-              color: '#fff', // 用颜色渐变函数不起作用
-              width: 1
-            },
-            length: -4
-          },
-          splitLine: {
-            show: true,
-            distance: 0,
-            lineStyle: {
-              color: '#fff',
-              width: 1
-            },
-            length: -12
-          },
-          title: {
-            show: false
-          },
-          detail: {
-            fontSize: 20,
-            fontFamily: 'YouSheBiaoTiHei',
-            color: '#D5F2FF',
-            align: 'right',
-            offsetCenter: ['100%', 15],
-            valueAnimation: true,
-            formatter: '{value}' + '%'
-          },
-          data: [{
-            value: item.data
-          }]
-        })
-        seriesArr.push({
-          type: 'gauge',
-          radius: '40%',
-          startAngle: 180,
-          endAngle: 0,
-          center: centerArr[index],
-          splitLine: { // 表盘上的轴线
-            show: false
-          },
-          axisLabel: { // 表盘上的刻度数值文字
-            show: false
-          },
-          axisTick: { // 表盘上的刻度线
-            show: false
-          },
-          axisLine: { // 坐标轴线
-            lineStyle: {
-              width: 16,
-              color: [
-                [1, '#20406A']
-              ]
-            }
-          },
-          z: 1
-        })
-      })
-      let option = {
-        grid: {
-          top: 55,
-          left: 0,
-          right: 0,
-          bottom: 0,
-          containLabel: true
-        },
-        title: titleArr,
-        series: seriesArr
-      }
-      if (document.getElementById('new_home_echart_6') == null) {
-        return
-      }
-      this.$echarts.dispose(document.getElementById('new_home_echart_6'))
-      let echart = this.$echarts.init(document.getElementById('new_home_echart_6'))
-      echart.setOption(option)
-      window.addEventListener('resize', () => {
-        echart.resize()
-      })
-    },
-    setEchart2 () {
-      let colors = ['#1980EA', '#67D470', '#B4C9EF', '#EF5252', '#BCBF5C', '#6d5edd', '#bf41bb']
-      let seriesData = this.stateStatistics.fourState
-      seriesData.map((el, i) => {
-        el.value = el.status
-        el.name = el.stateName
-      })
-      let total = this.stateStatistics.count
-      let option = {
-        color: colors,
-        grid: {
-          top: 0,
-          left: 0,
-          right: 0,
-          bottom: 0,
-          containLabel: true
-        },
-        title: {
-          text: `{a|总数}\n{b|${total}}`,
-          x: 'center',
-          y: '39%',
-          textStyle: {
-            rich: {
-              a: {
-                fontSize: 16,
-                lineHeight: 20,
-                color: '#A8C3E6',
-                fontFamily: 'SourceHanSansCN-Regular'
-              },
-              b: {
-                fontSize: 30,
-                lineHeight: 36,
-                color: '#DBE7F6',
-                fontFamily: 'YouSheBiaoTiHei'
-              }
-            }
-          }
-        },
-        series: [{
-          name: '设备运行统计',
-          type: 'pie',
-          radius: ['61%', '69%'],
-          center: ['50%', '50%'],
-          labelLine: {
-            show: false
-          },
-          tooltip: {
-            show: false
-          },
-          itemStyle: {
-            borderColor: 'RGBA(27, 58, 98, .5)',
-            borderWidth: 2
-          },
-          label: {
-            show: false
-          },
-          selectedMode: 'single',
-          selectedOffset: 20,
-          data: seriesData
-        }]
-      }
-      if (document.getElementById('new_home_echart_7') == null) {
-        return
-      }
-      this.$echarts.dispose(document.getElementById('new_home_echart_7'))
-      let echart = this.$echarts.init(document.getElementById('new_home_echart_7'))
-      echart.setOption(option)
-      // let bu = 0
-      // this.chart7Timer = setInterval(() => {
-      //   if (bu > seriesData.length - 1) {
-      //     bu = 0
-      //   }
-      //   echart.dispatchAction({
-      //     type: 'select', // 默认显示江苏的提示框
-      //     seriesIndex: 0, // 这行不能省
-      //     dataIndex: bu
-      //   })
-      //   bu++
-      // }, 2000)
-      window.addEventListener('resize', () => {
-        echart.resize()
-      })
-    },
-    setEchart3 () {
-      let barName = []
-      let barData1 = []
-      let barData2 = []
-      let barData3 = []
-      let barData4 = []
-      this.areaDeviceStatus.map(el => {
-        barName.push(el.process)
-        barData1.push(el.running)
-        barData2.push(el.pausing)
-        barData3.push(el.shutdown)
-        barData4.push(el.inTrouble)
-      })
-      let option = {
-        grid: {
-          top: 55,
-          left: 0,
-          right: 0,
-          bottom: 0,
-          containLabel: true
-        },
-        legend: {
-          icon: 'rect',
-          top: '0',
-          right: '0',
-          textStyle: {
-            color: '#9BB9DD',
-            fontSize: 16,
-            lineHeight: 16
-          },
-          itemGap: 30,
-          itemWidth: 8,
-          itemHeight: 8,
-          data: [{name: '运行', itemStyle: {color: '#1980EA'}}, {name: '待机', itemStyle: {color: '#67D470'}}, {name: '关机', itemStyle: {color: '#B4C9EF'}}, {name: '故障', itemStyle: {color: '#EF5252'}}]
-        },
-        xAxis: {
-          type: 'category',
-          axisTick: {
-            show: false
-          },
-          axisLine: {
-            show: true,
-            lineStyle: {
-              width: 1,
-              color: '#3C5787'
-            }
-          },
-          axisLabel: {
-            interval: 0,
-            color: '#7591B2',
-            fontSize: 16,
-            lineHeight: 16,
-            fontFamily: 'SourceHanSansCN-Regular',
-            margin: 10
-          },
-          data: barName
-        },
-        yAxis: {
-          type: 'value',
-          axisLine: {
-            show: false
-          },
-          splitNumber: 4,
-          axisTick: {
-            show: false
-          },
-          axisLabel: {
-            color: '#B5C5D4',
-            fontSize: 16,
-            fontFamily: 'SourceHanSansCN-Regular'
-          },
-          splitLine: {
-            show: true,
-            lineStyle: {
-              type: [4, 3],
-              color: '#455C86'
-            }
-          }
-        },
-        series: [
-          {
-            name: '运行',
-            type: 'pictorialBar',
-            symbolRepeat: 'fixed',
-            symbolMargin: 2,
-            symbol: 'rect',
-            symbolClip: true,
-            symbolSize: [9, 4],
-            symbolPosition: 'center',
-            symbolOffset: [-24, 0],
-            itemStyle: {
-              color: '#1980EA'
-            },
-            data: barData1
-          },
-          {
-            name: '待机',
-            type: 'pictorialBar',
-            symbolRepeat: 'fixed',
-            symbolMargin: 2,
-            symbol: 'rect',
-            symbolClip: true,
-            symbolSize: [9, 4],
-            symbolPosition: 'center',
-            symbolOffset: [-9, 0],
-            itemStyle: {
-              color: '#67D470'
-            },
-            data: barData2
-          },
-          {
-            name: '关机',
-            type: 'pictorialBar',
-            symbolRepeat: 'fixed',
-            symbolMargin: 2,
-            symbol: 'rect',
-            symbolClip: true,
-            symbolSize: [9, 4],
-            symbolPosition: 'center',
-            symbolOffset: [9, 0],
-            itemStyle: {
-              color: '#B4C9EF'
-            },
-            data: barData3
-          },
-          {
-            name: '故障',
-            type: 'pictorialBar',
-            symbolRepeat: 'fixed',
-            symbolMargin: 2,
-            symbol: 'rect',
-            symbolClip: true,
-            symbolSize: [9, 4],
-            symbolPosition: 'center',
-            symbolOffset: [24, 0],
-            itemStyle: {
-              color: '#EF5252'
-            },
-            data: barData4
-          }
-        ]
-      }
-      if (document.getElementById('new_home_echart_8') == null) {
-        return
-      }
-      this.$echarts.dispose(document.getElementById('new_home_echart_8'))
-      let echart = this.$echarts.init(document.getElementById('new_home_echart_8'))
-      echart.setOption(option)
-      window.addEventListener('resize', () => {
-        echart.resize()
-      })
-    },
-    setEchart4 () {
-      let ydata = []
-      let xdata = []
-      let total = 0
-      this.top10Of30Days.map(el => {
-        total = Math.max(total, Number(el.count))
-      })
-      let data = []
-      this.top10Of30Days.map(el => {
-        ydata.push(el.device_name)
-        xdata.push({name: el.device_name, value: el.count, sort: el.sort})
-        data.push({value: total, num: el.count})
-      })
-      let img = {
-        bg1: bg1,
-        bg2: bg2,
-        bg3: bg3,
-        bg4: bg4
-      }
-      let colorArray = [
-        {
-          top: '#537BCB',
-          bottom: '#ADC0E6'
-        },
-        {
-          top: '#537BCB',
-          bottom: '#ADC0E6'
-        },
-        {
-          top: '#537BCB',
-          bottom: '#ADC0E6'
-        },
-        {
-          top: '#537BCB',
-          bottom: '#ADC0E6'
-        },
-        {
-          top: '#537BCB',
-          bottom: '#ADC0E6'
-        },
-        {
-          top: '#537BCB',
-          bottom: '#ADC0E6'
-        },
-        {
-          top: '#537BCB',
-          bottom: '#ADC0E6'
-        },
-        {
-          top: '#6B4C43',
-          bottom: '#B8A590'
-        },
-        {
-          top: '#3261FB',
-          bottom: '#6BB5FB'
-        }, {
-          top: '#8C620F',
-          bottom: '#C7B51C'
-        }
-      ]
-      let option = {
-        grid: {
-          top: 13,
-          left: 0,
-          right: 0,
-          bottom: 0,
-          containLabel: true
-        },
-        xAxis: {
-          splitLine: {
-            show: false
-          },
-          axisLine: {
-            show: false
-          },
-          axisLabel: {
-            show: false
-          },
-          axisTick: {
-            show: false
-          }
-        },
-        yAxis: {
-          type: 'category',
-          data: ydata,
-          axisLine: {
-            show: false
-          },
-          axisTick: {
-            show: false
-          },
-          axisLabel: {
-            show: false
-          },
-          max: total
-        },
-        series: [{
-          type: 'bar',
-          showBackground: true,
-          backgroundStyle: {
-            color: '#FFFFFF',
-            borderWidth: 5
-          },
-          label: {
-            show: true,
-            position: [-2, -32],
-            formatter: (value) => {
-              let o = value.data
-              if (o.sort === 1) {
-                return '{one|' + 'TOP' + o.sort + '} {a|' + o.name + '}'
-              } else if (o.sort === 2) {
-                return '{two|' + 'TOP' + o.sort + '} {a|' + o.name + '}'
-              } else if (o.sort === 3) {
-                return '{three|' + 'TOP' + o.sort + '} {a|' + o.name + '}'
-              } else {
-                return '{four|' + 'TOP' + o.sort + '} {a|' + o.name + '}'
-              }
-            },
-            rich: {
-              // 第一名
-              one: {
-                backgroundColor: {
-                  image: img.bg1
-                },
-                color: '#fff',
-                width: 60,
-                height: 32,
-                fontSize: 16,
-                lineHeight: 16,
-                align: 'center',
-                fontFamily: 'YouSheBiaoTiHei'
-              },
-              // 第二名
-              two: {
-                backgroundColor: {
-                  image: img.bg2
-                },
-                color: '#fff',
-                width: 60,
-                height: 32,
-                fontSize: 16,
-                lineHeight: 16,
-                align: 'center',
-                fontFamily: 'YouSheBiaoTiHei'
-              },
-              // 第三名
-              three: {
-                backgroundColor: {
-                  image: img.bg3
-                },
-                color: '#fff',
-                width: 60,
-                height: 32,
-                fontSize: 16,
-                lineHeight: 16,
-                align: 'center',
-                fontFamily: 'YouSheBiaoTiHei'
-              },
-              four: {
-                backgroundColor: {
-                  image: img.bg4
-                },
-                color: '#fff',
-                width: 60,
-                height: 32,
-                fontSize: 16,
-                lineHeight: 16,
-                align: 'center',
-                fontFamily: 'YouSheBiaoTiHei'
-              },
-              a: {
-                color: '#AEC3DC',
-                height: 32,
-                fontSize: 16,
-                lineHeight: 16,
-                padding: [0, 0, 0, 7],
-                fontFamily: 'SourceHanSansCN-Regular'
-              }
-            }
-          },
-          barWidth: 3,
-          itemStyle: {
-            color: (params) => {
-              let num = colorArray.length
-              return {
-                type: 'linear',
-                colorStops: [
-                  {
-                    offset: 0,
-                    color: colorArray[params.dataIndex % num].bottom
-                  },
-                  {
-                    offset: 1,
-                    color: colorArray[params.dataIndex % num].top
-                  },
-                  {
-                    offset: 0,
-                    color: colorArray[params.dataIndex % num].bottom
-                  },
-                  {
-                    offset: 1,
-                    color: colorArray[params.dataIndex % num].top
-                  },
-                  {
-                    offset: 0,
-                    color: colorArray[params.dataIndex % num].bottom
-                  },
-                  {
-                    offset: 1,
-                    color: colorArray[params.dataIndex % num].top
-                  }
-                ]
-                // globalCoord: false
-              }
-            }
-          },
-          data: xdata
-        }, {
-          name: '背景',
-          type: 'bar',
-          barWidth: 3,
-          barGap: '-100%',
-          itemStyle: {
-            color: '#fff'
-          },
-          z: 1,
-          label: {
-            show: true,
-            position: 'insideTopRight',
-            offset: [0, -32],
-            formatter: (value) => {
-              return '{a|' + value.data.num + '}'
-            },
-            rich: {
-              a: {
-                height: 32,
-                fontSize: 20,
-                lineHeight: 20,
-                align: 'left',
-                fontFamily: 'YouSheBiaoTiHei',
-                color: '#E1F6FF'
-              }
-            }
-          },
-          data: data
-        }],
-        dataZoom: [
-          {
-            yAxisIndex: [0, 1], // 这里是从X轴的0刻度开始
-            show: false, // 是否显示滑动条，不影响使用
-            type: 'slider', // 这个 dataZoom 组件是 slider 型 dataZoom 组件
-            startValue: 9, // 从头开始。
-            endValue: 6 // 展示到第几个。
-          }
-        ]
-      }
-      if (document.getElementById('new_home_echart_9') == null) {
-        return
-      }
-      this.$echarts.dispose(document.getElementById('new_home_echart_9'))
-      let echart = this.$echarts.init(document.getElementById('new_home_echart_9'))
-      echart.setOption(option)
-      this.chart9Timer = setInterval(() => {
-        if (option.dataZoom[0].endValue === 0) {
-          option.dataZoom[0].endValue = 6
-          option.dataZoom[0].startValue = 9
-        } else {
-          option.dataZoom[0].endValue = option.dataZoom[0].endValue - 1
-          option.dataZoom[0].startValue = option.dataZoom[0].startValue - 1
-        }
-        echart.setOption(option)
-      }, 2000)
-      window.addEventListener('resize', () => {
-        echart.resize()
-      })
-    }
-  }
-}
-</script>
-
-<style lang="stylus" scoped>
-@import '~@style/mixin'
-.right_wraper
-    _wh(100%, 100%)
-.item_wraper
-    _wh(100%, calc((100% - 40px) / 3))
-    margin-bottom 20px
-    &:last-child
-        margin-bottom 0
-.l_item_wraper
-    _wh(calc(50% - 15.5px), 100%)
-    .title_wraper
-      background center / 100% url('../../../../images/bg-title_2.png') no-repeat
-    .content_wraper
-      padding 20px
-      background center / 100% url('../../../../images/bg-m_2.png') no-repeat
-.title_wraper
-    _wh(100%, 42px)
-    background center / 100% url('../../../../images/bg-title_1.png') no-repeat
-    padding 6px 44px
-    p
-      font-size 24px
-      font-family: 'YouSheBiaoTiHei';
-      font-weight: 400;
-      color: transparent;
-      line-height 24px
-      background: linear-gradient(0deg, #F9FEFF 0%, #F5FCFF 53.3154296875%, #BAE9FF 100%);
-      -webkit-background-clip: text;
-      background-clip: text;
-.content_wraper
-    _wh(100%, calc(100% - 42px))
-    background center / 100% url('../../../../images/bg-m_1.png') no-repeat
-.echart_wraper
-    _wh(100%, 100%)
-.scroll_wrap
-    _wh(100%, 100%)
-    padding 20px 20px 5px 20px
-.scroll_tab_1
-  _wh(100%, 38px)
-  background center / 100% url('../../../../images/table-bg_1.png') no-repeat
-  li
-    float left
-    width 10%
-    _font(16px,38px,#AFBED8,,center)
-    font-family: 'SourceHanSansCN-Regular';
-    font-weight: bold;
-    font-style: italic;
-    word-wrap break-word
-    word-break break-all
-    white-space nowrap
-    padding 0 5px
-    overflow hidden
-    box-sizing border-box
-    &:nth-child(1)
-      width 5%
-    &:nth-child(2)
-      width 12%
-    &:nth-child(3)
-      width 14%
-    &:nth-child(4)
-      width 9%
-    &:nth-child(5)
-      width 10%
-    &:nth-child(7)
-      width 19%
-    &:nth-child(9)
-      width 11%
-    .state
-      display block
-        _wh(20px, 14px)
-    .state_name
-      width calc(100% - 20px)
-.scroll_container_1
-  width 100%
-  height calc(100% - 38px)
-  overflow hidden
-.scroll-ul_1
-  li
-    _wh(100%, 40px)
-    border-bottom 1px solid rgba(122,159,224,0.17)
-    &:nth-child(even)
-      background rgba(31,46,73,0.7)
-    &:nth-child(odd)
-      background rgba(31,46,73,0.55)
-    .scroll-ul_1_div
-      float left
-      _wh(10%, 39px)
-      _fj(row, center)
-      _font(16px, 16px, #B2BBD7,,center)
-      font-family: 'SourceHanSansCN-Regular';
-      font-style: italic;
-      word-wrap break-word
-      word-break break-all
-      // white-space nowrap
-      padding 0 5px
-      overflow hidden
-      &:nth-child(1)
-        width 5%
-      &:nth-child(2)
-        width 12%
-      &:nth-child(3)
-        width 14%
-      &:nth-child(4)
-        width 9%
-      &:nth-child(5)
-        width 10%
-      &:nth-child(7)
-        width 19%
-      &:nth-child(9)
-        width 11%
-      .state
-        display block
-        _wh(20px, 14px)
-      .state_name
-        width calc(100% - 20px)
-.pie_wraper_2
-    position absolute
-    top 17px
-    left 0
-    _wh(222px, 222px)
-    background center / 100% auto url('../../../../images/pie-bg_2.png') no-repeat
-.pie_legend
-  _wh(calc(100% - 200px), 100%)
-  margin-left 200px
-  _fj(row,)
-  flex-wrap: wrap
-.pie_legend_item
-  width 50%
-  padding 0 0px 2px 20px
-.pie_legend_item_bg_1
-  background top left / 18px auto url('../../../../images/fk_1.png') no-repeat
-.pie_legend_item_bg_2
-  background top left / 18px auto url('../../../../images/fk_2.png') no-repeat
-.pie_legend_item_bg_3
-  background top left / 18px auto url('../../../../images/fk_3.png') no-repeat
-.pie_legend_item_bg_4
-  background top left / 18px auto url('../../../../images/fk_5.png') no-repeat
-.pie_legend_item_bg_5
-  background top left / 18px auto url('../../../../images/fk_4.png') no-repeat
-.pie_legend_item_bg_6
-  background top left / 18px auto url('../../../../images/fk_6.png') no-repeat
-.pie_legend_item_bg_7
-  background top left / 18px auto url('../../../../images/fk_7.png') no-repeat
-.pie_legend_txt_1
-  font-size: 16px;
-  line-height: 16px
-  font-family: 'SourceHanSansCN-Regular';
-  color: #9BB9DD;
-  margin-bottom 8px
-.pie_legend_txt_wraper
-  width 100%
-.pie_legend_txt_2
-  font-size 20px
-  line-height: 20px
-  font-family: 'YouSheBiaoTiHei'
-  color: transparent;
-  background: linear-gradient(0deg, #E5F2FC 0%, #CDEAFC 53.3154296875%, #A0DBFC 100%);
-  filter: drop-shadow(rgba(5,28,55,0.42) 0px 2px 8px);
-  -webkit-background-clip: text;
-  background-clip: text;
-  margin-bottom 8px
-.pie_legend_txt_3
-  font-size: 16px;
-  line-height: 16px
-  font-family: 'SourceHanSansCN-Regular';
-  color: #9BB9DD;
-  opacity: 0.5;
-.content_wraper_1
-  padding-bottom: 0
-  .echart_wraper
-    height calc(100% + 21px)
-</style>
diff --git a/src/pages/modules/pinye.vue b/src/pages/modules/pinye.vue
deleted file mode 100644
index 79b84e1..0000000
--- a/src/pages/modules/pinye.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template>
-    <div class="box">
-        <div class="n_left_wraper">
-            <left-page></left-page>
-        </div>
-        <div class="n_left_wraper">
-            <right-page></right-page>
-        </div>
-    </div>
-</template>
-
-<script>
-import leftPage from './home/left/index.vue'
-import rightPage from './home/right/index.vue'
-export default {
-  components: {
-    leftPage,
-    rightPage
-  }
-}
-</script>
-
-<style lang="stylus" scoped>
-.box
-    width 100%
-    height 100%
-    display: flex
-    justify-content: space-between;
-.n_left_wraper
-    width 50%
-    height 100%
-</style>
diff --git a/src/router/index.js b/src/router/index.js
index 9989dff..2d89372 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,9 +2,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 
 const Setup = r => require.ensure([], () => r(require('@page/Setup')), 'Setup')
-const lIndex = r => require.ensure([], () => r(require('@page/modules/home/left/index')), 'newscreen')
-const rIndex = r => require.ensure([], () => r(require('@page/modules/home/right/index')), 'newscreen')
-const pinye = r => require.ensure([], () => r(require('@page/modules/pinye')), 'pinye')
+const home = r => require.ensure([], () => r(require('@page/modules/home')), 'home')
 
 Vue.use(Router)
 
@@ -20,16 +18,8 @@ export default new Router({
       component: Setup
     },
     {
-      path: '/lindex',
-      component: lIndex
-    },
-    {
-      path: '/rindex',
-      component: rIndex
-    },
-    {
-      path: '/pinye',
-      component: pinye
+      path: '/home',
+      component: home
     }
   ]
 })
