init

src/api/modules/api.js

@@ -572,6 +572,14 @@ export function equipmentAdd(data) {
     data
   })
 }
+// 验收设备
+export function equipmentAcceptance(data) {
+  return request({
+    url: 'autoSR/zk/equipment/acceptance',
+    method:'post',
+    data
+  })
+}
 // 归还设备
 export function equipmentUnbind(data) {
   return request({

src/views/Equipment/index.vue

@@ -367,37 +367,38 @@
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item
                   command="toinifoThereturn"
-                  v-if="row.receiveType == 2&&euq_index_back"
+                  v-if="row.receiveType == 2 && euq_index_back"
                   >归还</el-dropdown-item
                 >
                 <!-- <el-dropdown-item
                   command="receive"
                   >领用</el-dropdown-item
                 > -->
-                <el-dropdown-item command="infotranscription"
+                <el-dropdown-item
+                  command="infotranscription"
                   v-if="equ_index_change"
                   >转写方式</el-dropdown-item
                 >
-                <el-dropdown-item command="isAutoSwitch"
-                v-if="equ_index_auto"
+                <el-dropdown-item command="isAutoSwitch" v-if="equ_index_auto"
                   >自动转写</el-dropdown-item
                 >
                 <el-dropdown-item
                   command="acceptance"
-                  v-if="row.acceptanceStatus == 1&&equ_index_makeSure"
+                  v-if="row.acceptanceStatus == 1 && equ_index_makeSure"
                   >验收</el-dropdown-item
                 >
                 <el-dropdown-item
                   command="getRight"
-                  v-if="(row.acceptanceStatus != (1 || 0))&&euq_index_normal"
+                  v-if="row.acceptanceStatus != (1 || 0) && euq_index_normal"
                   >恢复正常</el-dropdown-item
                 >
-                <el-dropdown-item command="toinfobinding" v-if="orgType == 0&&equ_index_bind"
+                <el-dropdown-item
+                  command="toinfobinding"
+                  v-if="orgType == 0 && equ_index_bind"
                   >绑定</el-dropdown-item
                 >
                 <!-- <el-dropdown-item command="infoeditor">修改</el-dropdown-item> -->
-                <el-dropdown-item command="toinifodelete"
-                v-if="equ_index_del"
+                <el-dropdown-item command="toinifodelete" v-if="equ_index_del"
                   >删除</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -1199,23 +1200,31 @@ export default {
         });
     },
     //验收
-    acceptance() {
+    acceptance(row) {
       this.$confirm("确认验收吗?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.$message({
-            type: "success",
-            message: "验收成功!",
-          });
+          this.$api.api
+            .equipmentAcceptance({
+              imeis: row.imei,
+            })
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "验收成功!",
+              });
+              this.equipmentManagement();
+            });
         })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消验收",
-          });
+        .catch((err) => {
+          // this.$message({
+          //   type: "info",
+          //   message: "已取消验收",
+          // });
+          console.log(err);
         });
     },
     // 自动转写开关
@@ -1244,10 +1253,10 @@ export default {
             });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消",
-          });
+          // this.$message({
+          //   type: "info",
+          //   message: "已取消",
+          // });
         });
     },
     // 转写开关
@@ -1278,10 +1287,10 @@ export default {
             });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消",
-          });
+          // this.$message({
+          //   type: "info",
+          //   message: "已取消",
+          // });
         });
     },
     //归还
@@ -1305,10 +1314,10 @@ export default {
             });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消归还",
-          });
+          // this.$message({
+          //   type: "info",
+          //   message: "已取消归还",
+          // });
         });
     },
     //删除
@@ -1332,10 +1341,10 @@ export default {
             });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
+          // this.$message({
+          //   type: "info",
+          //   message: "已取消删除",
+          // });
         });
     },
     handleSizeChange(val) {

src/views/Equipment/state.vue

@@ -280,7 +280,7 @@
           align="center"
         >
           <template slot-scope="{ row }">
-            {{ row.simAudioUploadStatus ? "上传中" : "无上传" }}
+            {{ row.simAudioUploadStatus=='true' ? "上传中" : "无上传" }}
           </template>
         </el-table-column>
         <el-table-column prop="lightStatus" label="开机指示灯" align="center">
@@ -330,11 +330,9 @@
         <el-table-column prop="offStatus" label="关机类型" align="center">
           <template slot-scope="{ row }">
             {{
-              row.lightStatus == 1
-                ? "正常关机"
-                : row.lightStatus == 1
-                ? "低电关机"
-                : "异常关机"
+              row.offStatus == 1
+                ? "正常关机": row.offStatus == 2
+                ? "低电关机":row.offStatus == 3? "异常关机":''
             }}
           </template>
         </el-table-column>

vue.config.js

@@ -7,7 +7,7 @@ const url = 'http://39.97.167.65: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://jrcd6b.natappfree.cc' //王笑
+// const url = 'http://yuuapd.natappfree.cc' //王笑
 
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']