init

src/api/modules/api.js

@@ -513,3 +513,20 @@ export function findByUserName(query) {
     params:query
   })
 }
+// 设备列表获取批次列表
+export function zkequipmentbatchList(query) {
+  return request({
+    url: 'autoSR/zkequipmentbatch/list',
+    method:'get',
+    params:query
+  })
+}
+
+// 添加设备
+export function zkequipmentbatchInsert(data) {
+  return request({
+    url: '/autoSR/zkequipmentbatch/insert',
+    method:'post',
+    data
+  })
+}

src/const/crud/admin/log.js

@@ -1,58 +1,67 @@
 export const tableOption = {
   border: true,
   index: true,
-  indexLabel: '序号',
+  indexLabel: "序号",
   stripe: true,
-  menuAlign: 'center',
+  menuAlign: "center",
   menuWidth: 150,
 
-  align: 'center',
+  align: "center",
   refreshBtn: true,
   showClomnuBtn: false,
-  searchSize: 'mini',
+  searchSize: "mini",
   searchMenuSpan: 6,
-  delBtn:false,
+  delBtn: false,
   addBtn: false,
   editBtn: false,
   viewBtn: true,
   props: {
-    label: 'label',
-    value: 'value'
+    label: "label",
+    value: "value"
   },
-  column: [{
-    label: '类型',
-    prop: 'type',
-    type: 'select',
-    dicUrl: '/admin/dict/type/log_type',
-    // search: true
-  }, {
-    label: '标题',
-    prop: 'title'
-  }, {
-    label: 'IP地址',
-    prop: 'remoteAddr'
-  }, {
-    label: '请求方式',
-    prop: 'method'
-  }, {
-    label: '客户端',
-    prop: 'serviceId'
-  },
-  // {
-  //   width: 80,
-  //   label: '请求时间',
-  //   prop: 'time'
-  // },
-  {
-    width: 150,
-    label: '登录时间',
-    prop: 'createTime',
-    type: 'datetime',
-    rangeSeparator:"-",
-    format: 'yyyy-MM-dd HH:mm',
-    valueFormat: 'yyyy-MM-dd HH:mm:ss',
-    // search: true,
-    searchRange: true
-  }]
-}
-
+  column: [
+    {
+      label: "名称",
+      prop: "name"
+    },
+    {
+      label: "类型",
+      prop: "type",
+      type: "select",
+      dicUrl: "/admin/dict/type/log_type"
+      // search: true
+    },
+    {
+      label: "标题",
+      prop: "title"
+    },
+    {
+      label: "IP地址",
+      prop: "remoteAddr"
+    },
+    {
+      label: "请求方式",
+      prop: "method"
+    },
+    {
+      label: "客户端",
+      prop: "serviceId"
+    },
+    // {
+    //   width: 80,
+    //   label: '请求时间',
+    //   prop: 'time'
+    // },
+    {
+      width: 150,
+      label: "登录时间",
+      prop: "createTime",
+      type: "datetime",
+      rangeSeparator: "-",
+      format: "yyyy-MM-dd HH:mm",
+      valueFormat: "yyyy-MM-dd HH:mm:ss",
+      // search: true,
+      searchRange: true
+    }
+  ]
+};

src/page/check/chose.vue

@@ -338,15 +338,21 @@ export default {
       console.log(item);
       if (this.flag == 1) {
         localStorage.setItem("agentId", item.id);
+        localStorage.setItem("orgCode", '');
         localStorage.setItem("topName", item.agentName);
+        localStorage.setItem("houseId", '');
       }
       if (this.flag == 2) {
+        localStorage.setItem("agentId", '');
         localStorage.setItem("orgCode", item.orgCode);
         localStorage.setItem("topName", item.name);
+        localStorage.setItem("houseId", '');
       }
       if (this.flag == 3) {
         localStorage.setItem("orgCode", item.orgCode);
+        localStorage.setItem("agentId", '');
         localStorage.setItem("topName", item.propertyName);
+        localStorage.setItem("houseId", item.id);
       }
       this.$router.push({ path: "/wel" });
     },

src/page/check/index.vue

