init

src/page/check/chose.vue

@@ -332,6 +332,7 @@ export default {
           propertyName: this.propertyName,
           provinceId :this.provinceId ,
           cityId:this.cityId,
+            sortBy:1,
           ...obj
         }).then((res) => {
           // console.log(res)

src/views/Customer/AgentManagement.vue

@@ -1079,7 +1079,7 @@ export default {
           contractEndDate:this.contractEndDate,
           serviceStatus:this.serviceStatus,
           agentName:this.agentName,
-          operationalId:this.operationalId,
+          operationStaffId:this.operationalId,
           provinceId:this.provinceId,
           cityId:this.cityId,
           operationalName:this.operationalName,

src/views/Equipment/equipmentDetailList.vue

@@ -9,8 +9,8 @@
           padding-top: 18px;
         "
       >
-        <span class="demonstration">楼盘名称：</span>
-        <!-- <el-select
+        <!-- <span class="demonstration">楼盘名称：</span> -->
+        <el-select
           v-model="selValue"
           @change="selChange"
           style="width: 100px"
@@ -19,9 +19,8 @@
           <el-option label="代理商" v-if="orgType == 0" value="0"></el-option>
           <el-option label="公司" v-if="orgType != 2" value="1"></el-option>
           <el-option label="楼盘" value="2"></el-option>
-        </el-select> -->
-        <div style="width: 200px">
-          <!--				<el-input  v-model="page.accountName"></el-input>-->
+        </el-select>
+        <!-- <div style="width: 200px">
           <el-select
             v-model="houseId"
             filterable
@@ -36,6 +35,55 @@
             >
             </el-option>
           </el-select>
+        </div> -->
+               <div style="margin-left: 26px" v-if="selValue == 1">
+          <el-select
+           v-model="houseId"
+            filterable
+             placeholder="默认为全部"
+            @change="change"
+          >
+            <el-option
+              v-for="item in houseList"
+              :key="item.orgCode"
+              :label="item.name"
+              :value="item.orgCode"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <!-- 楼盘 -->
+        <div style="margin-left: 26px" v-else-if="selValue == 2">
+          <el-select
+           v-model="houseId"
+            filterable
+            placeholder="默认为全部"
+            @change="change"
+          >
+            <el-option
+              v-for="item in houseList"
+              :key="item.id"
+              :label="item.propertyName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div style="margin-left: 26px" v-else>
+          <el-select
+          v-model="houseId"
+            filterable
+            placeholder="默认为全部"
+            @change="change"
+          >
+            <el-option
+              v-for="item in houseList"
+              :key="item.id"
+              :label="item.agentName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
         </div>
       </div>
     </div>
@@ -697,7 +745,11 @@ export default {
       houseId: "",
       timeType: 0,
       orgType: localStorage.getItem("orgType"),
-      selValue:'0',
+         selValue:  localStorage.getItem("orgType") == 0
+          ? "0"
+          : localStorage.getItem("orgType") == 1
+          ? "1"
+          : "2",
       time: "",
       compareFlag: "0",
       selectTime: "",
@@ -828,11 +880,12 @@ export default {
       selChange() {
       this.choicValue = "";
       this.timeType = 4;
-      // this.getList();
-      this.getTableList();
-      this.getdetail();
-      // 获取对比列表
-      this.getcompare();
+      this.houseId='';
+      this.getHouseList();
+      // this.getTableList();
+      // this.getdetail();
+      // // 获取对比列表
+      // this.getcompare();
     },
     // 没有对比时的折线图
     getNoCompare(){
@@ -842,7 +895,9 @@ export default {
         // pageSize: this.pageNum,
         startDate: this.page.openTime,
         endDate: this.page.closeTime,
-        houseId: this.houseId,
+            agentId: localStorage.getItem("orgType")==1?localStorage.getItem("agentId"):this.selValue == 0 ? this.houseId : 'null',
+          orgCode: localStorage.getItem("orgType")==2?localStorage.getItem("orgCode"):this.selValue == 1 ? this.houseId : 'null',
+          houseId: localStorage.getItem("orgType")==3?localStorage.getItem("houseId"):this.selValue == 2 ? this.houseId : 'null',
         timeType: this.timeType,
         contrastStartDate: this.selectTime,
         contrastEndDate: this.selectTime1,
@@ -1019,26 +1074,57 @@ export default {
     },
     //获取楼盘数据
     getHouseList() {
-      this.$api.api
-        .findHouseByUser({
-          orgType: localStorage.getItem("orgType"),
-          agentId: localStorage.getItem("agentId"),
-        })
-        .then((res) => {
-          this.houseList = res.data;
-          if (!this.flag) {
-            // console.log(this.flag, "12");
-            if (localStorage.getItem("orgType") == 3) {
-              this.houseId = localStorage.getItem("houseId");
-            } else {
-              this.houseId = res.data[0].id;
-            }
-          }
-          // console.log(this.flag,'12')
-          this.tabtimetap(this.timeType);
-          // return
-          this.getTableList();
-        });
+     if (this.selValue == 1) {
+        this.$api.api
+          .findMyOrg({
+            orgType: localStorage.getItem("orgType"),
+            agentId: localStorage.getItem("agentId"),
+          })
+          .then((res) => {
+            this.houseList = res.data;
+            this.tabtimetap(this.timeType);
+            this.getTableList();
+          });
+      } else if (this.selValue == 2) {
+        this.$api.api
+          .findHouseByUser({
+            orgType: localStorage.getItem("orgType"),
+            houseId: localStorage.getItem("houseId"),
+          })
+          .then((res) => {
+            this.houseList = res.data;
+            this.tabtimetap(this.timeType);
+            this.getTableList();
+          });
+      } else {
+        this.$api.api
+          .findMyAgent({
+            orgType: localStorage.getItem("orgType"),
+          })
+          .then((res) => {
+            this.houseList = res.data;
+            this.tabtimetap(this.timeType);
+            this.getTableList();
+          });
+      }
+
+
+      // this.$api.api.findHouseByUser({
+      //     orgType: localStorage.getItem("orgType"),
+      //     agentId: localStorage.getItem("agentId"),
+      //   })
+      //   .then((res) => {
+      //     this.houseList = res.data;
+      //     if (!this.flag) {
+      //       if (localStorage.getItem("orgType") == 3) {
+      //         this.houseId = localStorage.getItem("houseId");
+      //       } else {
+      //         this.houseId = res.data[0].id;
+      //       }
+      //     }
+      //     this.tabtimetap(this.timeType);
+      //     this.getTableList();
+      //   });
     },
     handleSizeChange(val) {
       console.log("每页条" + val);
@@ -1068,7 +1154,9 @@ export default {
         size: this.pageSize,
         startDate: this.page.openTime,
         endDate: this.page.closeTime,
-        houseId: this.houseId,
+         agentId: localStorage.getItem("orgType")==1?localStorage.getItem("agentId"):this.selValue == 0 ? this.houseId : 'null',
+          orgCode: localStorage.getItem("orgType")==2?localStorage.getItem("orgCode"):this.selValue == 1 ? this.houseId : 'null',
+          houseId: localStorage.getItem("orgType")==3?localStorage.getItem("houseId"):this.selValue == 2 ? this.houseId : 'null',
         timeType: this.timeType,
         contrastStartDate: this.selectTime,
         contrastEndDate: this.selectTime1,
@@ -1405,7 +1493,9 @@ export default {
       let obj = {
         startDate: this.page.openTime,
         endDate: this.page.closeTime,
-        houseId: this.houseId,
+          agentId: localStorage.getItem("orgType")==1?localStorage.getItem("agentId"):this.selValue == 0 ? this.houseId : 'null',
+          orgCode: localStorage.getItem("orgType")==2?localStorage.getItem("orgCode"):this.selValue == 1 ? this.houseId : 'null',
+          houseId: localStorage.getItem("orgType")==3?localStorage.getItem("houseId"):this.selValue == 2 ? this.houseId : 'null',
         timeType: this.timeType,
         contrastStartDate: this.selectTime,
         contrastEndDate: this.selectTime1,
@@ -1564,7 +1654,9 @@ export default {
         pageSize: this.page.pageSize,
         startDate: this.page.openTime,
         endDate: this.page.closeTime,
-        houseId: this.houseId,
+         agentId: localStorage.getItem("orgType")==1?localStorage.getItem("agentId"):this.selValue == 0 ? this.houseId : 'null',
+          orgCode: localStorage.getItem("orgType")==2?localStorage.getItem("orgCode"):this.selValue == 1 ? this.houseId : 'null',
+          houseId: localStorage.getItem("orgType")==3?localStorage.getItem("houseId"):this.selValue == 2 ? this.houseId : 'null',
         timeType: this.timeType,
         orgType: localStorage.getItem("orgType"),
       };

src/views/Equipment/index.vue

@@ -260,7 +260,7 @@
         </el-table-column>
         <el-table-column prop="name" label="上传状态" align="center">
         </el-table-column> -->
-        <el-table-column
+        <!-- <el-table-column
           prop="autoSwitch"
           label="自动转写开关"
           align="center"
@@ -269,15 +269,12 @@
           <template slot-scope="{ row }">
             {{ row.autoSwitch == 0 ? "已关闭" : "已开启" }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
-          prop="defaultTransliteration"
+          prop="transliterationMethodName"
           label="转写方式"
           align="center"
         >
-          <template slot-scope="{ row }">
-            {{ row.defaultTransliteration == 0 ? "科大讯飞" : "思必驰" }}
-          </template>
         </el-table-column>
         <el-table-column
           prop="acceptanceStatus"
@@ -372,14 +369,18 @@
                   >归还</el-dropdown-item
                 >
 
-                <el-dropdown-item
+                  <el-dropdown-item
+                  command="zhuanxeishezhi"
+                  >转写设置</el-dropdown-item
+                >
+                <!-- <el-dropdown-item
                   command="infotranscription"
                   v-if="equ_index_change"
                   >转写方式</el-dropdown-item
                 >
                 <el-dropdown-item command="isAutoSwitch" v-if="equ_index_auto"
                   >自动转写</el-dropdown-item
-                >
+                > -->
                 <el-dropdown-item
                   command="acceptance"
                   v-if="row.acceptanceStatus == 1 && equ_index_makeSure"
@@ -692,6 +693,25 @@
         <el-button type="primary" @click="saveReceive()">保存</el-button>
       </div>
     </el-dialog>
+
+
+    <el-dialog
+      title="转写设置"
+      :visible.sync="receiveVisiblescd"
+    >
+     <div>
+       <span>转写方式：</span>
+        <el-radio-group v-model="radioindex" style="margin-left:30px;">
+          <el-radio :label="0">关闭转写</el-radio>
+          <el-radio :label="1">科大讯飞</el-radio>
+          <el-radio :label="2">思必驰</el-radio>
+        </el-radio-group>
+     </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="receiveVisiblescd = false">取 消</el-button>
+        <el-button type="primary" @click="shezhizhuanxei()">保存</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -750,18 +770,6 @@ export default {
           value: "1",
           label: "未验收",
         },
-        // {
-        //   value: "2",
-        //   label: "维修中",
-        // },
-        // {
-        //   value: "3",
-        //   label: "更换中",
-        // },
-        // {
-        //   value: "4",
-        //   label: "已报损",
-        // },
       ],
       offStatusList: [
         {
@@ -853,6 +861,9 @@ export default {
         { color: "#1989fa", percentage: 80 },
         { color: "#6f7ad3", percentage: 100 },
       ],
+      radioindex:'',
+      radioindexid:'',
+      receiveVisiblescd:false
     };
   },
   computed: {
@@ -880,6 +891,26 @@ export default {
     this.zkhousePage();
   },
   methods: {
+    //转写设置
+    zhuanxeishezhi(row){
+      this.radioindexid=row.id;
+      this.radioindex=row.transliterationMethod;
+      this.receiveVisiblescd=true;
+    },
+     //转写设置确认
+    shezhizhuanxei(){
+        this.$api.api.updateTranslationMethod({
+          id:  this.radioindexid,
+          transliterationMethod:this.radioindex,
+        }).then((res) => {
+          this.receiveVisiblescd=false;
+          this.$message({
+            type: "success",
+            message: "修改成功!",
+          });
+          this.equipmentManagement();
+        });
+    },
     // 获取批次列表
     zkequipmentbatchList() {
       this.$api.api.zkequipmentbatchList().then((res) => {
@@ -1325,12 +1356,10 @@ export default {
         }
       )
         .then(() => {
-          this.$api.api
-            .updateTranslationMethod({
+          this.$api.api.updateTranslationMethod({
               id: row.id,
               defaultTransliteration: row.defaultTransliteration == 0 ? 1 : 0,
-            })
-            .then((res) => {
+            }).then((res) => {
               this.$message({
                 type: "success",
                 message: "修改成功!",

src/views/Statistics/ConsultantBrand.vue

@@ -177,7 +177,7 @@
             <div class="text1-2">{{avg1}}次</div>
           </div>
         </div>
-        <div
+        <div v-if="echarlist.length!=0"
           style="overflow-y: auto; height: 258px; width: 94%; margin: 0 auto"
         >
           <div class="jinbox" v-for="(item, i) in echarlist" :key="i">
@@ -191,6 +191,12 @@
             <div class="jinboxbott">{{ item.zxl }}</div>
           </div>
         </div>
+           <div class="nulllist" style="height:250px" v-if="echarlist.length==0">
+                <div class="imgboxc">
+                  <img class="imgboxc-img" src="/img/nullnull.png" alt="">
+                  <div class="nulltext">暂无数据</div>
+                </div>
+            </div>
       </div>
       <div class="you">
         <div class="title">
@@ -211,7 +217,7 @@
             <div class="text1-2">{{Math.floor(avg2/60)}}分钟</div>
           </div>
         </div>
-        <div
+        <div v-if="echarlist2.length!=0"
           style="overflow-y: auto; height: 258px; width: 94%; margin: 0 auto"
         >
           <div class="jinbox" v-for="(item, i) in echarlist2" :key="i">
@@ -225,7 +231,12 @@
             <div class="jinboxbott">{{ item.zxl }}</div>
           </div>
         </div>
-
+         <div class="nulllist" style="height:250px" v-if="echarlist2.length==0">
+                <div class="imgboxc">
+                  <img class="imgboxc-img" src="/img/nullnull.png" alt="">
+                  <div class="nulltext">暂无数据</div>
+                </div>
+            </div>
       </div>
     </div>
 
@@ -260,7 +271,7 @@
             <div class="text1-2">{{avg3}}%</div>
           </div>
         </div>
-        <div
+        <div v-if="echarlist1.length!=0"
           style="overflow-y: auto; height: 258px; width: 94%; margin: 0 auto"
         >
           <div class="jinbox" v-for="(item, i) in echarlist1" :key="i">
@@ -274,6 +285,12 @@
             <div class="jinboxbott">{{ item.zxl }}%</div>
           </div>
         </div>
+         <div class="nulllist" style="height:250px" v-if="echarlist1.length==0">
+                <div class="imgboxc">
+                  <img class="imgboxc-img" src="/img/nullnull.png" alt="">
+                  <div class="nulltext">暂无数据</div>
+                </div>
+            </div>
       </div>
       <div class="you">
         <div class="title">
@@ -309,7 +326,7 @@
             <div class="text1-2">{{avg4}}次</div>
           </div>
         </div>
-        <div
+        <div v-if="echarlist3.length!=0"
           style="overflow-y: auto; height: 258px; width: 94%; margin: 0 auto"
         >
           <div class="jinbox" v-for="(item, i) in echarlist3" :key="i">
@@ -323,6 +340,12 @@
             <div class="jinboxbott">{{ item.zxl }}</div>
           </div>
         </div>
+        <div class="nulllist" style="height:250px" v-if="echarlist3.length==0">
+                <div class="imgboxc">
+                  <img class="imgboxc-img" src="/img/nullnull.png" alt="">
+                  <div class="nulltext">暂无数据</div>
+                </div>
+            </div>
       </div>
     </div>
   </div>

src/views/building/Count.vue

@@ -158,13 +158,31 @@
             clearable
           ></el-cascader>
         </div>
-          <div class="div-lab" v-if="orgType == 0">
+          <!-- <div class="div-lab" v-if="orgType == 0">
           <div class="label" style="min-width:70px;">系统运营：</div>
           <el-input  maxlength="10" clearable v-model="searchForm.linkman"></el-input>
         </div>
         <div class="div-lab" v-if="orgType == 1">
           <div class="label" style="min-width:70px;">售后运营：</div>
           <el-input  maxlength="10" clearable v-model="searchForm.linkman"></el-input>
+        </div> -->
+         <div v-if="orgType == 0||orgType == 1" class="div-lab">
+          <div class="label">运营人员：</div>
+            <el-select
+            v-model="searchForm.operationStaffId"
+            placeholder="请选择"
+            class="div-inp"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="item in operaList"
+              :key="item.accountId"
+              :label="item.name"
+              :value="item.accountId"
+            >
+            </el-option>
+          </el-select>
         </div>
       </div>
       <div class="app-titel" style="margin-top: 15px">
@@ -188,11 +206,14 @@
         </el-table-column>
         <el-table-column prop="agentName" label="代理商" align="center">
         </el-table-column>
+        <el-table-column prop="equipmentNum" label="设备总数" align="center">
+        </el-table-column>
+
 
         <el-table-column prop="area" label="地区" align="center">
         </el-table-column>
 
-        <el-table-column prop="linkman" label="系统运营" align="center">
+        <el-table-column v-if="orgType!=2" prop="operationStaffName" label="运营人员" align="center">
         </el-table-column>
         <el-table-column prop="onlineQuantity" label="在线设备" align="center">
         </el-table-column>
@@ -242,6 +263,12 @@
         </el-table-column>
         <el-table-column prop="onlineQuantity" label="在线设备" align="center">
         </el-table-column>
+        <el-table-column prop="area" label="地区" align="center">
+        </el-table-column>
+          <el-table-column prop="operationStaffName" label="运营人员" align="center">
+        </el-table-column>
+         <el-table-column prop="equipmentNum" label="设备总数" align="center">
+        </el-table-column>
         <el-table-column
           prop="noOnlineQuantity"
           label="离线设备"
@@ -281,11 +308,15 @@
         <el-table  v-if="activeTotal==1" :data="tableData" stripe style="width: 100%">
         <el-table-column prop="agentName" label="代理商名称" align="center">
         </el-table-column>
-        <!-- <el-table-column prop="area" label="服务期内公司" align="center">
-        </el-table-column> -->
+        <el-table-column prop="area" label="地区" align="center">
+        </el-table-column>
+          <el-table-column prop="operationStaffName" label="运营人员" align="center">
+        </el-table-column>
         <el-table-column prop="houseQuantityOfEnough" label="服务期内楼盘" align="center">
         </el-table-column>
         <el-table-column prop="sumReception" label="接待量" align="center">
+        </el-table-column>
+         <el-table-column prop="equipmentNum" label="设备总数" align="center">
         </el-table-column>
         <el-table-column prop="sumRecordTime" label="接待时长" align="center">
         </el-table-column>
@@ -382,11 +413,13 @@ export default {
         dateType: "4",
         startDate: "",
         endDate: "",
+        operationStaffId:''
       },
       currentPage: 1,
       selflag: "1",
       size: 10,
       total: 10,
+      operaList:[]
     };
   },
         computed: {
@@ -401,10 +434,26 @@ export default {
     }
     // 获取楼盘列表
     this.tabtimetap(4);
+    this.getOperaList()
     this.houseStatistics();
 
   },
   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;
+        });
+      }
+    },
     selectChange(e) {
       this.searchForm.equipImei = "";
       this.searchForm.userName = "";
@@ -523,6 +572,13 @@ export default {
         orgType:localStorage.getItem('orgType'),
       };
       if(this.activeTotal==0){
+        if(this.orgType==0){
+          obj.operationType=1
+        }else if(this.orgType==1){
+          obj.operationType=2
+        }else{
+          obj.operationType=null
+        }
         // 楼盘
         this.$api.api.houseStatistics1(obj).then((res) => {
         // console.log(res);
@@ -530,6 +586,7 @@ export default {
         this.total = res.data.total;
       });
       }else if(this.activeTotal==1){
+        obj.operationType=null;
         // 代理商
         this.$api.api.agentStatistics(obj).then((res) => {
         // console.log(res);
@@ -537,6 +594,13 @@ export default {
         this.total = res.data.total;
       });
       }else{
+        if(this.orgType==0){
+          obj.operationType=1
+        }else if(this.orgType==1){
+          obj.operationType=2
+        }else{
+          obj.operationType=null
+        }
         // 公司
         this.$api.api.companyStatistics(obj).then((res) => {
         // console.log(res);

src/views/building/index.vue

@@ -258,6 +258,7 @@
           prop="provinceName,cityName"
           label="楼盘地址"
           align="center"
+          :key="Math.random()"
         >
           <template slot-scope="scope"> {{scope.row.provinceName}}{{scope.row.cityName}} </template>
         </el-table-column>
@@ -267,21 +268,25 @@
           prop="linkman"
           label="联系人信息"
           align="center"
+          :key="Math.random()"
         >
           <template slot-scope="{ row }">
             {{ row.linkman + "-" + row.linkmanPhone || "-" }}
           </template>
         </el-table-column>
-        <el-table-column prop='operationStaffName' label="运营人员" align="center">
-        </el-table-column>
 
-        <el-table-column prop="managerPhone" label="管理员账号" align="center">
+
+        <el-table-column :key="Math.random()" prop="managerPhone" label="管理员账号" align="center">
           <template slot-scope="{ row }">
             {{ row.managerPhone || "-" }}
           </template>
         </el-table-column>
 
+    <el-table-column :key="Math.random()" prop='operationStaffName' v-if="orgType==0||orgType==1" label="运营人员" align="center">
+        </el-table-column>
+
         <el-table-column
+         :key="Math.random()"
           prop="houseType"
           label="楼盘类型"
           align="center"
@@ -1311,6 +1316,7 @@ export default {
         orgCode: localStorage.getItem("orgCode"),
         operationType:localStorage.getItem("orgType")==0?'1':localStorage.getItem("orgType")==1?'2':'',
         ...this.searchForm,
+
       };
       if (this.orgType == 0) {
         obj.residueTime = null;