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

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/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>
@@ -241,6 +262,8 @@
         <el-table-column prop="houseQuantityOfEnough" label="服务期内楼盘" align="center">
         </el-table-column>
         <el-table-column prop="onlineQuantity" label="在线设备" align="center">
+        </el-table-column>
+         <el-table-column prop="equipmentNum" label="设备总数" align="center">
         </el-table-column>
         <el-table-column
           prop="noOnlineQuantity"
@@ -281,11 +304,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 +409,13 @@ export default {
         dateType: "4",
         startDate: "",
         endDate: "",
+        operationStaffId:''
       },
       currentPage: 1,
       selflag: "1",
       size: 10,
       total: 10,
+      operaList:[]
     };
   },
         computed: {
@@ -401,10 +430,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 +568,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);

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;