Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/smart-tool-ui

src/styles/index.scss

@@ -240,13 +240,22 @@ aside {
 .el-table--group::after, .el-table--border::after{
   width:0px ;
 }
-.el-table th {
+/*表格头部颜色*/
+.el-table thead th{
+  background-color: #203b5c;
+}
+/*表格内容颜色*/
+.el-table tbody th {
   color:#FFF;
   background-color: #172434;
 }
-.el-table tr {
+.el-table tbody tr {
   background-color: #172434;
 }
+/*表格斑马纹*/
+.el-table--striped .el-table__body tr.el-table__row--striped td{
+  background-color: #213246;
+}
 .el-input__inner{
   color:#FFF;
   background-color: #172434;

src/views/report/alarmDeviceCount/index.vue

@@ -52,7 +52,7 @@
       </normal-card>
       </div>
       <div class="charts">
-      <normal-card  shadow="always" bodyStyle="{height:'360px'}">
+      <normal-card  shadow="always" :bodyStyle="{height:'360px'}">
         <template slot="content">
 
              <div class="pie-left-content">
@@ -118,7 +118,7 @@
 
     <div class="datatable">
       <div class="table-title">{{tableTitle}}</div>
-      <el-table :data="tableData" row-key="id" fit border width="100%" >
+      <el-table :data="tableData" stripe row-key="id" fit border width="100%" >
           <el-table-column type="index" width="50" label="序号" align="center"/>
           <el-table-column label="设备名称" prop="name" align="center"/>
           <el-table-column label="出厂编号" prop="number" align="center" />

src/views/report/hydraulicCount/index.vue

@@ -31,7 +31,7 @@
       </el-row>
 
     <div class="charts">
-      <normal-card  shadow="always" bodyStyle="{height:'360px'}">
+      <normal-card  shadow="always" :bodyStyle="{height:'360px'}">
         <template slot="content">
             <div class="content-item-head">共有19台设备 <span class="triangle"></span> </div>
             <div class="pie-left-content">
@@ -55,7 +55,7 @@
 
     <div class="datatable">
       <div class="table-title">{{tableTitle}}</div>
-      <el-table :data="tableData" row-key="id" fit border width="100%" >
+      <el-table :data="tableData" stripe row-key="id" fit border width="100%" >
           <el-table-column type="index" width="50" label="序号" align="center"/>
           <!-- <el-table-column label="设备类型" prop="type" align="center"/> -->
           <el-table-column label="设备名称" prop="name" align="center"/>
@@ -181,6 +181,14 @@ export default {
           tooltip: {
             formatter: '设备数量<br/>{b0}：{c0}'
           },
+           toolbox: {
+            show: true,
+            feature: {
+              mark: { show: true },
+              saveAsImage: { show: true }
+            },
+            right:200,
+          },
           legend: {
             show: false
           },

src/views/report/maintainCount/index.vue

@@ -31,7 +31,7 @@
       </el-row>
 
     <div class="charts">
-      <normal-card  shadow="always" bodyStyle="{height:'400px'}">
+      <normal-card  shadow="always" :bodyStyle="{height:'400px'}">
         <template slot="content">
             <div class="content-box">
               
@@ -106,7 +106,7 @@
 
     <div class="datatable" v-if="tableA">
       <div class="table-title">{{tableTitle}}</div>
-      <el-table :data="tableData" row-key="id" fit border width="100%" >
+      <el-table :data="tableData" stripe row-key="id" fit border width="100%" >
           <el-table-column type="index" width="50" label="序号" align="center"/>
           <el-table-column label="设备名称" prop="name" align="center"/>
           <el-table-column label="出厂编号" prop="number" align="center" />
@@ -118,7 +118,7 @@
     </div>
     <div class="datatable" v-if="tableC">
       <div class="table-title">{{tableTitle}}</div>
-      <el-table :data="tableData" row-key="id" fit border width="100%" >
+      <el-table :data="tableData" stripe row-key="id" fit border width="100%" >
           <el-table-column type="index" width="50" label="序号" align="center"/>
           <el-table-column label="设备名称" prop="name" align="center"/>
           <el-table-column label="出厂编号" prop="number" align="center" />

src/views/report/workCount/index.vue

@@ -33,7 +33,7 @@
 
       <div class="charts">
       
-      <normal-card  shadow="always" bodyStyle="{height:'360px'}">
+      <normal-card  shadow="always" :bodyStyle="{height:'360px'}">
         <template slot="content">
               <div class="card-header">共计40台设备,共服务10个风场、20台风机、100次螺栓 <span class="card-header-triangle"></span> </div>
              <div class="pie-left-content">
@@ -96,7 +96,7 @@
 
     <div class="datatable">
       <div class="table-title">{{tableTitle}}</div>
-      <el-table :data="tableData" row-key="id" fit border width="100%" >
+      <el-table :data="tableData" stripe row-key="id" fit border width="100%" >
           <el-table-column type="index" width="50" label="序号" align="center"/>
           <el-table-column label="设备名称" prop="name" align="center"/>
           <el-table-column label="出厂编号" prop="number" align="center" />