修改手机接口

src/views/phone/cabinet/index.vue

@@ -4,7 +4,7 @@
       <ul>
         <li class="oneUl" v-for="(item, i) in cabinetList" :key="i">
           <div
-            @click="opens(item.number, item.departmentInfo.name)"
+            @click="opens(item.number)"
             style="
               width: 265px;
               height: 230px;
@@ -105,10 +105,10 @@
           <el-button size="btp" @click="resetQuery">重置</el-button>
         </el-form-item> -->
         <div class="shuJu">
-          <span class="box4 public"> 已存物 :{{ green }}个</span>
-          <span class="box5 public"> 未存物 :{{ red }}个</span>
-          <!-- <span class="box6"> 已请假 :{{ yellow }}个</span>
-          <span class="box7"> 未绑定 :{{ grey }}个</span> -->
+          <span class="box4 public"> 已存放 :{{ green }}个</span>
+          <span class="box5 public"> 未放入 :{{ red }}个</span>
+          <span class="box6"> 已请假 :{{ yellow }}个</span>
+          <span class="box7"> 未绑定 :{{ grey }}个</span>
         </div>
       </el-form>
       <ul class="twoUl">
@@ -116,28 +116,22 @@
           v-for="(item, i) in gridList"
           :key="i"
           :class="{
-            greed: item.warnState != '未存物',
-            red: item.warnState == '未存物',
+            greed: item.gridState == '手机已放入',
+            red: item.gridState == '手机未放入',
+            yellow: item.gridState == '人员请假',
+            grey: item.gridState == '未绑定人员',
           }"
           class="orging"
         >
-          <!-- greed: item.gridState == '手机放入',
-            red: item.gridState == '手机未放入',
-            yellow: item.gridState == '人员请假',
-            grey: item.gridState == '未绑定人员', -->
           <div class="two_div">
             <span>{{ item.deviceId }}</span>
           </div>
           <el-button
             size="mini"
-            @click.native="buttOn(item.staffName, item.warnState)"
-            >{{ item.staffName }}</el-button
+            @click.native="buttOn(item.staffInfoWithId, item)"
+            >{{ item.staffInfoWithId.Name }}</el-button
           >
         </li>
-        <!-- <el-button
-            size="mini"
-         @click.native="buttOn(item.staffInfoWithId, item)" 
-       {{ item.staffInfoWithId.Name }} ></el-button> -->
       </ul>
     </div>
 
@@ -166,7 +160,7 @@
               <div style="width: 100px">{{ deviceId }}</div>
             </el-form-item>
             <el-form-item label="存物状态 :" prop="address">
-              <div style="width: 100px">{{ warnState }}</div>
+              <div style="width: 100px">{{ stoneState }}</div>
             </el-form-item>
             <el-form-item label="发生时间 :" prop="gridNumber">
               <div style="width: 120px">{{ happenTime }}</div>
@@ -193,8 +187,7 @@
               <div style="width: 100px" v-else></div>
             </el-form-item>
             <el-form-item label="所在单位 :" prop="gridNumber">
-              <div style="width: 120px">{{ danw }}</div>
-              <!-- <div style="width: 120px">{{ departmentName }}</div> -->
+              <div style="width: 120px">{{ departmentName }}</div>
             </el-form-item>
             <div class="jiben">存取记录</div>
             <el-table
@@ -247,7 +240,6 @@ import {
   xianPhoneGeZi,
   xianPhoneOppe,
   getToken,
-  aaa,
 } from "@/api/phone/cabinet";
 import { from } from "../../../../public/assets/libs/moment/src/lib/moment/from";
 import Cookies from "js-cookie";
@@ -316,9 +308,6 @@ export default {
       happenTime: null,
       // 单位名字
       departmentName: null,
-      // 点击柜子保存的单位
-      danw: "",
-      warnState: "",
     };
   },
   created() {
@@ -330,6 +319,7 @@ export default {
       this.loading = true;
       const params = this.queryParams;
       xianPhoneOppe(params).then((res) => {
+        console.log(res);
         this.tableData = res.data.infos;
         this.total = res.data.totalCount;
         this.happenTime = res.data.infos[0].happenTime;
@@ -351,7 +341,6 @@ export default {
     },
     // 点击名字触发
     buttOn(row, data) {
-      this.warnState = data;
       this.jiBen = row;
       this.deviceId = data.deviceId;
       this.stoneState = data.stoneState;
@@ -371,36 +360,25 @@ export default {
       this.grey = 0;
     },
     // 点击手机柜触发
-    opens(cabinetNum, names) {
+    opens(cabinetNum) {
       this.phone = false;
       this.phone2 = true;
-      this.danw = names;
       this.cabinetNumber = cabinetNum;
-      aaa().then((res) => {
+      xianPhoneGeZi(this.cabinetNumber).then((res) => {
         this.gridList = res.data.infos;
+        console.log(res.data.infos);
         this.gridList.forEach((item) => {
-          if (item.warnState == "未存物") {
+          if (item.gridState == "手机未放入") {
             this.red += 1;
-          } else {
+          } else if (item.gridState == "手机已放入") {
             this.green += 1;
+          } else if (item.gridState == "人员请假") {
+            this.yellow += 1;
+          } else {
+            this.grey += 1;
           }
         });
       });
-      // xianPhoneGeZi(this.cabinetNumber).then((res) => {
-      //   this.gridList = res.data.infos;
-      //   console.log(res.data.infos);
-      //   this.gridList.forEach((item) => {
-      //     if (item.gridState == "手机未放入") {
-      //       this.red += 1;
-      //     } else if (item.gridState == "手机已存放") {
-      //       this.green += 1;
-      //     } else if (item.gridState == "人员请假") {
-      //       this.yellow += 1;
-      //     } else {
-      //       this.grey += 1;
-      //     }
-      //   });
-      // });
       // axios
       //   .get("http://114.115.153.156:12090/wl/api/v1/grids", {
       //     params: { cabinetNum },
@@ -425,6 +403,7 @@ export default {
     /** 查询手机柜列表 */
     getList() {
       xianPhone().then((res) => {
+        // console.log(res);
         this.cabinetList = res.data.infos;
       });
     },