Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject into master

src/api/modules/http.js

@@ -825,3 +825,12 @@ export function geTmenu(query) {
   })
 }
 
+
+//运营工作统计
+export function operationStatistics(query) {
+  return request({
+    url: 'autoSR/cusStageStatistics/operationStatistics',
+    method: 'get',
+    params:query
+  })
+}

src/views/houseData/count.vue

@@ -7,9 +7,9 @@
         <div class="div-lab">
           <div class="label" style="min-width: 80px"> 日期： </div>
           <el-date-picker
-            v-model="starTime"
+            v-model="fromdata.datatime"
             class="div-inp"
-            @change="timeChange1"
+            @change="timeChange"
             style="width: 250px"
             type="daterange"
             range-separator="-"
@@ -24,7 +24,7 @@
         <div class="div-lab">
           <div class="label">运营：</div>
             <el-select
-            v-model="operationStaffId"
+            v-model="fromdata.operationStaffId"
             placeholder="请选择"
             class="div-inp"
             filterable
@@ -54,45 +54,23 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" >
-        <el-table-column
-          prop="propertyName"
-          label="运营"
-          align="center"
-        >
-        </el-table-column>
+      <!--
 
-        <el-table-column
-         width="120"
-          prop="startWorking"
-          label="负责设备总数"
-          align="center"
-        >
-        </el-table-column>
-
-        <el-table-column prop="endWorking" width="120" label="负责楼盘数" align="center">
-        </el-table-column>
+houseQuantityInService; //服务中楼盘数
 
-        <el-table-column prop="endWorking" label="平均执行率" width="120" align="center">
-        </el-table-column>
-        <el-table-column prop="endWorking" width="120" label="常错词添加数" align="center">
-        </el-table-column>
-        <el-table-column prop="endWorking" width="120" label="接待错词修改条数" align="center">
-        </el-table-column>
-        <el-table-column prop="endWorking" width="120" label="标记顾问数" align="center">
-        </el-table-column>
-        <el-table-column prop="endWorking" width="120" label="未标顾问接待数" align="center">
-        </el-table-column>
-        <el-table-column prop="endWorking" width="120" label="新增违禁词数" align="center">
-        </el-table-column>
-        <el-table-column prop="endWorking" width="120" label="客户标签修改次数" align="center">
-        </el-table-column>
-        <el-table-column prop="endWorking" width="120" label="销讲话术更新次数" align="center">
-        </el-table-column>
-        <el-table-column prop="endWorking" width="120" label="登录楼盘次数" align="center">
-        </el-table-column>
-            <el-table-column prop="endWorking"  width="140" label="最后一次登录楼盘时间" align="center">
-        </el-table-column>
+ -->
+      <el-table :data="tableData" stripe style="width: 100%" >
+        <el-table-column prop="operationName" label="运营" align="center"></el-table-column>
+        <el-table-column prop="houseQuantityInService" label="服务中楼盘数" width="120" align="center"></el-table-column>
+        <el-table-column prop="wrongWordAddCount" width="120" label="常错词添加数" align="center"></el-table-column>
+        <el-table-column prop="wrongWordUpdateCount" width="120" label="接待错词修改条数" align="center"></el-table-column>
+        <el-table-column prop="markAdviserCount" width="120" label="标记顾问数" align="center"></el-table-column>
+        <el-table-column prop="noMarkAdviserCount" width="120" label="未标顾问接待数" align="center"></el-table-column>
+        <el-table-column prop="prohibitedWordsAddCount" width="120" label="新增违禁词数" align="center"></el-table-column>
+        <el-table-column prop="CustomerLabelUpdateCount" width="120" label="客户标签修改次数" align="center"></el-table-column>
+        <el-table-column prop="ZkMarkingUpdateCount" width="120" label="销讲话术更新次数" align="center"></el-table-column>
+        <el-table-column prop="loginHouseCount" width="120" label="登录楼盘次数" align="center"></el-table-column>
+        <el-table-column prop="lastLoginTime"  width="140" label="最后一次登录楼盘时间" align="center"></el-table-column>
         <el-table-column label="操作" align="center" width="120" fixed="right">
           <template slot-scope="{ row }">
             <el-button
@@ -107,11 +85,11 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :current-page="currentPage"
+          :current-page="fromdata.currentPage"
           :page-sizes="[10, 30, 50]"
