Browse Source

切换分支

shaun-sheep 4 years ago
parent
commit
a9b7aff979

+ 140 - 108
src/components/point/report/tabControlTest.vue

@@ -1,15 +1,15 @@
 <template>
   <div id="controlTest">
     <div class="query-area" style="padding:10px;">
-      <el-select v-model="originName" placeholder="请选择数据源" clearable @change="changeHandleSelectOrigin">
+      <el-select v-model="originName" placeholder="请选择数据源" clearable @change="changeHandleSelect">
         <el-option
           v-for="(item,index) in selectAggregate.originList"
           :key="index"
           :label="item"
-          :value="index">
+          :value="item">
         </el-option>
       </el-select>
-      <el-select v-model="statusName" placeholder="请选择读写" clearable @change="changeHandleSelectStatus">
+      <el-select v-model="statusName" placeholder="请选择读写" clearable @change="changeHandleSelect">
         <el-option
           v-for="(item,index) in statusList"
           :key="index"
@@ -27,7 +27,7 @@
   <el-input type="textarea" :rows="2" v-model="instructions"/>
   <div style="text-align: right; margin-top: 10px">
     <el-button size="mini" type="text" @click="visible = false">取消</el-button>
-    <el-button type="primary" size="mini" @click="visible = false">确定</el-button>
+    <el-button type="primary" size="mini" @click="implement">确定</el-button>
   </div>
   <el-button slot="reference">执行</el-button>
 </el-popover>
@@ -37,11 +37,19 @@
     <!-- 数据表格 -->
     <div class="table-area">
       <el-table
-        :data="tableDate" style="width: 100%" height="calc(100% - 32px)" v-loading="loading"
-        :header-cell-style="headerStyle" @selection-change="handleSelectionChange"
+        :data="tableDate"
+        style="width: 100%"
+        height="calc(100% - 32px)"
+        v-loading="loading"
+        :header-cell-style="headerStyle"
+        @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection"/>
-        <el-table-column label="序号" type="index"/>
+        <el-table-column label="序号" type="index" align='center' width="55">
+          <template scope="scope">
+            {{ scope.$index + (currentPage - 1) * pageSize + 1 }}
+          </template>
+        </el-table-column>
         <el-table-column prop='DatasourceName' label='数据源名称' show-overflow-tooltip align='center'/>
         <el-table-column prop='ReadWrite' label='读写' show-overflow-tooltip align='center'/>
         <el-table-column prop='Meterfunc' label='整合ID' show-overflow-tooltip align='center'/>
@@ -62,123 +70,147 @@
 </template>
 
 <script>
