更改主页，更改手机柜，更改基层登统计查看表格对其

src/api/materialManagement/distribution.js

@@ -58,4 +58,13 @@ export function exportMaterialRegWuPingList(query) {
     method: 'get',
     params: query
   })
+}
+
+// 获取所有树形单位
+export function treeselect(query) {
+  return request({
+    url: '/system/dept/treeselect',
+    method: 'get',
+    params: query
+  })
 }

src/api/phone/cabinet.js

@@ -11,7 +11,6 @@ export function xianPhone(query) {
 }
 // 线上获取指定手机柜的全部格子
 export function xianPhoneGeZi(query) {
-  console.log(query);
   return requests({
     url: '/wl/api/v1/grids',
     method: 'get',
@@ -33,4 +32,14 @@ export function getToken(data) {
     method: 'post',
     data
   })
-}
+}
+
+// 获取accessToken
+export function aaa(data) {
+  return requests({
+    url: '/wl/api/v1/log/store',
+    method: 'GET',
+    data
+  })
+}
+

src/api/pt.js

@@ -53,3 +53,13 @@ export function getWorkTask(query) {
     params: query
   })
 }
+
+
+// // 首页的显示隐藏
+// export function getNone(query) {
+//   return request({
+//     url: '/system/menu/getmeun',
+//     method: 'get',
+//     params: query
+//   })
+// }

src/views/grassrootsregistration/bdglarmament/index.vue

@@ -37,9 +37,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery" 
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -797,4 +795,7 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+#chakan /deep/ .el-dialog__body {
+  padding: 30px 0px 30px 5px;
+}
 </style>

src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -4457,4 +4457,7 @@ table td {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+#chakan /deep/ .el-dialog__body {
+  margin: 10px 0px 20px 64px;
+}
 </style>

src/views/grassrootsregistration/bdgldrill/index.vue

@@ -24,9 +24,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button size="btr" @click="resetQuery"  
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -676,4 +674,7 @@ export default {
 ::v-deep ::-webkit-input-placeholder {
   color: #bdbdbd4f !important;
 }
+#chakan /deep/ .el-dialog__body {
+  padding: 30px 0px 30px 15px;
+}
 </style>

src/views/grassrootsregistration/bdglequip/index.vue

@@ -860,4 +860,7 @@ export default {
 ::v-deep ::-webkit-input-placeholder {
   color: #bdbdbd4f !important;
 }
+#chakan /deep/ .el-dialog__body {
+  padding: 30px 0px 30px 23px;
+}
 </style>

src/views/grassrootsregistration/bdgleven/index.vue

@@ -877,4 +877,7 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+#chakan /deep/ .el-dialog__body {
+  padding: 30px 0px 30px 0px;
+}
 </style>

src/views/grassrootsregistration/bdglfood/index.vue

@@ -2081,4 +2081,7 @@ table td {
   border-radius: 0;
   background: rgba(0, 0, 0, 0);
 } */
+#chakan /deep/ .el-dialog__body {
+  padding: 30px 0px 30px 0px;
+}
 </style>

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -942,4 +942,7 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+#chakan /deep/ .el-dialog__body {
+  padding: 30px 0px 30px 0px;
+}
 </style>

src/views/grassrootsregistration/bdglparty/index.vue

@@ -923,4 +923,7 @@ export default {
 ::v-deep .el-form-item__error {
   left: 0;
 }
+#chakan /deep/ .el-dialog__body {
+  padding: 30px 0px 30px 0px;
+}
 </style>

src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -33,9 +33,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery"  
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -749,4 +747,7 @@ export default {
 ::v-deep ::-webkit-input-placeholder {
   color: #bdbdbd4f !important;
 }
+#chakan /deep/ .el-dialog__body {
+  padding: 30px 0px 30px 16px;
+}
 </style>

src/views/grassrootsregistration/bdglsecrecy/index.vue

