增加iot 服务信息删除功能

src/api/iot/server.js

@@ -36,3 +36,12 @@ export function getIot(id) {
     method: 'get',
   })
 }
+
+
+// 删除
+export function deleted(id) {
+  return request({
+    url: `/iot/server/${id}`,
+    method: 'delete',
+  })
+}

src/views/iot/sensorData/dialog.detail.vue

@@ -11,7 +11,7 @@
     <div class="el-dialog-div" style="margin-bottom:20px">
       <g-search-table
         ref="st"
-        url="/iot/sensor/find/log"
+        url="/iot/sensor/data/log"
         method="post"
         :search-data="search"
         :pageable="true"
@@ -35,7 +35,7 @@
         <!-- 表格 -->
         <template slot="columns">
           <el-table-column label="设备名称" align="center" prop="deviceName" width="300"/>
-          <el-table-column label="上报时间" prop="updateTime" width="300"/>
+          <el-table-column label="上报时间" prop="createTime" width="300"/>
           <el-table-column label="上报内容" prop="info" width="300"/>
         </template>
       </g-search-table>

src/views/iot/server/index.vue

@@ -21,7 +21,7 @@
                   ref="orgTree"
                 ></org-tree>
               </el-form-item>
-              <el-form-item label="Iot名称" prop="iotName">
+              <el-form-item label="主机名称" prop="iotName">
                 <el-input
                   v-model="queryParams.iotName"
                   clearable
@@ -42,7 +42,7 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="Iot注册码" prop="registerCode">
+              <el-form-item label="主机注册码" prop="registerCode">
                 <el-input
                   v-model="queryParams.registerCode"
                   clearable
@@ -116,10 +116,10 @@
             <el-table-column label="地区" align="center" prop="firstOrgName" width="120"/>
             <el-table-column label="行社名称" align="center" prop="secondOrgName" width="220"/>
             <el-table-column label="所属机构" align="center" prop="orgName" width="150"/>
-            <el-table-column label="Iot名称" align="center" prop="iotName" width="150"/>
-            <el-table-column label="Iot编码" align="center" prop="iotCode" width="220" :show-overflow-tooltip="true"/>
-            <el-table-column label="Iot注册码" align="center" prop="registerCode" width="220"/>
-            <el-table-column label="Iot服务IP" align="center" prop="iotIp" width="150"/>
+            <el-table-column label="主机名称" align="center" prop="iotName" width="150"/>
+            <el-table-column label="主机编码" align="center" prop="iotCode" width="220" :show-overflow-tooltip="true"/>
+            <el-table-column label="主机注册码" align="center" prop="registerCode" width="220"/>
+            <el-table-column label="主机服务IP" align="center" prop="iotIp" width="150"/>
             <el-table-column label="链接状态" align="center" prop="iotStatus" width="150">
               <template slot-scope="r"
               >{{
@@ -156,6 +156,13 @@
                   @click="handleUpdate(scope.row)"
                 >编辑
                 </el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit-outline"
+                  @click="handleDelete(scope.row)"
+                >删除
+                </el-button>
               </template>
 
             </el-table-column>
@@ -234,7 +241,7 @@
 </template>
 
 <script>
-import {add, edit, getIot, list} from "@/api/iot/server";
+import {add, edit, getIot, list,deleted} from "@/api/iot/server";
 import {getLabel} from "./../../commonOption";
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import {mapGetters} from "vuex";
@@ -397,6 +404,25 @@ export default {
         this.title = "编辑Iot服务";
       });
     },
+    /** 修改按钮操作 */
+    handleDelete(row) {
+      if (row.iotStatus==1) {
+        this.$modal.alert("删除该主机信息,请先停用主机服务!");
+        return;
+      }
+      this.$modal
+        .confirm("是否确认删除该主机信息?")
+        .then(function () {
+          return deleted(row.id);
+        })
+        .then(() => {
+          this.$modal.msgSuccess("删除成功");
+          this.open = false;
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");