@@ -106,7 +106,6 @@ export default {
           current: 1,
           pageSize: 10,
           agentName: this.agentName,
-
         })
         .then((res) => {
           // console.log(res);
@@ -122,6 +121,8 @@ export default {
             this.$router.push({ path: "/wel" });
             localStorage.setItem("topName", res.data.records[0].agentName);
             localStorage.setItem("agentId", res.data.records[0].id);
+            localStorage.setItem("orgCode", "");
+            localStorage.setItem("houseId", "");
           }
         });
     },
@@ -147,6 +148,8 @@ export default {
             this.$router.push({ path: "/wel" });
             localStorage.setItem("topName", res.data.records[0].name);
             localStorage.setItem("orgCode", res.data.records[0].orgCode);
+            localStorage.setItem("agentId", "");
+            localStorage.setItem("houseId", "");
           }
         });
     },
@@ -183,6 +186,8 @@ export default {
             this.$router.push({ path: "/wel" });
             localStorage.setItem("topName", res.data.records[0].propertyName);
             localStorage.setItem("orgCode", res.data.records[0].orgCode);
+            localStorage.setItem("agentId", "");
+            localStorage.setItem("houseId", res.data.records[0].id);
           }
         });
       }
@@ -206,6 +211,8 @@ export default {
               this.$router.push({ path: "/wel" });
               localStorage.setItem("topName", res.data.records[0].propertyName);
               localStorage.setItem("orgCode", res.data.records[0].orgCode);
+              localStorage.setItem("houseId", res.data.records[0].id);
+              localStorage.setItem("agentId", "");
             }
           });
       }
