init

src/page/check/chose.vue

@@ -22,7 +22,7 @@
           style="height: 32px; line-height: 13px"
           type="primary"
           size="medium"
-          @click="getAgentList"
+          @click="screengetAgentList"
           >搜索</el-button
         >
       </div>
@@ -86,7 +86,7 @@
           style="height: 32px; line-height: 13px"
           type="primary"
           size="medium"
-          @click="getCompanyList"
+          @click="screengetCompanyList"
           >搜索</el-button
         >
       </div>
@@ -150,7 +150,7 @@
           style="height: 32px; line-height: 13px"
           type="primary"
           size="medium"
-          @click="zkhousePage"
+          @click="screenzkhousePage"
           >搜索</el-button
         >
       </div>
@@ -273,6 +273,14 @@ export default {
           this.total = res.data.total;
         });
     },
+    screengetAgentList(){
+      this.currentPage=1
+      this.getAgentList()
+    },
+    screengetCompanyList(){
+    this.currentPage=1
+    this.getCompanyList()
+    },
     findByUserName() {
       this.$api.api
         .findByUserName({
@@ -287,6 +295,10 @@ export default {
           this.findArea();
         });
     },
+    screenzkhousePage(){
+      this.currentPage=1
+      this.zkhousePage();
+    },
     getCompanyList() {
       this.$api.api
         .zkorg({
@@ -316,6 +328,8 @@ export default {
       if (this.info.selectHouseType == 1) {
         this.$api.api.zkhousePage({
           propertyName: this.propertyName,
+          provinceId :this.provinceId ,
+          cityId:this.cityId,
           ...obj
         }).then((res) => {
           // console.log(res)
@@ -386,8 +400,8 @@ export default {
     locationsChange(e) {
       console.log(e);
       if (!e) return;
-      this.searchhouseMsg.provinceId = e[0];
-      this.searchhouseMsg.cityId = e[1];
+      this.provinceId = e[0];
+      this.cityId = e[1];
     },
   },
 };

src/page/wel.vue

@@ -737,6 +737,7 @@ export default {
     }
   },
    mounted() {
+    //  location.reload();
     this.role=localStorage.getItem("orgType");
     if(this.role==3){
       this.houseId = localStorage.getItem("houseId");

src/views/Customer/AgentManagement.vue

@@ -81,6 +81,9 @@
             prop="linkman"
             label="联系人信息"
              align="center">
+             <template slot-scope="{ row }">
+            {{ row.linkman || "-" }}-{{ row.linkmanPhone || "-" }}
+          </template>
           </el-table-column>
 
           <el-table-column
@@ -126,7 +129,7 @@
                    <!-- <div v-if="scope.row.residueTime >0&&scope.row.lockFlag==0">在服务期内({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
                    <div v-if="scope.row.residueTime <=0&&scope.row.lockFlag==0">过期({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
                    <div v-if="scope.row.lockFlag==1">禁用</div> -->
-                  <div v-if="scope.row.residueTime >0">在服务期内({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
+                  <div v-if="scope.row.residueTime >0">服务中({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
                    <div v-if="scope.row.residueTime <=0">过期({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
                 </template>
           </el-table-column>
@@ -481,10 +484,10 @@ export default {
             // { required: true, message: '请输入联系人名称', trigger: 'blur' },
           ],
           provinceId: [
-            { required: true, message: '请输入选择省', trigger: 'blur' },
+            { required: false, message: '请输入选择省', trigger: 'blur' },
           ],
           cityId: [
-            { required: true, message: '请输入选择市', trigger: 'blur' },
+            { required: false, message: '请输入选择市', trigger: 'blur' },
           ],
           address: [
             // { required: true, message: '请输入详细地址', trigger: 'blur' },
@@ -517,10 +520,10 @@ export default {
             // { required: true, message: '请输入联系人名称', trigger: 'blur' },
           ],
           provinceId: [
-            { required: true, message: '请输入选择省', trigger: 'blur' },
+            { required: false, message: '请输入选择省', trigger: 'blur' },
           ],
           cityId: [
-            { required: true, message: '请输入选择市', trigger: 'blur' },
+            { required: false, message: '请输入选择市', trigger: 'blur' },
           ],
           address: [
             { required: true, message: '请输入详细地址', trigger: 'blur' },

src/views/Customer/CompanyRecord.vue

@@ -399,10 +399,10 @@ export default {
              { validator: validatePass1, trigger: "blur" },
           ],
           provinceId: [
-            { required: true, message: '请输入选择省', trigger: 'blur' },
+            { required: false, message: '请输入选择省', trigger: 'blur' },
           ],
           cityId: [
-            { required: true, message: '请输入选择市', trigger: 'blur' },
+            { required: false, message: '请输入选择市', trigger: 'blur' },
           ],
           address: [
             // { required: false, message: '请输入详细地址', trigger: 'blur' },
@@ -502,10 +502,10 @@ export default {
             { validator: validatePass1, trigger: "blur" },
           ],
           provinceId: [
-            { required: true, message: '请输入选择省', trigger: 'blur' },
+            { required: false, message: '请输入选择省', trigger: 'blur' },
           ],
           cityId: [
-            { required: true, message: '请输入选择市', trigger: 'blur' },
+            { required: false, message: '请输入选择市', trigger: 'blur' },
           ],
           address: [
             { required: true, message: '请输入详细地址', trigger: 'blur' },

src/views/Equipment/state.vue

@@ -4,7 +4,7 @@
     <div class="app-top">
       <div class="app-titel" style="margin-top: 5px">
         <div class="div-lab">
-          <div class="label">添加时间：</div>
+          <div class="label">更新时间：</div>
           <el-date-picker
             v-model="time"
             type="daterange"
@@ -273,9 +273,9 @@
         </el-table-column>
         <el-table-column prop="date" label="离线天数" align="center">
         </el-table-column>
-        <el-table-column prop="simAudioStatus" label="录音状态" align="center">
+        <el-table-column prop="recCmd" label="录音状态" align="center">
           <template slot-scope="{ row }">
-            {{ row.simAudioStatus=='true' ? "开启" : "关闭" }}
+            {{ row.recCmd=='start' ? "开启" : "关闭" }}
           </template>
         </el-table-column>
         <el-table-column
@@ -984,7 +984,7 @@ export default {
     },
     voiceOpen(row){
         this.$confirm(
-        `确认${row.simAudioStatus == "true" ? "关闭" : "开启"}录音吗?`,
+        `确认${row.recCmd == "start" ? "关闭" : "开启"}录音吗?`,
         "提示",
         {
           confirmButtonText: "确定",
@@ -996,7 +996,7 @@ export default {
           this.$api.api
             .audioStatusControl({
               imei: row.imei,
-              simAudioStatus: row.simAudioStatus == "true" ? "false" : "true",
+              recCmd: row.recCmd == "start" ? "stop" : "start",
             })
             .then((res) => {
               this.$message({

src/views/Statistics/dataScreeAge.vue

@@ -259,7 +259,7 @@
         </div> -->
         <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('4')">
           <div class="text1" :class="{ tophovese: cardindex == 4 }">
-            活跃设备数
+            活跃用户数
           </div>
           <div class="text2" :class="{ tophovese: cardindex == 4 }">
             {{ thirdTab.activeEquipmentQuantity || 0 }}
@@ -428,7 +428,7 @@ export default {
           timeDate.push(item.time.substring(11, 16));
           arr2.push(item.data);
         });
-        this.secondTab.todayActiveUserList.map((item) => {
+        this.secondTab.todayReceptionList.map((item) => {
           arr1.push(item.data);
         });
       }
@@ -482,7 +482,7 @@ export default {
           arr1.push(item.data);
         });
       } else if (idx == 4) {
-        Strname = ["活跃设备数"];
+        Strname = ["活跃用户数"];
         this.thirdTab.activeUserList.map((item) => {
           timeDate.push(item.time.substring(5, 10));
           arr1.push(item.data);

src/views/Statistics/dataScreeOrg.vue

@@ -399,7 +399,7 @@ export default {
           timeDate.push(item.time.substring(11, 16));
           arr2.push(item.data);
         });
-        this.secondTab.todayActiveUserList.map((item) => {
+        this.secondTab.todayReceptionList.map((item) => {
           arr1.push(item.data);
         });
       }
@@ -453,7 +453,7 @@ export default {
           arr1.push(item.data);
         });
       } else if (idx == 4) {
-        Strname = ["活跃设备数"];
+        Strname = ["活跃用户数"];
         this.thirdTab.activeUserList.map((item) => {
           timeDate.push(item.time.substring(5, 10));
           arr1.push(item.data);

src/views/Statistics/dataScreeSys.vue

@@ -254,7 +254,7 @@
         </div> -->
         <div class="grid-content" style="cursor: pointer;" @click="Overviewxlick('4')">
           <div class="text1" :class="{ tophovese: cardindex == 4 }">
-            活跃设备数
+            活跃用户数
           </div>
           <div class="text2" :class="{ tophovese: cardindex == 4 }">
             {{ thirdTab.activeEquipmentQuantity || 0 }}
@@ -423,7 +423,7 @@ export default {
           timeDate.push(item.time.substring(11, 16));
           arr2.push(item.data);
         });
-        this.secondTab.todayActiveUserList.map((item) => {
+        this.secondTab.todayReceptionList.map((item) => {
           arr1.push(item.data);
         });
       }
@@ -477,7 +477,7 @@ export default {
           arr1.push(item.data);
         });
       } else if (idx == 4) {
-        Strname = ["活跃设备数"];
+        Strname = ["活跃用户数"];
         this.thirdTab.activeUserList.map((item) => {
           timeDate.push(item.time.substring(5, 10));
           arr1.push(item.data);

src/views/Statistics/houseDataSys.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="box-center">
     <!-- 头 -->
-    <div class="app-top">
+    <div class="app-top" v-if="orgType!=2">
       <div class="app-titel" style="margin-left: 15px">
         <el-select
           v-model="selValue"
@@ -9,13 +9,15 @@
           style="width: 100px"
           placeholder="请选择"
         >
-          <el-option
+          <!-- <el-option
             v-for="item in options"
             :key="item.value"
             :label="item.label"
             :value="item.value"
           >
-          </el-option>
+          </el-option> -->
+          <el-option label="代理商" v-if="orgType==0" value="0"></el-option>
+          <el-option label="公司" value="1"></el-option>
         </el-select>
         <div style="margin-left: 26px" v-if="selValue == 1">
           <el-select
@@ -234,11 +236,12 @@ export default {
       tableData:[],
       secondTab: {},
       thirdTab: {},
-      selValue: "0",
+      selValue: localStorage.getItem('orgType')==0?'0':'1',
       checked: false,
       selectTime1: "", //对比时间
       selectTime: "", //对比时间
-      choicValue: localStorage.getItem("houseId"),
+      choicValue:localStorage.getItem('orgType')==2?localStorage.getItem('orgCode'):'',
+      orgType:localStorage.getItem('orgType'),
       houseList: [],
       secindex: "1",
       dateType: 4,
@@ -259,6 +262,7 @@ export default {
           value: "1",
         },
       ],
+
     };
   },
   mounted() {

src/views/Template/taboo.vue

@@ -209,10 +209,10 @@ export default {
           });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
+          // this.$message({
+          //   type: "info",
+          //   message: "已取消删除",
+          // });
         });
     },
     //编辑

src/views/admin/dept/index.vue

@@ -81,7 +81,7 @@
         <el-form-item label="转移部门" prop="newDeptId">
           <el-select
             v-model="deptForm.newDeptId"
-            style="width: 200px"
+            style="width:80%;"
             placeholder="请选择"
             filterable
           >

src/views/building/index.vue

@@ -43,7 +43,7 @@
         </div> -->
 
         <div class="div-lab">
-          <div class="label">合同结束日期：</div>
+          <div class="label">筛选起止日期：</div>
           <el-date-picker
             v-model="starTime"
             class="div-inp"
@@ -185,7 +185,7 @@
         </el-table-column>
         <el-table-column prop="address" label="楼盘地址" align="center">
         </el-table-column>
-        <el-table-column prop="address" label="联系人信息" align="center">
+        <el-table-column prop="linkman" label="联系人信息" align="center">
           <template slot-scope="{ row }">
             {{ row.linkman || "-" }}-{{ row.linkmanPhone || "-" }}
           </template>
@@ -196,9 +196,12 @@
           </template>
         </el-table-column>
         <el-table-column prop="createTime" label="添加日期" align="center">
+          <template  slot-scope="{ row }">
+            {{row.createTime.substring(0,10)}}
+          </template>
         </el-table-column>
         <el-table-column
-          prop="address"
+          prop="houseType"
           label="楼盘类型"
           align="center"
           v-if="orgType != 2"
@@ -220,13 +223,13 @@
         </el-table-column>
         <!-- <el-table-column prop="residueTime" label="剩余天数" align="center">
         </el-table-column> -->
-        <el-table-column prop="address" label="服务状态" align="center">
+        <el-table-column prop="residueTime" label="服务状态" align="center">
           <template slot-scope="scope">
             <!-- {{ row.serviceStatus == 0 ? "在服务期内" : "已过期" }} -->
               <!-- <div v-if="scope.row.residueTime >0&&scope.row.lockFlag==0">在服务期内({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
               <div v-if="scope.row.residueTime <=0&&scope.row.lockFlag==0">过期({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
               <div v-if="scope.row.lockFlag==1">禁用</div> -->
-               <div v-if="scope.row.residueTime >0">在服务期内({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
+               <div v-if="scope.row.residueTime >0">服务中({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
               <div v-if="scope.row.residueTime <=0">过期({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
           </template>
         </el-table-column>
@@ -751,7 +754,7 @@ export default {
           ],
         linkmanPhone: [{ validator: validatePass, trigger: "blur" }],
         provinceId:[
-           { required: true, message: "请选择省市", trigger: "change" },
+           { required: false, message: "请选择省市", trigger: "change" },
         ]
       },
       operaForm: {

vue.config.js

@@ -4,7 +4,7 @@
  */
 // const url = 'http://pigx-gateway'
 // const url = 'http://39.97.167.65:9999' //测试
-// const url = 'http://192.168.31.169:9999' //长龙
+const url = 'http://192.168.31.169:9999' //长龙
 // const url = 'http://192.168.31.134:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 // const url = 'http://nitu5e.natappfree.cc' //王笑