init

src/page/check/chose.vue

@@ -309,10 +309,13 @@ export default {
       let obj = {
         current: this.currentPage,
         size: this.size,
-        propertyName: this.propertyName,
+
       };
       if (this.info.selectHouseType == 1) {
-        this.$api.api.zkhousePage(obj).then((res) => {
+        this.$api.api.zkhousePage({
+          propertyName: this.propertyName,
+          ...obj
+        }).then((res) => {
           // console.log(res)
           this.list = res.data.records;
           this.total = res.data.total;
@@ -322,6 +325,7 @@ export default {
         this.$api.api
           .findHouseByArea({
             id: this.area,
+            ...obj
           })
           .then((res) => {
             // console.log(res)
@@ -365,8 +369,8 @@ export default {
     locationsChange(e) {
       console.log(e);
       if (!e) return;
-      this.provinceId = e[0];
-      this.cityId = e[1];
+      this.searchhouseMsg.provinceId = e[0];
+      this.searchhouseMsg.cityId = e[1];
     },
   },
 };

src/page/check/index.vue

@@ -30,6 +30,7 @@
 </template>
 
 <script>
+import { getStore, setStore } from "@/util/store";
 export default {
   data() {
     return {
@@ -42,10 +43,13 @@ export default {
       // 楼盘后台标志
       tabFlag4: false,
       backFlag: false,
+      info: {},
     };
   },
   computed: {},
   mounted() {
+    // 获取用户信息
+    this.info = getStore({ name: "userInfo" });
     // console.log(this.$route.query.backFlag);
     if (this.$route.query.backFlag) {
       this.backFlag = this.$route.query.backFlag;
@@ -95,6 +99,95 @@ export default {
         });
       }
     },
+    // 获取代理商
+    getAgentList() {
+      this.$api.api
+        .zkagentPage({
+          current: 1,
+          pageSize: 10,
+          agentName: this.agentName,
+        })
+        .then((res) => {
+          // console.log(res);
+          // this.list = res.data.records;
+          // this.total = res.data.total;
+          if (res.data.total > 1) {
+            // 公司后台
+            this.$router.push({ path: "/chose", query: { flag: 1 } });
+          } else {
+            this.$router.push({ path: "/wel" });
+          }
+        });
+    },
+    getCompanyList() {
+      this.$api.api
+        .zkorg({
+          current: 1,
+          size: 10,
+          name: this.companyName,
+          orgType: localStorage.getItem("orgType"),
+        })
+        .then((res) => {
+          // console.log(res);
+          // this.list = res.data.records;
+          // this.total = res.data.total;
+          if (res.data.total > 1) {
+            // 公司后台
+            this.$router.push({ path: "/chose", query: { flag: 2 } });
+          } else {
+            this.$router.push({ path: "/wel" });
+          }
+        });
+    },
+    findByUserName() {
+      this.$api.api
+        .findByUserName({
+          managerPhone: this.info.username,
+        })
+        .then((res) => {
+          // console.log(res);
+          this.info.selectHouseType = res.selectHouseType;
+          // 获取楼盘
+          this.zkhousePage();
+        });
+    },
+    zkhousePage() {
+      let obj = {
+        current: 1,
+        size: 10,
+      };
+      if (this.info.selectHouseType == 1) {
+        this.$api.api.zkhousePage(obj).then((res) => {
+          // console.log(res)
+          // this.list = res.data.records;
+          // this.total = res.data.total;
+          if (res.data.total > 1) {
+            // 公司后台
+            this.$router.push({ path: "/chose", query: { flag: 3 } });
+          } else {
+            this.$router.push({ path: "/wel" });
+          }
+        });
+      }
+      if (this.info.selectHouseType == 2) {
+        this.$api.api
+          .findHouseByArea({
+            id: null,
+            ...obj
+          })
+          .then((res) => {
+            // console.log(res)
+            // this.list = res.data.records;
+            // this.total = res.data.total;
+            if (res.data.total > 1) {
+              // 公司后台
+              this.$router.push({ path: "/chose", query: { flag: 3 } });
+            } else {
+              this.$router.push({ path: "/wel" });
+            }
+          });
+      }
+    },
     goindex(idx) {
       localStorage.setItem("orgType", idx);
       if (idx == 0) {
@@ -102,16 +195,18 @@ export default {
         this.$router.push({ path: "/wel" });
       }
       if (idx == 1) {
+        this.getAgentList();
         // 代理商
-        this.$router.push({ path: "/chose", query: { flag: 1 } });
+        // this.$router.push({ path: "/chose", query: { flag: 1 } });
       }
       if (idx == 2) {
-        // 公司后台
-        this.$router.push({ path: "/chose", query: { flag: 2 } });
+        // 获取公司
+        this.getCompanyList();
       }
       if (idx == 3) {
+        this.findByUserName();
         // 楼盘后台
-        this.$router.push({ path: "/chose", query: { flag: 3 } });
+        // this.$router.push({ path: "/chose", query: { flag: 3 } });
       }
 
       // this.$router.push({ path: "/chose" });
@@ -121,7 +216,7 @@ export default {
 </script>
 
 <style lang="scss" scoped >
-.box-center{
+.box-center {
   min-width: 1500px;
 }
 .head {

src/page/index/top/index.vue

@@ -49,7 +49,7 @@
           <top-color />
         </div>
       </el-tooltip>
-      <el-tooltip
+      <!-- <el-tooltip
         v-if="showDebug"
         :content="logsFlag ? '没有错误日志' : `${logsLen}条错误日志`"
         effect="dark"
@@ -58,7 +58,7 @@
         <div class="top-bar__item">
           <top-logs />
         </div>
-      </el-tooltip>
+      </el-tooltip> -->
       <el-tooltip
         v-if="showLock"
         effect="dark"

src/views/Equipment/index.vue

@@ -237,35 +237,63 @@
         </el-table-column>
         <el-table-column prop="date" label="在线状态" align="center">
         </el-table-column>
-                <el-table-column prop="date" label="录音状态" align="center">
+        <el-table-column prop="date" label="录音状态" align="center">
+        </el-table-column>
+        <el-table-column prop="name" label="上传状态" align="center">
         </el-table-column>
         <el-table-column prop="name" label="设备状态" align="center">
         </el-table-column>
+
         <el-table-column prop="name" label="转写方式" align="center">
         </el-table-column>
-                <el-table-column prop="name" label="开机指示灯" align="center">
+        <el-table-column prop="name" label="开机指示灯" align="center">
+        </el-table-column>
+        <el-table-column prop="name" label="电池电量" align="center">
         </el-table-column>
-                        <el-table-column prop="name" label="电池电量" align="center">
+        <el-table-column prop="name" label="信号强度" align="center">
         </el-table-column>
-        <el-table-column prop="name" label="楼盘名称" align="center">
+        <el-table-column prop="name" label="待上传文件" align="center">
         </el-table-column>
+
         <el-table-column prop="name" label="更新时间" align="center">
         </el-table-column>
-        <el-table-column prop="name" label="批次号" align="center">
+        <el-table-column prop="name" label="开机时间" align="center">
+        </el-table-column>
+        <el-table-column prop="name" label="关机时间" align="center">
         </el-table-column>
-        <el-table-column prop="name" label="验收状态" align="center">
+        <el-table-column prop="name" label="关机类型" align="center">
+        </el-table-column>
+        <el-table-column prop="name" label="添加时间" align="center">
+        </el-table-column>
+        <el-table-column prop="name" label="购买时间" align="center">
+        </el-table-column>
+        <el-table-column prop="name" label="绑定代理时间" align="center">
         </el-table-column>
         <!--  scope -->
-        <el-table-column label="操作" align="center">
-          <template slot-scope="">
-            <div style="color: #2671e2" @click="toinifoThereturn()">归还</div>
-            <div style="color: #2671e2" @click="infotranscription()">
+        <el-table-column label="操作" align="center" fixed="right" width="200">
+          <template slot-scope="{ row }">
+            <el-button type="text" @click="toinifoThereturn()">归还</el-button>
+            <!-- <el-button type="text" @click="infotranscription()">
               转写开关
-            </div>
-            <div style="color: #2671e2" @click="acceptance()">验收</div>
-            <div style="color: #2671e2" @click="toinfobinding()">绑定</div>
-            <div style="color: #2671e2" @click="infoeditor()">修改</div>
-            <div style="color: #2671e2" @click="toinifodelete()">删除</div>
+            </el-button>
+            <el-button type="text" @click="acceptance()">验收</el-button>
+            <el-button type="text" @click="toinfobinding()">绑定</el-button>
+            <el-button type="text" @click="infoeditor()">修改</el-button>
+            <el-button type="text" @click="toinifodelete()">删除</el-button> -->
+
+            <el-dropdown @command="handleCommand">
+              <span style="color:#409eff; font-size:12px;margin-left:10px;">
+                更多<i class="el-icon-arrow-down el-icon--right"></i>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command='toinifoThereturn' >归还</el-dropdown-item>
+                <el-dropdown-item command='infotranscription' >转写开关</el-dropdown-item>
+                <el-dropdown-item command="acceptance">验收</el-dropdown-item>
+                <el-dropdown-item command="toinfobinding">绑定</el-dropdown-item>
+                <el-dropdown-item  command="infoeditor">修改</el-dropdown-item>
+                <el-dropdown-item  command="toinifodelete">删除</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
           </template>
         </el-table-column>
       </el-table>
@@ -606,6 +634,9 @@ export default {
     this.equipmentManagement();
   },
   methods: {
+    handleCommand(e){
+      this[e]()
+    },
     equipmentManagement() {
       this.$api.api
         .equipmentManagement({