@@ -831,4 +831,7 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+#chakan /deep/ .el-dialog__body {
+  padding: 30px 0px 30px 15px;
+}
 </style>

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -910,4 +910,7 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+#chakan /deep/ .el-dialog__body {
+  padding: 30px 0px 30px 0px;
+}
 </style>

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -1187,4 +1187,7 @@ export default {
   background-color: transparent !important;
   color: #fff;
 }
+#chakan /deep/ .el-dialog__body {
+  margin: 10px 0px 20px 0px;
+}
 </style>

src/views/materialManagement/distribution/index.vue

@@ -344,6 +344,7 @@
         label="发放单位"
         align="center"
         prop="responsibilityUnit"
+        width="150px"
       />
       <el-table-column label="发放对象" align="center" prop="outPeople">
       </el-table-column>
@@ -351,7 +352,7 @@
         label="接收单位"
         align="center"
         prop="outUnit"
-        width="120"
+        width="150px"
       />
       <el-table-column label="接收人" align="center" prop="recipient" />
       <el-table-column label="存放位置" align="center" prop="storageLocation" />
@@ -604,11 +605,12 @@ import {
   updateDistribution,
   exportDistribution,
   exportMaterialRegWuPingList,
+  treeselect,
 } from "@/api/materialManagement/distribution";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { getDept, getZhuChiRen } from "@/api/materialManagement/archives";
