From fc5ab434be93aa731d963804164156cbbfc73ade Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Sat, 20 Nov 2021 14:24:15 +0800
Subject: [PATCH] init

---
 src/views/Customer/Companymanagement.vue          | 3 ++-
 src/views/Equipment/equipmentOnlineRecordList.vue | 9 +++++++--
 src/views/ReceivingRecords/index.vue              | 4 ++--
 src/views/Statistics/dataScreeAge.vue             | 5 +++++
 src/views/Statistics/dataScreeOrg.vue             | 5 +++++
 src/views/Statistics/dataScreeSys.vue             | 5 +++++
 6 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/views/Customer/Companymanagement.vue b/src/views/Customer/Companymanagement.vue
index f4d742e..0e54b54 100644
--- a/src/views/Customer/Companymanagement.vue
+++ b/src/views/Customer/Companymanagement.vue
@@ -674,7 +674,8 @@ export default {
          this.optionsoperationStaff=[];
          if(idx==1){
           this.$api.http.getAllOperationsStaffByAgent({
-              orgCode:row.orgCode
+              orgCode:row.orgCode,
+              agentId:localStorage.getItem('agentId')
             }).then((res) => {
               this.optionsoperationStaff= res.data
               this.operaVisible=true
diff --git a/src/views/Equipment/equipmentOnlineRecordList.vue b/src/views/Equipment/equipmentOnlineRecordList.vue
index 3a760fa..f20b86f 100644
--- a/src/views/Equipment/equipmentOnlineRecordList.vue
+++ b/src/views/Equipment/equipmentOnlineRecordList.vue
@@ -105,6 +105,11 @@
           </el-table-column>
           <el-table-column prop="closeTime" label="离线时间" align="center">
           </el-table-column>
+          <el-table-column prop="offlineTime" label="离线时长" align="center">
+            <template slot-scope="{row}">
+              {{row.offlineTime||'--'}}
+            </template>
+          </el-table-column>
           <el-table-column prop="offStatusName" label="离线原因" align="center">
           </el-table-column>
         </el-table>
@@ -381,7 +386,7 @@ export default {
     },
     screening() {
       this.page.pageNum = 1;
-      this.page.pageSize = 6;
+      // this.page.pageSize = 6;
       this.getTableList();
     },
     goinfo(row) {
@@ -394,7 +399,7 @@ export default {
     empty() {
       this.page = {
         pageNum: 1,
-        pageSize: 6,
+        pageSize: 10,
         openTime: "",
         closeTime: "",
         // houseName: this.houseList[0].id,
diff --git a/src/views/ReceivingRecords/index.vue b/src/views/ReceivingRecords/index.vue
index 82f4d57..4df8ab0 100644
--- a/src/views/ReceivingRecords/index.vue
+++ b/src/views/ReceivingRecords/index.vue
@@ -341,11 +341,11 @@ export default {
       options5: [
         {
           value: "1",
-          label: "已标注",
+          label: "已标记",
         },
         {
           value: "0",
-          label: "未标注",
+          label: "未标记",
         },
       ],
       currentPage: 1,
diff --git a/src/views/Statistics/dataScreeAge.vue b/src/views/Statistics/dataScreeAge.vue
index 359b04c..f9361c1 100644
--- a/src/views/Statistics/dataScreeAge.vue
+++ b/src/views/Statistics/dataScreeAge.vue
@@ -341,6 +341,9 @@ export default {
   },
   methods: {
     valuechange() {
+      this.dateType = 4;
+      this.cardindex=1
+      this.secindex=1
       // console.log(this.choicValue);
       this.dataOverViewWithSystem();
       this.dataOverviewWithSystemWithDay();
@@ -350,6 +353,8 @@ export default {
     selChange() {
       this.choicValue = "";
       this.dateType = 4;
+      this.cardindex=1
+      this.secindex=1
       this.getList();
     },
     // 获取下拉框数据
diff --git a/src/views/Statistics/dataScreeOrg.vue b/src/views/Statistics/dataScreeOrg.vue
index 64307a9..f9e7c78 100644
--- a/src/views/Statistics/dataScreeOrg.vue
+++ b/src/views/Statistics/dataScreeOrg.vue
@@ -314,6 +314,9 @@ export default {
   },
   methods: {
     valuechange() {
+      this.dateType = 4;
+      this.cardindex=1
+      this.secindex=1
       // console.log(this.choicValue);
       this.dataOverViewWithSystem();
       this.dataOverviewWithSystemWithDay();
@@ -323,6 +326,8 @@ export default {
     selChange() {
       this.choicValue = "";
       this.dateType = 4;
+      this.cardindex=1
+      this.secindex=1
       this.getList();
     },
     // 获取下拉框数据
diff --git a/src/views/Statistics/dataScreeSys.vue b/src/views/Statistics/dataScreeSys.vue
index d0ea74e..477304a 100644
--- a/src/views/Statistics/dataScreeSys.vue
+++ b/src/views/Statistics/dataScreeSys.vue
@@ -339,6 +339,9 @@ export default {
   },
   methods: {
     valuechange() {
+      this.dateType = 4;
+      this.cardindex=1
+      this.secindex=1
       // console.log(this.choicValue);
       this.dataOverViewWithSystem();
       this.dataOverviewWithSystemWithDay();
@@ -348,6 +351,8 @@ export default {
     selChange() {
       this.choicValue = "";
       this.dateType = 4;
+      this.cardindex=1
+      this.secindex=1
       this.getList();
     },
     // 获取下拉框数据