设备节点修改

src/api/hardware/device.js

@@ -43,3 +43,12 @@ export function del(ids) {
         method: 'delete'
     })
 }
+
+// 新增更新设备记录
+export function saveDeviceFirmware(data) {
+    return request({
+        url: '/system/device/saveDeviceFirmware',
+        method: 'post',
+        data
+    })
+}

src/views/firmware/firmwareList/index.vue

@@ -39,15 +39,15 @@
         <el-button size="mini" type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['system:management:add']">增加
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['monitor:management:remove']">批量删除</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table :data="tableData" row-key="id" :tree-props="tableTreeProps" style="width: 100%" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center">
+      <!-- <el-table-column type="selection" width="55" align="center">
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="version" align="center" label="固件版本号">
         <!-- <template slot-scope="scope">
           <el-popover placement="right" title="标题" width="200" trigger="hover">

src/views/hardware/deviceList/index.vue

@@ -6,10 +6,16 @@
       </el-col>
       <el-col :span="20">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="名称" prop="jobName">
+          <el-form-item label="名称">
             <el-input v-model="queryParams.deviceName" placeholder="请输入名称" clearable size="small" style="width: 240px"
               @keyup.enter.native="handleQuery" />
           </el-form-item>
+          <el-form-item label="设备类型">
+            <el-select v-model="queryParams.deviceType" clearable placeholder="请选择">
+              <el-option v-for="item in deviceTypeList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -41,6 +47,11 @@
           </el-table-column>
           <el-table-column prop="deviceName" align="center" label="设备名称">
           </el-table-column>
+          <el-table-column prop="deviceType" align="center" label="类型">
+            <template slot-scope="scope">{{getDeviceTypeLabel(scope.row.deviceType)}}</template>
+            <!-- <template slot-scope="scope">{{scope.row.deviceType}}</template> -->
+            <!-- <template slot-scope="scope">{{deviceTypeList.find(v=> v.value == scope.row.deviceType).label}}</template> -->
+          </el-table-column>
           <!-- <el-table-column prop="deviceCode" align="center" label="设备编码">
           </el-table-column>
           <el-table-column prop="deviceType" align="center" label="类型">
@@ -81,6 +92,12 @@
         <el-form-item label="设备名称" prop="deviceName">
           <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
         </el-form-item>
+        <el-form-item label="设备类型" prop="deviceType">
+          <el-select v-model="form.deviceType" clearable placeholder="请选择">
+            <el-option v-for="item in deviceTypeList" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <!-- <el-form-item label="设备编码" prop="deviceCode">
           <el-input v-model="form.deviceCode" placeholder="请输入设备编码" />
         </el-form-item>
@@ -142,9 +159,11 @@
         </el-table-column>
         <el-table-column prop="deviceId" label="设备SN"></el-table-column>
         <el-table-column prop="nodeId" label="节点SN"></el-table-column>
+        <el-table-column prop="nowVersion" label="节点版本"></el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdatenode(scope.row)">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleInitNode(scope.row)">初始化</el-button>
             <el-button class="text-danger" size="mini" type="text" icon="el-icon-delete" @click="handleDeletenode(scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -183,6 +202,7 @@ import {
   add,
   update,
   del,
+  saveDeviceFirmware,
 } from "@/api/hardware/device";
 // import { nodeList, addNode, nodeInfo, delNode, nodeSelect } from "@/api/system/device/node";
 import { select as productSelect } from "@/api/hardware/product";
@@ -216,6 +236,10 @@ export default {
       citySelectList: [],
       districtSelectList: [],
       productNodeSelectList: [],
+      deviceTypeList: [
+        { 'label': '锐能设备', 'value': 'rn', },
+        { 'label': '铁塔设备', 'value': 'tt', },
+      ],
       // 选中数组
       ids: [],
       nodeIds: [],
@@ -233,7 +257,7 @@ export default {
       // 是否显示弹出层
       open: false,
       nodeDialog: false,
-      nodeOpen:false,
+      nodeOpen: false,
       // 表单参数
       form: {},
       nodeForm: {},
@@ -313,6 +337,15 @@ export default {
     this.getList();
   },
   methods: {
+    getDeviceTypeLabel (deviceType) {
+      let snap = '';
+      this.deviceTypeList.map(v => {
+        if (v.value == deviceType) {
+          snap = v.label;
+        }
+      })
+      return snap;
+    },
     selectdRegionCode ({ code }) {
       this.queryParams.provinceCode = code;
       this.handleQuery();
@@ -424,9 +457,9 @@ export default {
 
     // 新增节点
     handleAddnode (row) {
-      productNodeSelect({productId: row.productId}).then(({ code, msg, select }) => {
+      productNodeSelect({ productId: row.productId }).then(({ code, msg, select }) => {
         if (code == 200) {
-        this.productNodeSelectList = select;
+          this.productNodeSelectList = select;
         } else {
           this.$message.error(msg);
         }
@@ -461,11 +494,11 @@ export default {
     },
 
     /** 修改节点 */
-    handleUpdatenode(row){
+    handleUpdatenode (row) {
       this.reset();
-      productNodeSelect({productId: this.snapDeviceInfo.productId}).then(({ code, msg, select }) => {
+      productNodeSelect({ productId: this.snapDeviceInfo.productId }).then(({ code, msg, select }) => {
         if (code == 200) {
-        this.productNodeSelectList = select;
+          this.productNodeSelectList = select;
         } else {
           this.$message.error(msg);
         }
@@ -474,6 +507,25 @@ export default {
       this.title = "修改设备节点";
       this.nodeForm = Object.assign({}, row);
     },
+
+    handleInitNode ({ deviceId, nodeId }) {
+      this.$prompt('请输入初始化版本号', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        // inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/,
+        // inputErrorMessage: '邮箱格式不正确'
+      }).then(({ value }) => {
+        saveDeviceFirmware({ deviceId, nodeId, nowVersion: value }).then(({ code, msg }) => {
+          if (200 == code) {
+            this.msgSuccess(msg);
+            this.getListnode({ deviceId });
+          } else {
+            this.msgError(msg);
+          }
+        })
+      }).catch(() => {
+      });
+    },
     /** 提交按钮 */
     submitForm: function () {
       this.$refs["form"].validate((valid) => {