+import { getZhuChiRen } from "@/api/materialManagement/archives";
 
 export default {
   components: {
@@ -703,17 +705,21 @@ export default {
     },
     // 点击发放对象
     dianJi(value) {
-      // console.log(value);
+      console.log(value);
       if (value == "0") {
         this.danWei = false;
         this.ren = true;
         this.form.outUnitId = null;
         this.form.outUnit = "";
+        this.form.recipient = "";
+        this.form.recipientId = "";
       } else if (value == "2") {
         this.ren = false;
         this.danWei = true;
         this.form.recipient = "";
         this.form.recipientId = "";
+        this.form.outUnitId = null;
+        this.form.outUnit = "";
       }
     },
     // 获取人员
@@ -724,7 +730,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      getDept().then((response) => {
+      treeselect().then((response) => {
         this.deptOptions = response.data;
       });
     },
@@ -820,6 +826,14 @@ export default {
       this.getTreeselect();
       this.reset();
       const id = row.id || this.ids;
+      console.log(row);
+      if (row.outPeople == "单位") {
+        this.danWei = true;
+        this.ren = false;
+      } else {
+        this.ren = true;
+        this.danWei = false;
+      }
       getDistribution(id).then((response) => {
         this.form = response.data;
         this.getRenYuan(this.form.responsibilityUnitId);

src/views/militaryvehicleManagement/driver/index.vue

@@ -8,7 +8,14 @@
       label-width="68px"
     >
       <el-form-item prop="confidential">
-        <el-select
+        <el-input
+          v-model="queryParams.unitName"
+          placeholder="请输入单位"
+          clearable
+          size="small"
+          @input="handleQuery"
+        />
+        <!-- <el-select
           v-model="queryParams.peopleId"
           placeholder="请选择姓名"
           @change="handleQuery"
@@ -23,7 +30,7 @@
             class="input_xiala"
           >
           </el-option>
-        </el-select>
+        </el-select> -->
       </el-form-item>
       <el-form-item>
         <!-- <el-button
@@ -115,7 +122,11 @@
         prop="sexList"
         :formatter="sexLian"
       />
-      <el-table-column label="驾龄" align="center" prop="drivingAge" />
+      <el-table-column label="驾龄" align="center" prop="drivingAge">
+        <template scope="scope">
+          <span>{{ scope.row.drivingAge }}年</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="入伍时间"
         align="center"
@@ -506,7 +517,7 @@ export default {
       let times1 = Date.parse(tiem);
       let times2 = Date.parse(value);
       let times3 = (times1 - times2) / 31104000000;
-      this.form.drivingAge = Math.trunc(times3) + "年";
+      this.form.drivingAge = Math.trunc(times3);
     },
     // 获取搜索所有人
     getSuo() {
@@ -621,7 +632,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.peopleId = null;
+      this.queryParams.unitName = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -489,16 +489,22 @@
             :options="treeList"
             placeholder="选择单位"
             @select="selectPeo"
+            :disabled="dislable"
           />
         </el-form-item>
         <el-form-item label="人数" prop="peopleCount">
-          <el-input v-model="form.peopleCount" placeholder="请输入人数" />
+          <el-input
+            v-model="form.peopleCount"
+            placeholder="请输入人数"
+            :disabled="dislable"
+          />
         </el-form-item>
         <el-form-item label="人员名称" prop="peopleId">
           <el-select
             v-model="form.peopleId"
             placeholder="请选择人员名称"
             filterable
+            :disabled="dislable"
           >
             <el-option
               v-for="(item, i) in renYuan"
@@ -512,10 +518,18 @@
           </el-select>
         </el-form-item>
         <el-form-item label="联系方式" prop="contact">
-          <el-input v-model="form.contact" placeholder="请输入联系方式" />
+          <el-input
+            v-model="form.contact"
+            placeholder="请输入联系方式"
+            :disabled="dislable"
+          />
         </el-form-item>
         <el-form-item label="出车路线" prop="route">
-          <el-input v-model="form.route" placeholder="请输入出车路线" />
+          <el-input
+            v-model="form.route"
+            placeholder="请输入出车路线"
+            :disabled="dislable"
+          />
         </el-form-item>
         <el-form-item label="用车开始时间" prop="authStime">
           <el-date-picker
@@ -526,6 +540,7 @@
             default-time="00:00:00"
             value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="用车开始时间"
+            :disabled="dislable"
           >
           </el-date-picker>
         </el-form-item>
@@ -537,6 +552,7 @@
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
             placeholder="用车结束时间"
+            :disabled="dislable"
           >
           </el-date-picker>
         </el-form-item>
@@ -545,6 +561,7 @@
             v-model="form.unitPeopleId"
             placeholder="请选择单位审批人"
             filterable
+            :disabled="dislable"
           >
             <el-option
               v-for="(item, i) in userRen"
@@ -562,6 +579,7 @@
             v-model="form.thebusThemplateId"
             placeholder="请选择审批模板"
             filterable
+            :disabled="dislable"
           >
             <el-option
               v-for="(item, i) in shenPi"
@@ -634,16 +652,22 @@
             :options="treeList"
             placeholder="选择单位"
             @select="selectPeo"
+            :disabled="dislable"
           />
         </el-form-item>
         <el-form-item label="人数" prop="peopleCount">
-          <el-input v-model="form.peopleCount" placeholder="请输入人数" />
+          <el-input
+            v-model="form.peopleCount"
+            placeholder="请输入人数"
+            :disabled="dislable"
+          />
         </el-form-item>
         <el-form-item label="人员名称" prop="peopleId">
           <el-select
             v-model="form.peopleId"
             placeholder="请选择人员名称"
             filterable
+            :disabled="dislable"
           >
             <el-option
               v-for="(item, i) in renYuan"
@@ -656,10 +680,18 @@
           </el-select>
         </el-form-item>
         <el-form-item label="联系方式" prop="contact">
-          <el-input v-model="form.contact" placeholder="请输入联系方式" />
+          <el-input
+            v-model="form.contact"
+            placeholder="请输入联系方式"
+            :disabled="dislable"
+          />
         </el-form-item>
         <el-form-item label="出车路线" prop="route">
-          <el-input v-model="form.route" placeholder="请输入出车路线" />
+          <el-input
+            v-model="form.route"
+            placeholder="请输入出车路线"
+            :disabled="dislable"
+          />
         </el-form-item>
         <el-form-item label="用车开始时间" prop="authStime">
           <el-date-picker
@@ -668,6 +700,7 @@
             v-model="form.authStime"
             type="datetime"
             placeholder="用车开始时间"
+            :disabled="dislable"
           >
           </el-date-picker>
         </el-form-item>
@@ -678,6 +711,7 @@
             v-model="form.authEtime"
             type="datetime"
             placeholder="用车结束时间"
+            :disabled="dislable"
           >
           </el-date-picker>
         </el-form-item>
@@ -686,6 +720,7 @@
             v-model="form.unitPeopleId"
             placeholder="请选择所在单位审批人"
             filterable
+            :disabled="dislable"
           >
             <el-option
               v-for="(item, i) in userRen"
@@ -702,6 +737,7 @@
             v-model="form.thebusThemplateId"
             placeholder="请选择审批模板"
             filterable
+            :disabled="dislable"
           >
             <el-option
               v-for="(item, i) in shenPi"
@@ -774,16 +810,22 @@
             :options="treeList"
             placeholder="选择单位"
             @select="selectPeo"
+            :disabled="dislable"
           />
         </el-form-item>
         <el-form-item label="人数" prop="peopleCount">
-          <el-input v-model="form.peopleCount" placeholder="请输入人数" />
+          <el-input
+            v-model="form.peopleCount"
+            placeholder="请输入人数"
+            :disabled="dislable"
+          />
         </el-form-item>
         <el-form-item label="人员名称" prop="peopleId">
           <el-select
             v-model="form.peopleId"
             placeholder="请选择人员名称"
             filterable
+            :disabled="dislable"
           >
             <el-option
               v-for="(item, i) in renYuan"
@@ -796,10 +838,18 @@
           </el-select>
         </el-form-item>
         <el-form-item label="联系方式" prop="contact">
-          <el-input v-model="form.contact" placeholder="请输入联系方式" />
+          <el-input
+            v-model="form.contact"
+            placeholder="请输入联系方式"
+            :disabled="dislable"
+          />
         </el-form-item>
         <el-form-item label="出车路线" prop="route">
-          <el-input v-model="form.route" placeholder="请输入出车路线" />
+          <el-input
+            v-model="form.route"
+            placeholder="请输入出车路线"
+            :disabled="dislable"
+          />
         </el-form-item>
         <el-form-item label="用车开始时间" prop="authStime">
           <el-date-picker
@@ -808,6 +858,7 @@
             v-model="form.authStime"
             type="datetime"
             placeholder="用车开始时间"
+            :disabled="dislable"
           >
           </el-date-picker>
         </el-form-item>
@@ -818,6 +869,7 @@
             v-model="form.authEtime"
             type="datetime"
             placeholder="用车结束时间"
+            :disabled="dislable"
           >
           </el-date-picker>
         </el-form-item>
@@ -826,6 +878,7 @@
             v-model="form.unitPeopleId"
             placeholder="请选择所在单位审批人"
             filterable
+            :disabled="dislable"
           >
             <el-option
               v-for="(item, i) in userRen"
@@ -842,6 +895,7 @@
             v-model="form.thebusThemplateId"
             placeholder="请选择审批模板"
             filterable
+            :disabled="dislable"
           >
             <el-option
               v-for="(item, i) in shenPi"
@@ -857,18 +911,21 @@
           <el-input
             v-model="form.peopleoneName"
             placeholder="请输入一级审批人"
+            :disabled="dislable"
           />
         </el-form-item>
         <el-form-item label="二级审批人" prop="people2Id">
           <el-input
             v-model="form.peopletwoName"
             placeholder="请输入二级审批人"
+            :disabled="dislable"
           />
         </el-form-item>
         <el-form-item label="三级审批人" prop="people3Id">
           <el-input
             v-model="form.peoplethreeName"
             placeholder="请输入三级审批人"
+            :disabled="dislable"
           />
         </el-form-item>
         <div class="jiben">外出事由</div>
@@ -1026,6 +1083,8 @@ export default {
       teJi: true,
       // 外面的人员
       renYuans: [],
+      // 禁止输入
+      dislable: false,
     };
   },
   created() {
@@ -1160,6 +1219,9 @@ export default {
       this.getYingJi();
       this.getShenPi();
       const id = row.id || this.ids;
+      if (row.shenpijiedian != "1") {
+        this.dislable = true;
+      }
       getThebusApply(id).then((response) => {
         this.form = response.data;
         this.getRen(this.form.unitId);
@@ -1181,7 +1243,6 @@ export default {
           return;
         }
       } else if (this.form.shenpijiedian == "2") {
-        console.log("初级");
         this.form.isTongguo = "0";
         exportThebusChu(this.form).then((response) => {
           this.$modal.msgSuccess("审批成功");
@@ -1191,7 +1252,6 @@ export default {
         return;
       } else if (this.form.shenpijiedian == "3") {
         this.form.isTongguo = "0";
-        console.log("一级");
         exportThebusOne(this.form).then((response) => {
           this.$modal.msgSuccess("审批成功");
           this.getList();
@@ -1200,7 +1260,6 @@ export default {
         return;
       } else if (this.form.shenpijiedian == "4") {
         this.form.isTongguo = "0";
-        console.log("二级");
         exportThebusTwo(this.form).then((response) => {
           this.$modal.msgSuccess("审批成功");
           this.getList();
@@ -1209,7 +1268,6 @@ export default {
         return;
       } else if (this.form.shenpijiedian == "5") {
         this.form.isTongguo = "0";
-        console.log("三级");
         exportThebusThree(this.form).then((response) => {
           this.$modal.msgSuccess("审批成功");
           this.getList();
@@ -1272,6 +1330,7 @@ export default {
       this.getYingJi();
       this.getShenPi();
       const id = row.id || this.ids;
+      this.dislable = true;
       getThebusApply(id).then((response) => {
         this.form = response.data;
         this.getRen(this.form.unitId);
@@ -1406,6 +1465,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.dislable = false;
       this.reset();
       this.getYingJi();
       this.getShenPi();
@@ -1440,11 +1500,15 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.dislable = false;
       this.reset();
       this.getTreeList();
       this.getYingJi();
       this.getShenPi();
       const id = row.id || this.ids;
+      if (row.shenpijiedian != "1") {
+        this.dislable = true;
+      }
       getThebusApply(id).then((response) => {
         this.form = response.data;
         this.getRen(this.form.unitId);
@@ -1672,5 +1736,9 @@ export default {
 .box {
   background-color: #ffba00 !important;
 }
+::v-deep .el-input.is-disabled .el-input__inner {
+  background-color: transparent;
+  color: #fff;
+}
 </style>
 

src/views/militaryvehicleManagement/thebusConfig/index.vue

@@ -321,7 +321,7 @@
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm1">确 定</el-button>
         <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
@@ -503,19 +503,11 @@ export default {
         ) {
           this.$refs["form"].validate((valid) => {
             if (valid) {
-              if (this.form.id != null) {
-                updateThebusConfig(this.form).then((response) => {
-                  this.$modal.msgSuccess("修改成功");
-                  this.opens = false;
-                  this.getList();
-                });
-              } else {
-                addThebusConfig(this.checkShop).then((response) => {
-                  this.$modal.msgSuccess("新增成功");
-                  this.open = false;
-                  this.getList();
-                });
-              }
+              addThebusConfig(this.checkShop).then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
             }
           });
         } else {
@@ -527,6 +519,28 @@ export default {
         }
       });
     },
+    // 修改提交
+    submitForm1() {
+      if (
+        this.form.twoshenpirenid ||
+        this.form.onshenpirenid ||
+        this.form.threeshenpirenid
+      ) {
+        if (this.form.id != null) {
+          updateThebusConfig(this.form).then((response) => {
+            this.$modal.msgSuccess("修改成功");
+            this.opens = false;
+            this.getList();
+          });
+        }
+      } else {
+        this.$message({
+          showClose: true,
+          message: "审批人必须有一个",
+          type: "warning",
+        });
+      }
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;

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)"
+            @click="opens(item.number, item.departmentInfo.name)"
             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,22 +116,28 @@
           v-for="(item, i) in gridList"
           :key="i"
           :class="{
-            greed: item.gridState == '手机放入',
-            red: item.gridState == '手机未放入',
-            yellow: item.gridState == '人员请假',
-            grey: item.gridState == '未绑定人员',
+            greed: item.warnState != '未存物',
+            red: item.warnState == '未存物',
           }"
           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.staffInfoWithId, item)"
-            >{{ item.staffInfoWithId.Name }}</el-button
+            @click.native="buttOn(item.staffName, item.warnState)"
+            >{{ item.staffName }}</el-button
           >
         </li>
+        <!-- <el-button
+            size="mini"
+         @click.native="buttOn(item.staffInfoWithId, item)" 
+       {{ item.staffInfoWithId.Name }} ></el-button> -->
       </ul>
     </div>
 
@@ -160,7 +166,7 @@
               <div style="width: 100px">{{ deviceId }}</div>
             </el-form-item>
             <el-form-item label="存物状态 :" prop="address">
-              <div style="width: 100px">{{ stoneState }}</div>
+              <div style="width: 100px">{{ warnState }}</div>
             </el-form-item>
             <el-form-item label="发生时间 :" prop="gridNumber">
               <div style="width: 120px">{{ happenTime }}</div>
@@ -187,7 +193,8 @@
               <div style="width: 100px" v-else></div>
             </el-form-item>
             <el-form-item label="所在单位 :" prop="gridNumber">
-              <div style="width: 120px">{{ departmentName }}</div>
+              <div style="width: 120px">{{ danw }}</div>
+              <!-- <div style="width: 120px">{{ departmentName }}</div> -->
             </el-form-item>
             <div class="jiben">存取记录</div>
             <el-table
@@ -240,6 +247,7 @@ 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";
@@ -308,6 +316,9 @@ export default {
       happenTime: null,
       // 单位名字
       departmentName: null,
+      // 点击柜子保存的单位
+      danw: "",
+      warnState: "",
     };
   },
   created() {
@@ -319,7 +330,6 @@ 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;
@@ -341,6 +351,7 @@ export default {
     },
     // 点击名字触发
     buttOn(row, data) {
+      this.warnState = data;
       this.jiBen = row;
       this.deviceId = data.deviceId;
       this.stoneState = data.stoneState;
@@ -360,25 +371,36 @@ export default {
       this.grey = 0;
     },
     // 点击手机柜触发
-    opens(cabinetNum) {
+    opens(cabinetNum, names) {
       this.phone = false;
       this.phone2 = true;
+      this.danw = names;
       this.cabinetNumber = cabinetNum;
-      xianPhoneGeZi(this.cabinetNumber).then((res) => {
+      aaa().then((res) => {
         this.gridList = res.data.infos;
-        console.log(res.data.infos);
         this.gridList.forEach((item) => {
-          if (item.gridState == "手机未放入") {
+          if (item.warnState == "未存物") {
             this.red += 1;
-          } else if (item.gridState == "手机已存放") {
-            this.green += 1;
-          } else if (item.gridState == "人员请假") {
-            this.yellow += 1;
           } else {
-            this.grey += 1;
+            this.green += 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 },
@@ -403,7 +425,6 @@ export default {
     /** 查询手机柜列表 */
     getList() {
       xianPhone().then((res) => {
-        // console.log(res);
         this.cabinetList = res.data.infos;
       });
     },

src/views/pt.vue

@@ -213,7 +213,7 @@
                 </div>
               </div>
               <div class="demo-a">
-                <a href="#" class="a">智能手机柜</a>
+                <a href="#" class="a">手机管理</a>
               </div>
             </li>
             <img src="../assets/images/椭圆 513 (2).png" class="li-img" alt />
@@ -657,6 +657,7 @@ import {
   listNotice,
   updateNotice,
   getWorkTask,
+  getNone,
 } from "@/api/pt";
 import { getUserProfile } from "@/api/system/user";
 import Cookies from "js-cookie";
@@ -697,6 +698,7 @@ export default {
       user: {},
       danWie: "",
       yongHu: "",
+      str: "",
     };
   },
   created() {
@@ -706,6 +708,10 @@ export default {
     this.timer2 = null;
     this.startTime2();
     this.xianShang();
+    // getNone().then((res) => {
+    //   this.str = res.msg;
+    //   console.log(res);
+    // });
   },
   mounted() {
     if (this.$route.params.name) {