-  import {pointTest, settingValue} from '@/api/scan/request'
+import {pointTest, settingValue} from '@/api/scan/request'
+
+export default {
+  name: "tabControlTest",
+  props: ['selectAggregate'],
+  data() {
+    return {
+      pageSizes: [10, 20, 50, 100],
+      pageSize: 50,
+      currentPage: 1,
+      total: 0,
+      tableDate: [],
+      visible: false,
+      //表格头样式
+      headerStyle: {
+        backgroundColor: '#e1e4e5',
+        color: '#2b2b2b',
+        lineHeight: '30px'
+      },
+      instructions: '',
+      originName: "",
+      statusName: '',//读写
+      statusList: ['读', '写', '读写'],  // 0:读 1:写 2:读写
+      loading: false,//加载
+    }
+  },
+  created() {
+    this.getSettingValue()
+  },
+  methods: {
+    //执行
+    implement() {
+      this.multipleSelection.map(i => {
+    //TODO
+      })
+      this.visible = false
+      console.log(this.multipleSelection)
+    },
+    //当前设定值
+    getSettingValue() {
+      let _this = this
+      _this.loading = true;
 
-  export default {
-    name: "tabControlTest",
-    props: ['selectAggregate'],
-    data() {
-      return {
-        pageSizes: [10, 20, 50, 100],
-        pageSize: 50,
-        currentPage: 1,
-        total: 0,
-        tableDate: [],
-        visible: false,
-        //表格头样式
-        headerStyle: {
-          backgroundColor: '#e1e4e5',
-          color: '#2b2b2b',
-          lineHeight: '30px'
-        },
-        instructions: '',
-        originName: "",
-        statusName: '',//读写
-        statusList: ['读', '写', '读写'],  // 0:读 1:写 2:读写
-        loading: false,//加载
+      let param = {
+        PageNumber: this.currentPage,
+        PageSize: this.pageSize
+      }, Filters = ''
+      if (_this.originName) {
+        Filters += `DatasourceName='${_this.originName}';`
       }
+      if (_this.statusName) {
+        Filters += `ReadWrite='${_this.statusName}';`
+      }
+      let index = Filters.lastIndexOf(';')
+      Filters = Filters.substring(0, index)
+      param.Filters = Filters !== '' ? Filters : undefined
+      settingValue(param, res => {
+        this.tableDate = res.Content
+        _this.total = res.Total
+        _this.loading = false;
+      })
+    },
+
+    //点位测试
+    getPointTest() {
+      pointTest({}, res => {
+        this.tableDate = res.Content
+
+      })
     },
-    created() {
+    changeHandleSelect() {
       this.getSettingValue()
     },
-    methods: {
-      //当前设定值
-      getSettingValue() {
-        settingValue({}, res => {
-          this.tableDate = res.Content
-        })
-      },
-
-      //点位测试
-      getPointTest() {
-        pointTest({}, res => {
-          this.tableDate = res.Content
 
-        })
-      },
-      changeHandleSelectOrigin(item) {
-        console.log(item)
-      },
-      changeHandleSelectStatus(item) {
-        console.log(item)
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-      //分页更换size
-      handleSizeChange(val) {
-        this.currentPage = 1;
-        this.pageSize = val;
-        this.getSettingValue()
-      },
-      //分页更换页
-      handleCurrentChange(val) {
-        this.currentPage = val;
-        this.getSettingValue()
-      },
-      //点击下载
-      downloads() {
-        let a = document.createElement('a')
-        a.href = '/pointconfig/datasource/pointset-present-download'
-        a.download = '控制测试'
-        a.click()
-        document.body.removeChild(a)
-      },
-    }
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    //分页更换size
+    handleSizeChange(val) {
+      this.currentPage = 1;
+      this.pageSize = val;
+      this.getSettingValue()
+    },
+    //分页更换页
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getSettingValue()
+    },
+    //点击下载
+    downloads() {
+      let a = document.createElement('a')
+      a.href = '/pointconfig/datasource/pointset-present-download'
+      a.download = '控制测试'
+      a.click()
+      document.body.removeChild(a)
+    },
   }
+}
 </script>
 
 <style lang="less" scoped>
-  #controlTest {
-    border-top: 5px solid #eee;
-    height: calc(100% - 5px);
-    width: 100%;
-    overflow: hidden;
-  }
+#controlTest {
+  border-top: 5px solid #eee;
+  height: calc(100% - 5px);
+  width: 100%;
+  overflow: hidden;
+}
 
-  .table-area {
-    height: calc(100% - 72px);
-    padding: 0px 10px 10px 10px;
-  }
+.table-area {
+  height: calc(100% - 72px);
+  padding: 0px 10px 10px 10px;
+}
 
-  .table-area i {
-    text-align: right;
-    font-size: 12px;
-    cursor: pointer;
-    float: right;
-  }
+.table-area i {
+  text-align: right;
+  font-size: 12px;
+  cursor: pointer;
+  float: right;
+}
 
-  .dialog-btn {
-    display: none;
-    height: 29px;
-  }
+.dialog-btn {
+  display: none;
+  height: 29px;
+}
 
-  /deep/ .el-drawer__body {
-    height: 90%;
-    overflow-y: auto;
-  }
+/deep/ .el-drawer__body {
+  height: 90%;
+  overflow-y: auto;
+}
 
-  /deep/ .el-table__body-wrapper tr:hover {
-    .dialog-btn {
-      display: inline;
-    }
+/deep/ .el-table__body-wrapper tr:hover {
+  .dialog-btn {
+    display: inline;
   }
+}
 
-  /deep/ .el-dialog__body {
-    padding-bottom: 20px;
-  }
+/deep/ .el-dialog__body {
+  padding-bottom: 20px;
+}
 
-  /deep/ .el-drawer__header > :first-child:focus {
-    outline: none;
-  }
+/deep/ .el-drawer__header > :first-child:focus {
+  outline: none;
+}
 </style>

+ 259 - 259
src/components/point/report/tabFunDetail.vue

@@ -2,7 +2,7 @@
   <div id="tabFunDetail">
     <!-- 查询 新增 -->
     <div class="query-area" style="padding:10px;">
-      <el-select v-model="originName" placeholder="请选择数据源" clearable @change="changeHandleSelectOrigin">
+      <el-select v-model="originName" placeholder="请选择数据源" clearable @change="changeHandleSelect">
         <el-option
           v-for="(item,index) in selectAggregate.originList"
           :key="index"
@@ -30,6 +30,9 @@
       <el-button @click="handleControl">控制测试</el-button>
         <i class="el-icon-refresh" style="cursor: pointer;padding: 0 15px" title="刷新" @click="getOverViewList"/>
         <i class="el-icon-download" style="cursor: pointer" @click="downloads" title="下载"/>
+<!--        <a class="el-icon-download" style="cursor: pointer"   href="/pointconfig/datasource/pointdetail-download"-->
+<!--           download="检测详情"title="下载"/>-->
+
       </span>
     </div>
     <!-- 数据表格 -->
@@ -39,49 +42,31 @@
         :header-cell-style="headerStyle"
         @row-click="handleClickRow"
       >
-        <el-table-column label="序号" type="index"/>
-        <el-table-column prop='Status' label='状态' show-overflow-tooltip header-align='center'>
+        <el-table-column label="序号" type="index" align='center' width="55">
+          <template scope="scope">
+            {{ scope.$index + (currentPage - 1) * pageSize + 1 }}
+          </template>
+        </el-table-column>
+        <el-table-column prop='Status' label='状态' show-overflow-tooltip align='center' width="45">
           <template slot-scope="scope">
-            <i class="el-icon-warning-outline" style="float:left;margin: 0 5px;color: red;font-size:18px;"></i>
+            <div v-if="scope.row.Status ==0" class="circular green"></div>
+            <div v-if="scope.row.Status ==1" class="circular yellow"></div>
+            <div v-else class="circular red"></div>
           </template>
         </el-table-column>
         <el-table-column prop='Meterfunc' label='整合ID' show-overflow-tooltip align='center'/>
         <el-table-column prop='Description' label='点位描述' show-overflow-tooltip align='center'/>
-        <!--          <template slot-scope="scope">-->
-        <!--            <el-button style="padding:7px 15px;font-size:15px;" @click="handleDrawer(scope.row, 0)">-->
-        <!--              <i class="el-icon-s-data"/></el-button>-->
-        <!--          </template>-->
         <el-table-column prop='Data.Data' label='data' show-overflow-tooltip align='center' style="position:relative;"/>
-        <!--          <template slot-scope="scope">-->
-        <!--            <div style="width:175px;display:inline-block;">-->
-        <!--              <span style="line-height:29px;">{{ scope.row.Data? (scope.row.Data.Data  || '&#45;&#45;'): '&#45;&#45;' }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>-->
-        <!--              <span style="line-height:29px;">{{ scope.row.Data? scope.row.Data.Time : '' }}</span>-->
-        <!--            </div>-->
-        <!--            <span style="width:55.33px;display:inline-block;padding-left:10px;">-->
-        <!--              <el-button class="dialog-btn" @click="refreshThisRow(scope.row)"><i-->
-        <!--                class="el-icon-refresh"></i></el-button>-->
-        <!--            </span>-->
-        <!--          </template>-->
         <el-table-column prop='Data.Time' label='data.Time' show-overflow-tooltip align='center'/>
-        <!--          <template slot-scope="scope">-->
-        <!--            <span style="display:inline-block;width:16px;line-height:29px;">{{ scope.row.RelatedPoint }}</span>-->
-        <!--            <span style="width:55.33px;display:inline-block;padding-left:10px;">-->
-        <!--              <el-button class="dialog-btn" v-if="scope.row.RelatedPoint" @click="handleDrawer(scope.row, 1)"><i-->
-        <!--                class="el-icon-coin"></i></el-button>-->
-        <!--            </span>-->
-        <!--          </template>-->
         <el-table-column prop='Data.Delay' label='延迟(s)' show-overflow-tooltip align='center'/>
-        <!--          <template slot-scope="scope">-->
-        <!--            <span style="display:inline-block;width:16px;line-height:29px;">{{ scope.row.RelatedInstance }}</span>-->
-        <!--            <span style="width:55.33px;display:inline-block;padding-left:10px;">-->
-        <!--              <el-button class="dialog-btn" v-if="scope.row.RelatedInstance" @click="handleDrawer(scope.row, 2)"><i-->
-        <!--                class="el-icon-coin"></i>-->
-        <!--              </el-button>-->
-        <!--            </span>-->
-        <!--          </template>-->
         <el-table-column prop='DatasourceName' label='数据源' show-overflow-tooltip align='center'/>
         <el-table-column prop='Method' label='获取方式' show-overflow-tooltip align='center'/>
-        <el-table-column prop='MeterFunc' label='查看曲线' show-overflow-tooltip align='center'/>
+        <el-table-column prop='MeterFunc' label='查看曲线' show-overflow-tooltip align='center'>
+          <template slot-scope="scope">
+            <el-button style="padding:7px 15px;font-size:15px;" @click="handleDrawer(scope.row, 0)">
+              <i class="el-icon-s-data"/></el-button>
+          </template>
+        </el-table-column>
         <el-table-column prop='Quality' label='质量评价' show-overflow-tooltip align='center'/>
 
       </el-table>
@@ -113,257 +98,272 @@
 </template>
 
 <script>
-  import {testDetail} from '@/api/scan/request'
-  import historyChart from './historyChart'
-  import dataSource from './dataSource'
-  import objectInstance from './objectInstance'
-  import addTabFunNum from './addTabFunNum'
-  import lStorage from '@/utils/localStorage'
-  import {mapGetters} from "vuex";
+import {testDetail} from '@/api/scan/request'
+import historyChart from './historyChart'
+import dataSource from './dataSource'
+import objectInstance from './objectInstance'
+import addTabFunNum from './addTabFunNum'
+import lStorage from '@/utils/localStorage'
+import {mapGetters} from "vuex";
 
-  export default {
-    /** 运行状态 */
-    // 0:正常 1:异常 2:停用 3:间接
+export default {
+  /** 运行状态 */
+  // 0:正常 1:异常 2:停用 3:间接
 
-    /** 启动状态 */
-    // 0:未启动 1:已启动
+  /** 启动状态 */
+  // 0:未启动 1:已启动
 
-    /** 状态 */
-    // 0:延迟<30min 1:延迟>30min 2:无数据
+  /** 状态 */
+  // 0:延迟<30min 1:延迟>30min 2:无数据
 
-    /** method */
-    // 0:订阅 1:推送 2:查询 3:其他
-    //   @ApiModelProperty(value = "获取方式")
+  /** method */
+  // 0:订阅 1:推送 2:查询 3:其他
+  //   @ApiModelProperty(value = "获取方式")
 
-    /** read-write */
-    // 0:读 1:写 2:读写
-    //   @ApiModelProperty(value = "读写模式"
-    data() {
-      return {
-        //表格头样式
-        headerStyle: {
-          backgroundColor: '#e1e4e5',
-          color: '#2b2b2b',
-          lineHeight: '30px'
-        },
-        // allTableData: [],//所有表格数据
-        tableData: [],
-        pageSizes: [10, 20, 50, 100],
-        pageSize: 50,
-        currentPage: 1,
-        total: 0,
-        loading: false,//加载
-        tabFunNum: null,//表号功能号
-        //抽屉
-        drawers: [
-          {drawer: false, direction: 'rtl', objId: ''},
-          {drawer: false, direction: 'rtl', objId: ''},
-          {drawer: false, direction: 'rtl', objId: '', value: ''},
-          {drawer: false, direction: 'rtl', objId: ''}
-        ],
-        originName: '',
-        statusName: '',
-        accessList: '',
-        statusList: [
-          {value: '0', label: '正常'},
-          {value: '1', label: '异常'},
-          {value: '2', label: '停用'},
-          {value: '3', label: '间接'}
-        ],
-        getAccessMethods: [
-          {value: '0', label: '推送'},
-          {value: '1', label: '订阅'},
-          {value: '2', label: '查询'},
-          {value: '3', label: '其他'}
-        ]
-      }
-    },
-    props: ['selectAggregate'],
-    methods: {
-      //控制测试
-      handleControl() {
-        this.$router.push({
-          path: "control"
-        })
-      },
-      //点击下载
-      downloads() {
-        let a = document.createElement('a')
-        a.href = '/pointconfig/datasource/pointdetail-download'
-        a.download = '检测详情'
-        a.click()
-        document.body.removeChild(a)
-      },
-      //抽屉处理
-      // handleDrawer(row, index) {
-      //   if (index == 2 || index == 1) {
-      //     //实例数量大于0才能打开
-      //     if ((row.RelatedInstance > 0 && index == 2) || (row.RelatedPoint > 0 && index == 1)) {
-      //       this.drawers[index].value = row.Data ? row.Data.Data : '';
-      //       this.drawers[index].objId = row.MeterFunc;
-      //       this.drawers[index].drawer = true;
-      //     }
-      //   } else {
-      //     if (index != 3)
-      //       this.drawers[index].objId = row.MeterFunc;
-      //     this.drawers[index].drawer = true;
-      //   }
-      // },
-      handleClickRow(row, column, event) {//点击表格行
-        lStorage.set('screen_data', {
-          path: this.$route.path,
-          data: {MeterFunc: row.MeterFunc, RelatedInstance: row.RelatedInstance}
-        })
+  /** read-write */
+  // 0:读 1:写 2:读写
+  //   @ApiModelProperty(value = "读写模式"
+  data() {
+    return {
+      //表格头样式
+      headerStyle: {
+        backgroundColor: '#e1e4e5',
+        color: '#2b2b2b',
+        lineHeight: '30px'
       },
-      //筛选
-      changeHandleSelectOrigin(item) {
-        this.getOverViewList()
-      },
-      changeHandleSelect(item) {
-        this.getOverViewList()
+      // allTableData: [],//所有表格数据
+      tableData: [],
+      pageSizes: [10, 20, 50, 100],
+      pageSize: 50,
+      currentPage: 1,
+      total: 0,
+      loading: false,//加载
+      tabFunNum: null,//表号功能号
+      //抽屉
+      drawers: [
+        {drawer: false, direction: 'rtl', objId: ''},
+        {drawer: false, direction: 'rtl', objId: ''},
+        {drawer: false, direction: 'rtl', objId: '', value: ''},
+        {drawer: false, direction: 'rtl', objId: ''}
+      ],
+      originName: '',
+      statusName: '',
+      accessList: '',
+      statusList: [
+        {value: '0', label: '正常'},
+        {value: '1', label: '异常'},
+        {value: '2', label: '停用'},
+        {value: '3', label: '间接'}
+      ],
+      getAccessMethods: [
+        {value: '0', label: '推送'},
+        {value: '1', label: '订阅'},
+        {value: '2', label: '查询'},
+        {value: '3', label: '其他'}
+      ]
+    }
+  },
+  props: ['selectAggregate'],
+  methods: {
+    //查看曲线
+    handleDrawer(row, index) {
 
-        console.log(item, 'item')
-      },
-      //获取统计数据
-      getOverViewList() {
-        let _this = this
-        _this.loading = true;
-        let param = {}, Filters = `ProjectId='${this.projectId}'`
-        if (_this.originName) {
-          Filters += `;DatasourceName='${_this.originName}'`
-        }
-        if (_this.statusName) {
-          Filters += `;Status='${_this.statusName}'`
-        }
-        if (_this.accessList) {
-          Filters += `;Status='${_this.accessList}'`
-        }
-        console.log(Filters, 'Filters')
-        testDetail(param, res => {
-          _this.tableData = res.Content
-          _this.total = res.Total
-          _this.loading = false;
-        })
-        // let pa = {
-        //   MeterFunc: this.tabFunNum,
-        //   PageSize: this.pageSize,
-        //   PageNumber: this.currentPage
-        // }
-        // getTabFunNumOverview(pa, res => {
-        //   // this.allTableData = res.Content;
-        //   this.tableData = res.Content;
-        //   this.total = res.Total
-        //   this.loading = false;
-        // });
-      },
-      //刷新当前行数据
-      // refreshThisRow(row) {
-      //   let index = this.tableData.indexOf(row);
-      //   let pa = {
-      //     MeterFunc: row.MeterFunc
-      //   }
-      //   getTabFunNumOverview(pa, res => {
-      //     res.Content.forEach(t => {
-      //       if (t.MeterFunc == row.MeterFunc) {
-      //         if (t.Data) {
-      //           this.tableData[index].Data.Data = t.Data.Data || '';
-      //           this.tableData[index].Data.Time = t.Data.Time || '';
-      //         }
-      //         this.tableData[index].DataQuality = t.DataQuality;
-      //         this.tableData[index].RelatedInstance = t.RelatedInstance;
-      //         this.tableData[index].RelatedPoint = t.RelatedPoint;
-      //       }
-      //     })
-      //     Message.success('已刷新');
-      //   });
-      // },
-      //分页更换size
-      handleSizeChange(val) {
-        this.currentPage = 1;
-        this.pageSize = val;
-        this.getOverViewList()
-      },
-      //分页更换页
-      handleCurrentChange(val) {
-        this.currentPage = val;
-        this.getOverViewList()
-      },
-      //子组件关闭抽屉
-      // closeDrawer() {
-      //   this.drawers[3].drawer = false;
-      // },
-      //新建自定义后重载页面
-      reloadData() {
-        this.$emit('reloadData');
-      },
-      init() {
-        this.getOverViewList();
+    },
+    //控制测试
+    handleControl() {
+      this.$router.push({
+        path: "control"
+      })
+    },
+    //点击下载
+    downloads() {
+      let a = document.createElement('a')
+      a.href = '/pointconfig/datasource/pointdetail-download'
+      a.download = '检测详情.xls'
+      a.click()
+      document.body.removeChild(a)
+    },
+    //抽屉处理
+    // handleDrawer(row, index) {
+    //   if (index == 2 || index == 1) {
+    //     //实例数量大于0才能打开
+    //     if ((row.RelatedInstance > 0 && index == 2) || (row.RelatedPoint > 0 && index == 1)) {
+    //       this.drawers[index].value = row.Data ? row.Data.Data : '';
+    //       this.drawers[index].objId = row.MeterFunc;
+    //       this.drawers[index].drawer = true;
+    //     }
+    //   } else {
+    //     if (index != 3)
+    //       this.drawers[index].objId = row.MeterFunc;
+    //     this.drawers[index].drawer = true;
+    //   }
+    // },
+    handleClickRow(row, column, event) {//点击表格行
+      lStorage.set('screen_data', {
+        path: this.$route.path,
+        data: {MeterFunc: row.MeterFunc, RelatedInstance: row.RelatedInstance}
+      })
+    },
+    //筛选
+
+    changeHandleSelect() {
+      this.getOverViewList()
+    },
+    //获取统计数据
+    getOverViewList() {
+      let _this = this
+      _this.loading = true;
+      let param = {
+        PageNumber: this.currentPage,
+        PageSize: this.pageSize
+      }, Filters = ''
+      if (_this.originName) {
+        Filters += `DatasourceName='${_this.originName}';`
+      }
+      if (_this.statusName) {
+        Filters += `Status='${_this.statusName}';`
       }
+      if (_this.accessList) {
+        Filters += `Method='${_this.accessList}';`
+      }
+      let index = Filters.lastIndexOf(';')
+      Filters = Filters.substring(0, index)
+      param.Filters = Filters !== '' ? Filters : undefined
+      testDetail(param, res => {
+        _this.tableData = res.Content
+        _this.total = res.Total
+        _this.loading = false;
+      })
+
     },
-    mounted() {
-      this.init();
+    //刷新当前行数据
+    // refreshThisRow(row) {
+    //   let index = this.tableData.indexOf(row);
+    //   let pa = {
+    //     MeterFunc: row.MeterFunc
+    //   }
+    //   getTabFunNumOverview(pa, res => {
+    //     res.Content.forEach(t => {
+    //       if (t.MeterFunc == row.MeterFunc) {
+    //         if (t.Data) {
+    //           this.tableData[index].Data.Data = t.Data.Data || '';
+    //           this.tableData[index].Data.Time = t.Data.Time || '';
+    //         }
+    //         this.tableData[index].DataQuality = t.DataQuality;
+    //         this.tableData[index].RelatedInstance = t.RelatedInstance;
+    //         this.tableData[index].RelatedPoint = t.RelatedPoint;
+    //       }
+    //     })
+    //     Message.success('已刷新');
+    //   });
+    // },
+    //分页更换size
+    handleSizeChange(val) {
+      this.currentPage = 1;
+      this.pageSize = val;
+      this.getOverViewList()
     },
-    computed: {
-      ...mapGetters("layout", [
-        "projectId"
-      ])
-      //根据分页,获取要展示的tableData
-      // tableData: function () {
-      //   return this.allTableData.slice(
-      //     (this.currentPage - 1) * this.pageSize,
-      //     (this.currentPage * this.pageSize < this.allTableData.length) ? this.currentPage * this.pageSize : this.allTableData.length);
-      // }
+    //分页更换页
+    handleCurrentChange(val) {
+      console.log(val, 'val')
+      this.currentPage = val;
+      this.getOverViewList()
     },
-    components: {
-      historyChart,
-      dataSource,
-      objectInstance,
-      addTabFunNum
+    //子组件关闭抽屉
+    // closeDrawer() {
+    //   this.drawers[3].drawer = false;
+    // },
+    //新建自定义后重载页面
+    reloadData() {
+      this.$emit('reloadData');
+    },
+    init() {
+      this.getOverViewList();
     }
+  },
+  mounted() {
+    this.init();
+  },
+  computed: {
+    ...mapGetters("layout", [
+      "projectId"
+    ])
+    //根据分页,获取要展示的tableData
+    // tableData: function () {
+    //   return this.allTableData.slice(
+    //     (this.currentPage - 1) * this.pageSize,
+    //     (this.currentPage * this.pageSize < this.allTableData.length) ? this.currentPage * this.pageSize : this.allTableData.length);
+    // }
+  },
+  components: {
+    historyChart,
+    dataSource,
+    objectInstance,
+    addTabFunNum
   }
+}
 </script>
 
 <style lang="less" scoped>
-  #tabFunDetail {
-    border-top: 5px solid #eee;
-    height: calc(100% - 5px);
-    width: 100%;
-    overflow: hidden;
-  }
+#tabFunDetail {
+  border-top: 5px solid #eee;
+  height: calc(100% - 5px);
+  width: 100%;
+  overflow: hidden;
+}
 
-  .table-area {
-    height: calc(100% - 72px);
-    padding: 0px 10px 10px 10px;
-  }
+.table-area {
+  height: calc(100% - 72px);
+  padding: 0px 10px 10px 10px;
 
-  .table-area i {
-    text-align: right;
-    font-size: 12px;
-    cursor: pointer;
-    float: right;
+  .circular {
+    width: 20px;
+    height: 20px;
+    border-radius: 50%;
+    //margin: 0 auto;
   }
 
-  .dialog-btn {
-    display: none;
-    height: 29px;
+  .green {
+    background: #1abc9c;
   }
 
-  /deep/ .el-drawer__body {
-    height: 90%;
-    overflow-y: auto;
+  .yellow {
+    background: yellow;
   }
 
-  /deep/ .el-table__body-wrapper tr:hover {
-    .dialog-btn {
-      display: inline;
-    }
+  .red {
+    background: red;
   }
+}
 
-  /deep/ .el-dialog__body {
-    padding-bottom: 20px;
-  }
+.table-area i {
+  text-align: right;
+  font-size: 12px;
+  cursor: pointer;
+  float: right;
+}
+
+.dialog-btn {
+  display: none;
+  height: 29px;
+}
 
-  /deep/ .el-drawer__header > :first-child:focus {
-    outline: none;
+/deep/ .el-drawer__body {
+  height: 90%;
+  overflow-y: auto;
+}
+
+/deep/ .el-table__body-wrapper tr:hover {
+  .dialog-btn {
+    display: inline;
   }
+}
+
+/deep/ .el-dialog__body {
+  padding-bottom: 20px;
+}
+
+/deep/ .el-drawer__header > :first-child:focus {
+  outline: none;
+}
 </style>

+ 72 - 71
src/views/point/testing/index.vue

@@ -6,7 +6,8 @@
          <i class="iconfont icon-juxing"/>
         对应实例数量</span>
       <div class="contain-data">
-        <integrateStatistics ref="chart" style="height: calc(100% - 5px);" :key="refresh" type="testing"></integrateStatistics>
+        <integrateStatistics ref="chart" style="height: calc(100% - 5px);" :key="refresh"
+                             type="testing"></integrateStatistics>
       </div>
     </div>
     <!-- 表号功能号总览页面 -->
@@ -21,89 +22,89 @@
 </template>
 
 <script>
-  import {mapGetters} from 'vuex'
-  import integrateStatistics from '@/components/point/report/integrateStatistics'
-  import tabFunDetail from '@/components/point/report/tabFunDetail'
-  import {queryDataSourceCount} from "@/fetch/point_http"
+import {mapGetters} from 'vuex'
+import integrateStatistics from '@/components/point/report/integrateStatistics'
+import tabFunDetail from '@/components/point/report/tabFunDetail'
+import {queryDataSourceCount} from "@/fetch/point_http"
 
-  export default {
-    components: {
-      integrateStatistics,
-      tabFunDetail
-    },
-    computed: {
-      ...mapGetters('layout', ['projectId']),
-    },
-    data() {
-      return {
-        refresh: '',//刷新组件
-        selectAggregate: {
-          originList: [], //数据源
-        }
+export default {
+  components: {
+    integrateStatistics,
+    tabFunDetail
+  },
+  computed: {
+    ...mapGetters('layout', ['projectId']),
+  },
+  data() {
+    return {
+      refresh: '',//刷新组件
+      selectAggregate: {
+        originList: [], //数据源
       }
+    }
+  },
+  created() {
+    this.getOriginList()
+  },
+  methods: {
+    //子组件中的新建完成后刷新
+    reloadData() {
+      this.refresh = new Date().getTime();
     },
-    created() {
-      this.getOriginList()
-    },
-    methods: {
-      //子组件中的新建完成后刷新
-      reloadData() {
-        this.refresh = new Date().getTime();
-      },
-      //查询数据源
-      getOriginList() {
-        queryDataSourceCount({}, res => {
-          this.selectAggregate.originList = res.Content.map(i => i.Name).filter(t => t)
-          console.log(this.selectAggregate.originList, ' this.selectAggregate.originList')
-        })
-      }
+    //查询数据源
+    getOriginList() {
+      queryDataSourceCount({}, res => {
+        this.selectAggregate.originList = res.Content.map(i => i.Name).filter(t => t)
+        console.log(this.selectAggregate.originList, ' this.selectAggregate.originList')
+      })
+    }
 
-    },
-    watch: {
-      //监听项目变化
-      projectId() {
-        this.refresh = new Date().getTime();
-      }
+  },
+  watch: {
+    //监听项目变化
+    projectId() {
+      this.refresh = new Date().getTime();
     }
   }
+}
 </script>
 
 <style lang="less" scoped>
-  .contain-blocks {
-    float: left;
-    height: 100%;
-    background: white;
-    width: 34%;
-    margin-right: 5px;
-  }
+.contain-blocks {
+  float: left;
+  height: 100%;
+  background: white;
+  width: 34%;
+  margin-right: 5px;
+}
 
-  .contain-block {
-    float: left;
-    height: 100%;
-    background: white;
-    width: 65%;
+.contain-block {
+  float: left;
+  height: 100%;
+  background: white;
+  width: 65%;
 
-  }
+}
 
-  .contain-title-leftblock {
-    height: 30px;
-    line-height: 30px;
-    /*border-left: 8px solid black;*/
-    display: inline-block;
-    margin: 8px 0;
-    font-weight: 600;
-    padding-left: 8px;
-    cursor: default;
-  }
+.contain-title-leftblock {
+  height: 30px;
+  line-height: 30px;
+  /*border-left: 8px solid black;*/
+  display: inline-block;
+  margin: 8px 0;
+  font-weight: 600;
+  padding-left: 8px;
+  cursor: default;
+}
 
-  .contain-data {
-    /*overflow: auto;*/
-    height: calc(100% - 46px);
-  }
+.contain-data {
+  /*overflow: auto;*/
+  height: calc(100% - 46px);
+}
 
-  @media screen and (max-width: 1600px) {
-    .meterFunc {
-      width: calc(100% - 400px);
-    }
+@media screen and (max-width: 1600px) {
+  .meterFunc {
+    width: calc(100% - 400px);
   }
+}
 </style>