heyang hace 2 años
padre
commit
4fc916ea14

+ 9 - 6
src/api/gasManage3_0/gasManage.js

@@ -660,15 +660,16 @@ export function RFIDTypeList(query) {
 //识别器管理-新增
 export function recognizerAdd(data) {
   return request({
-    url: '/laboratory/hardware',
+    url: '/algorithm/hardwareRfid/save',
     method: 'post',
     data: data
   })
 }
+
 //识别器管理-修改
 export function recognizerAnew(data) {
   return request({
-    url: '/laboratory/hardware',
+    url: '/algorithm/hardwareRfid/update',
     method: 'put',
     data: data
   })
@@ -676,11 +677,12 @@ export function recognizerAnew(data) {
 //识别器管理-列表
 export function recognizerList(query) {
   return request({
-    url: '/laboratory/hardware/list',
+    url: '/algorithm/hardwareRfid/query',
     method: 'get',
     params: query
   })
 }
+
 //识别器管理-检测类型
 export function recognizerNettyFrid(query) {
   return request({
@@ -692,17 +694,18 @@ export function recognizerNettyFrid(query) {
 //识别器管理-启用禁用
 export function recognizerSwitch(data) {
   return request({
-    url: '/laboratory/hardware/start/'+data,
+    url: '/algorithm/hardwareRfid/startOrStop/'+data,
     method: 'PUT',
   })
 }
 //识别器管理-删除
-export function recognizerDelete(query) {
+export function recognizerDelete(data) {
   return request({
-    url: '/laboratory/hardware/'+query,
+    url: '/algorithm/hardwareRfid/delete/'+data,
     method: 'delete',
   })
 }
+
 //识别器管理-详情
 export function recognizerInfo(query) {
   return request({

+ 8 - 8
src/views/gasManage3_0/manage/recognizerManage/recognizerManage.vue

@@ -34,9 +34,9 @@
           <el-switch
             class="switch"
             @change="switchChange(scope.row)"
-            v-model="scope.row.status+''"
-            active-value="3"
-            inactive-value="4"
+            v-model="scope.row.onOff+''"
+            active-value="1"
+            inactive-value="0"
             active-text="开"
             inactive-text="关"
           >
@@ -178,7 +178,7 @@ export default {
         pageNum: 1,
         pageSize:20,
         searchValue:'',
-        type:'RFID_RECOGNIZER'
+        deviceType:'7'
       },
 
       // 表单参数
@@ -186,7 +186,7 @@ export default {
         id:'',
         hardwareNum:'',
         subjectId:'',
-        type:'RFID_RECOGNIZER',
+        deviceType:'7',
         ipAddress:'',//ip地址
         channels:4,//信道
         sessionIndex:0,//设备推送频率
@@ -245,7 +245,7 @@ export default {
     switchChange(row){
       console.log(row)
       //1上架0下架
-      this.$confirm('是否确定'+(row.status==3?'关':'开')+'?', '提示', {
+      this.$confirm('是否确定'+(row.onOff==3?'关':'开')+'?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -307,7 +307,7 @@ export default {
       this.form = {
         id: null,
         name: null,
-        type:'RFID_RECOGNIZER',
+        deviceType:'7',
         hardwareNum: null,
         subjectId: null,
         ipAddress: null,
@@ -347,7 +347,7 @@ export default {
       this.open = true;
       this.title = "修改识别器";
       this.form.id=row.id
-      this.form.type='RFID_RECOGNIZER'
+      this.form.deviceType='7'
       this.form.hardwareNum=row.hardwareNum
       this.form.subjectId=row.subjectId
       this.form.ipAddress=row.ipAddress