@@ -213,7 +220,10 @@ export default {
     goindex(idx) {
       localStorage.setItem("orgType", idx);
       if (idx == 0) {
-        localStorage.setItem("topName", '');
+        localStorage.setItem("topName", "");
+        localStorage.setItem("orgCode", '');
+        localStorage.setItem("houseId", '');
+        localStorage.setItem("agentId", "");
         // 质控管家后台
         this.$router.push({ path: "/wel" });
       }

src/views/Equipment/index.vue

@@ -102,7 +102,7 @@
             </el-option>
           </el-select>
         </div>
-
+<!--
         <div class="div-lab">
           <div class="label">录音状态</div>
           <el-select
@@ -121,9 +121,9 @@
             >
             </el-option>
           </el-select>
-        </div>
+        </div> -->
 
-        <div class="div-lab">
+        <!-- <div class="div-lab">
           <div class="label">上传状态</div>
           <el-select
             class="div-inp"
@@ -141,9 +141,9 @@
             >
             </el-option>
           </el-select>
-        </div>
+        </div> -->
 
-        <div class="div-lab">
+        <!-- <div class="div-lab">
           <div class="label">关机状态</div>
           <el-select
             class="div-inp"
@@ -161,7 +161,7 @@
             >
             </el-option>
           </el-select>
-        </div>
+        </div> -->
       </div>
       <div class="app-titel" style="margin-top: 15px">
         <!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
@@ -227,28 +227,34 @@
         </el-table-column>
         <el-table-column prop="orgName" label="公司" align="center">
         </el-table-column>
-        <el-table-column prop="houseName" label="楼盘" align="center">
+        <el-table-column prop="propertyName" label="楼盘" align="center">
         </el-table-column>
-        <el-table-column prop="date" label="领用人" align="center">
+        <el-table-column prop="accountName" label="领用人" align="center">
         </el-table-column>
-        <el-table-column prop="date" label="领用人手机" align="center">
+        <el-table-column prop="accountPhone" label="领用人手机" align="center">
         </el-table-column>
         <el-table-column prop="receiveType" label="领用状态" align="center">
+          <template slot-scope="{ row }">
+            {{row.receiveType==1?'未领用':row.receiveType==2?'使用中':'已归还'}}
+          </template>
         </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="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="acceptanceStatus" label="设备状态" align="center">
+          <template slot-scope="{ row }">
+            {{row.acceptanceStatus==0?'已验收':row.acceptanceStatus==1?'未验收':row.acceptanceStatus==2?'维修中':row.acceptanceStatus==3?'维修中':'已报损'}}
+          </template>
         </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
+        <!-- <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="电池电量"
           width="200"
@@ -270,12 +276,14 @@
         <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="createTime" label="添加时间" align="center" width="150">
         </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" width="150">
         </el-table-column>
-        <el-table-column prop="name" label="绑定代理时间" align="center">
+        <el-table-column prop="name" label="绑定代理时间" align="center" width="150">
         </el-table-column>
         <!--  scope -->
         <el-table-column label="操作" align="center" fixed="right" width="200">
@@ -338,13 +346,13 @@
         <el-form-item label="设备号" prop="imei">
           <el-input v-model="addForm.imei" style="width: 80%"></el-input>
         </el-form-item>
-        <el-form-item label="转写方式" prop="defaultTransliteration">
+        <!-- <el-form-item label="转写方式" prop="defaultTransliteration">
           <el-radio-group v-model="addForm.defaultTransliteration">
             <el-radio label="3">关闭转写</el-radio>
             <el-radio label="6">科大讯飞</el-radio>
             <el-radio label="9">思必驰</el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="批次号" prop="batchId">
           <el-select
             v-model="addForm.batchId"
@@ -352,10 +360,10 @@
             placeholder="请选择"
           >
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in batchList"
+              :key="item.batchId"
+              :label="item.batchId"
+              :value="item.batchId"
             >
             </el-option>
           </el-select>
@@ -598,13 +606,14 @@ export default {
           label: "已归还",
         },
       ],
-      currentPage: 4,
+      currentPage: 1,
       size: 10,
       total: 10,
       value: "",
       input: "",
       tableData: [],
       houseList: [],
+      batchList:[],
       dialogVisible: false,
       dialogVisible2: false,
       dialogVisible3: false,
@@ -616,7 +625,7 @@ export default {
       },
       addForm: {
         imei: "",
-        defaultTransliteration: "",
+        // defaultTransliteration: "",
         batchId: "",
         remark: "",
       },
@@ -647,10 +656,20 @@ export default {
   mounted() {
     // 获取设备列表
     this.equipmentManagement();
+    // 获取批次列表
+    this.zkequipmentbatchList()
     // 获取楼盘列表
     this.zkhousePage();
   },
   methods: {
+    // 获取批次列表
+    zkequipmentbatchList(){
+      this.$api.api.zkequipmentbatchList()
+      .then(res=>{
+        // console.log(res)
+        this.batchList=res.data
+      })
+    },
     handleCommand(e) {
       this[e]();
     },

src/views/admin/log/index.vue

@@ -185,6 +185,10 @@ export default {
             descs: "create_time",
             current: page.currentPage,
             size: page.pageSize,
+            orgType: localStorage.getItem("orgType"),
+            orgCode: localStorage.getItem("orgCode"),
+            agentId: localStorage.getItem("agentId"),
+            houseId:localStorage.getItem("houseId"),
           },
           params,
           this.searchForm

src/views/admin/log/log.vue

@@ -184,6 +184,10 @@ export default {
             descs: "create_time",
             current: page.currentPage,
             size: page.pageSize,
+            orgType: localStorage.getItem("orgType"),
+            orgCode: localStorage.getItem("orgCode"),
+            agentId: localStorage.getItem("agentId"),
+            houseId: localStorage.getItem("houseId"),
           },
           params,
           this.searchForm

src/views/admin/user/index.vue

@@ -1417,12 +1417,22 @@ export default {
       // console.log(this.searchMsg1);
       // return
       if (this.choseFlag) {
+        let orgId=''
+        if(localStorage.getItem("orgType")==0){
+          orgId=''
+        }
+        else if(localStorage.getItem("orgType")==1){
+          orgId=localStorage.getItem("agentId")
+        }else{
+          orgId=localStorage.getItem("orgCode")
+        }
         // 注册用户列表
         this.$api.api
           .registerUserList({
             ...this.page,
             ...this.searchMsg,
             orgType: localStorage.getItem("orgType"),
+            orgId,
           })
           .then((res) => {
             // console.log(res);