-          :page-size="size"
+          :page-size="fromdata.size"
           layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
+          :total="fromdata.total"
         >
         </el-pagination>
       </div>
@@ -122,7 +100,7 @@
           <div class="div-lab1">
             <div class="label1" style="margin-left:0px;"> 日期： </div>
             <el-date-picker
-              v-model="starTime"
+              v-model="erfromdata.starTime"
               @change="timeChange1"
               style="width: 200px"
               type="daterange"
@@ -140,7 +118,7 @@
                 style="width: 180px"
                   maxlength="30"
                   clearable
-                  v-model="name"
+                  v-model="erfromdata.name"
                   placeholder="请输入内容"
                 ></el-input>
            </div>
@@ -150,7 +128,7 @@
                 style="width: 180px"
                   maxlength="30"
                   clearable
-                  v-model="name"
+                  v-model="erfromdata.name"
                   placeholder="请输入内容"
                 ></el-input>
            </div>
@@ -160,7 +138,7 @@
                 style="width:180px"
                   maxlength="30"
                   clearable
-                  v-model="name"
+                  v-model="erfromdata.name"
                   placeholder="请输入内容"
                 ></el-input>
            </div>
@@ -194,11 +172,11 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :current-page="currentPage"
+          :current-page="erfromdata.currentPage"
           :page-sizes="[10, 30, 50]"
-          :page-size="size"
+          :page-size="erfromdata.size"
           layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
+          :total="erfromdata.total"
         >
         </el-pagination>
       </div>
@@ -214,17 +192,31 @@ import { getAreaList } from "@/api/modules/api";
 export default {
   data() {
     return {
-     starTime:"",
+
+      fromdata:{
+         datatime:'',
+         operationStaffId:'',
+         currentPage:1,
+         total:0,
+         size:10,
+         startDate:'',
+         endDate:''
+      },
+      erfromdata:{
+        name:'',
+        starTime:"",
+        statime:'',
+        endtime:'',
+        total:0,
+        size:10,
+        currentPage:1
+      },
       tableData:[
         {propertyName:'还是卡顿和'}
       ],
       operaList:[],
-      operationStaffId:'',
-      total:0,
-      size:0,
-      currentPage:1,
       texteditorishow:false,
-      name:''
+      orgType: localStorage.getItem("orgType"),
 
     };
   },
@@ -235,32 +227,72 @@ export default {
     this.cus_build_index_add = this.permissions["cus_build_index_add"];
   },
   mounted() {
-
+    this.getOperaList()
+    this.operationStatistics()
   },
   methods: {
+    getOperaList() {
+      if (this.orgType == 1) {
+        this.$api.http
+          .getAllOperationsStaffByAgent({
+            agentId: localStorage.getItem("agentId"),
+          })
+          .then((res) => {
+            this.operaList = res.data;
+          });
+      } else {
+        this.$api.http.getAllOperationsStaff().then((res) => {
+          this.operaList = res.data;
+        });
+      }
+    },
+    operationStatistics(){
+      let form={
+        createBy:this.fromdata.operationStaffId,
+        current:this.fromdata.currentPage,
+        size:this.fromdata.size,
+        startDate:this.fromdata.startDate,
+        endDate:this.fromdata.endDate
+      }
+        this.$api.http.operationStatistics(form).then((res) => {
+          this.tableData=res.data.records;
+          this.fromdata.total=res.data.total;
+        });
+    },
     //查看工作明细
     toinfo(){
           this.texteditorishow=true
     },
     //清空
     empty(){
-
+      this.fromdata.datatime='';
+      this.fromdata.operationStaffId='';
+      this.fromdata.size=10;
+      this.fromdata.currentPage=1;
     },
     //筛选
     screen(){
-
+        this.operationStatistics()
     },
     // 时间选择
     timeChange1(){
-
+        this.statime=this.starTime[0]
+        this.endtime=this.starTime[1]
+    },
+    timeChange(){
+      this.fromdata.startDate=this.fromdata.datatime[0];
+      this.fromdata.endDate=this.fromdata.datatime[1];
+       this.operationStatistics()
     },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
-      this.size = val;
+      this.fromdata.size = val;
+      this.operationStatistics()
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
-      this.currentPage = val;
+      this.fromdata.currentPage = val;
+      this.operationStatistics()
     },
 
   },