diff --git a/src/api/firmware/firmwareupdate.js b/src/api/firmware/firmwareupdate.js
index 3dd78c5..51dca36 100644
--- a/src/api/firmware/firmwareupdate.js
+++ b/src/api/firmware/firmwareupdate.js
@@ -3,8 +3,22 @@ import request from '@/utils/request'
 // 查询固件列表
 export function list(params) {
     return request({
-        url: '/system/node/ota_list',
+        url: '/system/device/node/ota_list',
         method: 'get',
         params
     })
+}
+export function OTAUpdate(data) {
+    return request({
+        url: '/ota/OTAUpdate',
+        method: 'post',
+        data
+    })
+}
+export function OTAUpdates(data) {
+    return request({
+        url: '/ota/OTAUpdates',
+        method: 'post',
+        data
+    })
 }
\ No newline at end of file
diff --git a/src/api/hardware/node.js b/src/api/hardware/node.js
deleted file mode 100644
index 3692d1e..0000000
--- a/src/api/hardware/node.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 获取节点列表
-export function nodeList (params) {
-    return request({
-        url: '/system/product/node/list',
-        method: 'get',
-        params
-    })
-}
-
-// 查询节点详细
-export function nodeInfo (nodeId) {
-    return request({
-        url: '/system/node/' + nodeId,
-        method: 'get'
-    })
-}
-
-// 新增节点
-export function addNode (data) {
-    return request({
-        url: '/system/node/saveNode',
-        method: 'post',
-        data
-    })
-}
-
-// 删除节点
-export function delNode (ids) {
-    return request({
-        url: '/system/node/' + ids,
-        method: 'delete'
-    })
-}
-
-// 获取节点下拉
-export function select (params) {
-    return request({
-        url: '/system/node/select',
-        method: 'get',
-        params
-    })
-}
\ No newline at end of file
diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
deleted file mode 100644
index 3ff3e9b..0000000
--- a/src/views/device-manage/index.vue
+++ /dev/null
@@ -1,453 +0,0 @@
-<template>
-  <div>
-    <el-row>
-      <el-col :span="2" style="padding-left: 10px; padding-right: 10px">
-        <div class="grid-content bg-purple">
-          <el-menu
-            default-active="2"
-            class="el-menu-vertical-demo"
-            aria-disabled
-          >
-            <el-submenu index="1">
-              <template slot="title">
-                <i class="el-icon-location"></i>
-                <span>组织一</span>
-              </template>
-              <el-menu-item-group>
-                <el-menu-item index="1-1">选项1</el-menu-item>
-                <el-menu-item index="1-2">选项2</el-menu-item>
-                <el-menu-item index="1-3">选项3</el-menu-item>
-              </el-menu-item-group>
-            </el-submenu>
-            <el-submenu index="2">
-              <template slot="title">
-                <i class="el-icon-location"></i>
-                <span>组织二</span>
-              </template>
-              <el-menu-item-group>
-                <el-menu-item index="1-1">选项1</el-menu-item>
-                <el-menu-item index="1-2">选项2</el-menu-item>
-                <el-menu-item index="1-3">选项3</el-menu-item>
-              </el-menu-item-group>
-            </el-submenu>
-          </el-menu>
-        </div>
-      </el-col>
-      <el-col :span="22">
-        <el-form :inline="true" size="mini">
-          <el-form-item style="width: 100px">
-            <el-select v-model="value" clearable placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item style="width: 100px">
-            <el-select v-model="value" clearable placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item style="width: 100px">
-            <el-select v-model="value" clearable placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item style="width: 100px">
-            <el-select v-model="value" clearable placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item style="width: 100px">
-            <el-select v-model="value" clearable placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item style="width: 100px">
-            <el-select v-model="value" clearable placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item style="width: 100px">
-            <el-select v-model="value" clearable placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item style="width: 100px">
-            <el-select v-model="value" clearable placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item style="width: 100px">
-            <el-select v-model="value" clearable placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <div>
-          <el-button
-            size="mini"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleAdd"
-            v-hasPermi="['system:device:add']"
-            >增加</el-button
-          >
-          <el-button
-            size="mini"
-            type="primary"
-            icon="el-icon-edit"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['system:device:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="primary"
-            icon="el-icon-delete"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['system:device:remove']"
-            >删除</el-button
-          >
-          <el-button size="mini" type="primary" icon="el-icon-refresh-right"
-            >刷新</el-button
-          >
-          <el-button size="mini" type="primary" icon="el-icon-search"
-            >查看</el-button
-          >
-          <el-button size="mini" type="primary" icon="el-icon-download"
-            >导出</el-button
-          >
-          <el-button size="mini" type="primary" icon="el-icon-search"
-            >设备批量导入</el-button
-          >
-          <el-button size="mini" type="primary" icon="el-icon-search"
-            >批量域名设置</el-button
-          >
-          <el-button size="mini" type="primary" icon="el-icon-edit"
-            >配置工单处理人</el-button
-          >
-          <el-button size="mini" type="primary" icon="el-icon-edit"
-            >运营状态变更</el-button
-          >
-          <el-button size="mini" type="primary" icon="el-icon-search"
-            >查询</el-button
-          >
-          <el-button size="mini" type="primary" icon="el-icon-refresh-right"
-            >重置</el-button
-          >
-        </div>
-        <el-table
-          :data="tableData"
-          style="width: 100%"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="55" align="center">
-          </el-table-column>
-          <el-table-column prop="deviceId" align="center" label="设备ID">
-          </el-table-column>
-          <el-table-column prop="deviceName" align="center" label="设备名称">
-          </el-table-column>
-          <el-table-column prop="deviceCode" align="center" label="设备编码">
-          </el-table-column>
-          <el-table-column prop="deviceType" align="center" label="类型">
-          </el-table-column>
-          <el-table-column prop="deviceModel" align="center" label="装置模型">
-          </el-table-column>
-          <el-table-column prop="provinceCode" align="center" label="省份">
-          </el-table-column>
-          <el-table-column prop="city" align="center" label="市">
-          </el-table-column>
-          <el-table-column prop="areaCode" align="center" label="区">
-          </el-table-column>
-          <el-table-column prop="status" align="center" label="在线状态">
-          </el-table-column>
-        </el-table>
-        <el-pagination
-          style="float: right"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="queryParams.pagesize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-        >
-        </el-pagination>
-      </el-col>
-    </el-row>
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="设备ID" prop="deviceId">
-          <el-input v-model="form.deviceId" placeholder="请输入设备ID" />
-        </el-form-item>
-        <el-form-item label="设备名称" prop="deviceName">
-          <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
-        </el-form-item>
-        <el-form-item label="设备编码" prop="deviceCode">
-          <el-input v-model="form.deviceCode" placeholder="请输入设备编码" />
-        </el-form-item>
-        <el-form-item label="类型" prop="deviceType">
-          <el-input v-model="form.deviceType" placeholder="请输入设备类型" />
-        </el-form-item>
-        <el-form-item label="装置模型" prop="deviceModel">
-          <el-input v-model="form.deviceModel" placeholder="请输入装置模型" />
-        </el-form-item>
-        <el-form-item label="国家行政区 省" prop="provinceCode">
-          <el-input v-model="form.provinceCode" />
-        </el-form-item>
-        <el-form-item label="国家行政区 区" prop="areaCode">
-          <el-input v-model="form.areaCode" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {
-  listDevice,
-  getDevice,
-  addDevice,
-  updateDevice,
-  delDevice,
-} from "@/api/hardware/device";
-export default {
-  name: "Device",
-  data() {
-    return {
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      labelPosition: "right",
-      options: [
-        {
-          value: "选项1",
-        },
-        {
-          value: "选项2",
-        },
-      ],
-      // 表单参数
-      form: {deviceId: ''},
-      // 总条数
-      total: 0,
-      value: "",
-      // 表格数据
-      tableData: null,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        deviceId: undefined,
-        deviceType: undefined,
-        deviceName: undefined,
-        deviceCode: undefined,
-        deviceModel: undefined,
-        provinceCode: undefined,
-        areaCode: undefined,
-      },
-      rules: {
-        deviceId: [
-          { required: true, message: "设备ID不能为空", trigger: "blur" },
-        ],
-        deviceName: [
-          { required: true, message: "设备名称不能为空", trigger: "blur" },
-        ],
-        deviceType: [
-          { required: true, message: "设备编码不能为空", trigger: "blur" },
-        ],
-      },
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 获取设备数据列表
-    getList() {
-      listDevice().then((response) => {
-        this.tableData = response.rows;
-        this.total = response.total;
-      });
-    },
-
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      // this.reset();
-    },
-
-    // 表单重置
-    reset() {
-      this.form = {
-        deviceId: "",
-        deviceType: "",
-        deviceName: "",
-        status: "0",
-      };
-      this.resetForm("form");
-    },
-
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.deviceId);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-    },
-
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加设备";
-    },
-
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      // debugger
-      // this.deviceId=[]
-      const deviceId = row.deviceId || this.ids;
-      debugger
-      getDevice(deviceId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改设备";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function () {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          // debugger
-          if (this.form.deviceId != undefined) {
-            updateDevice(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-          addDevice(this.form).then((response) => {
-            this.msgSuccess("新增成功");
-            this.open = false;
-            this.getList();
-          });
-          }
-        }
-      });
-    },
-
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const deviceIds = row.deviceId || this.ids;
-      this.$confirm('是否确认删除岗位编号为"' + deviceIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delDevice(deviceIds);
-        }).then((res) => {
-          console.log(res)
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-
-    // 页码尺寸改变
-    handleSizeChange(val) {
-      this.queryForm.pagesize = val;
-      this.getList();
-    },
-    // 页码改变
-    handleCurrentChange(val) {
-      this.queryForm.page = val;
-      this.getList();
-    },
-    // handleSelectionChange(val) {
-    //   this.multipleSelection = val;
-    // },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
-    },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-    },
-    // 对话框的关闭
-    handleClose(done) {
-      this.$confirm("确认关闭？")
-        .then((_) => {
-          done();
-        })
-        .catch((_) => {});
-    },
-  },
-};
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/views/firmware/firmwareList/index.vue b/src/views/firmware/firmwareList/index.vue
index 56b3f14..501273b 100644
--- a/src/views/firmware/firmwareList/index.vue
+++ b/src/views/firmware/firmwareList/index.vue
@@ -13,7 +13,7 @@
       </el-form-item>
       <el-form-item label="节点">
         <el-select v-model="queryParams.nodeId" clearable placeholder="请选择">
-          <el-option v-for="item in queryNodeSelectList" :key="item.id" :label="item.nodeName" :value="item.nodeId">
+          <el-option v-for="item in queryNodeSelectList" :key="item.id" :label="item.nodeName" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
@@ -75,8 +75,8 @@
       </el-table-column>
       <el-table-column prop="projectName" align="center" label="项目名称">
       </el-table-column>
-      <el-table-column prop="status" align="center" label="状态">
-      </el-table-column>
+      <!-- <el-table-column prop="status" align="center" label="状态">
+      </el-table-column> -->
       <el-table-column prop="remark" align="center" label="备注">
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -102,7 +102,7 @@
         </el-form-item>
         <el-form-item label="节点" prop="nodeId">
           <el-select v-model="form.nodeId" clearable placeholder="请选择">
-            <el-option v-for="item in nodeSelectList" :key="item.id" :label="item.nodeName" :value="item.nodeId">
+            <el-option v-for="item in nodeSelectList" :key="item.id" :label="item.nodeName" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -149,7 +149,8 @@
 import { getToken } from "@/utils/auth";
 import { list, get, add, update, del } from "@/api/firmware/management";
 import { select as productSelect } from "@/api/hardware/product";
-import { select as nodeSelect } from "@/api/hardware/node";
+// import { select as nodeSelect } from "@/api/hardware/node";
+import { productNodeList,productNodeSelect } from "@/api/hardware/productNode";
 import { select as projectSelect } from "@/api/hardware/project";
 import { userSelect } from "@/api/system/user";
 export default {
@@ -244,7 +245,7 @@ export default {
   methods: {
     queryProductIdChange (productId) {
       delete this.queryParams.nodeId;
-      nodeSelect({ productId }).then(({ code, msg, select }) => {
+      productNodeSelect({ productId }).then(({ code, msg, select }) => {
         if (code == 200) {
           this.queryNodeSelectList = select;
         } else {
@@ -254,7 +255,7 @@ export default {
     },
     productIdChange (productId) {
       delete this.form.nodeId;
-      nodeSelect({ productId }).then(({ code, msg, select }) => {
+      productNodeSelect({ productId }).then(({ code, msg, select }) => {
         if (code == 200) {
           this.nodeSelectList = select;
         } else {
@@ -291,7 +292,7 @@ export default {
       if (res.code == 200) {
         this.$message.success(res.msg);
         let { fileName, length, url, crc } = res;
-        this.form = Object.assign({}, this.form, { fileName, length, filePath: url, crc });
+        this.form = Object.assign({}, this.form, { fileName, length, filePath: url, crcCode: crc });
       } else {
         this.$message.error(res.msg);
       }
diff --git a/src/views/firmware/firmwareUpdate/index.vue b/src/views/firmware/firmwareUpdate/index.vue
index e1a5c8a..07ed188 100644
--- a/src/views/firmware/firmwareUpdate/index.vue
+++ b/src/views/firmware/firmwareUpdate/index.vue
@@ -2,76 +2,75 @@
   <section class="app-container">
     <el-row>
       <el-col :span="4">
-        <div>地区</div>
+        <region @selectdRegionCode="selectdRegionCode" :currentNodeKey.sync="queryParams.provinceCode"></region>
       </el-col>
       <el-col :span="20">
-        <el-form :inline="true" size="small">
-          <el-form-item style="width: 130px">
-            <el-select v-model="value" clearable placeholder="产品名称">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+        <el-form :inline="true" size="small" v-show="showSearch">
+          <el-form-item label="产品">
+            <el-select v-model="queryParams.productId" clearable placeholder="请选择" @change="queryProductIdChange">
+              <el-option v-for="item in queryProductSelectList" :key="item.id" :label="item.productName" :value="item.productId">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item style="width: 130px">
-            <el-select v-model="value" clearable placeholder="节点">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+          <el-form-item label="节点">
+            <el-select v-model="queryParams.nodeDataId" clearable placeholder="请选择">
+              <el-option v-for="item in queryNodeSelectList" :key="item.id" :label="item.nodeName" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item style="width: 130px">
-            <el-select v-model="value" clearable placeholder="所属客户">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+          <el-form-item label="客户">
+            <el-select v-model="queryParams.userId" clearable placeholder="请选择" @change="queryUserIdChange">
+              <el-option v-for="item in queryUserSelectList" :key="item.id" :label="item.nickName" :value="item.userId">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item style="width: 130px">
-            <el-select v-model="value" clearable placeholder="所属项目">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+          <el-form-item label="项目">
+            <el-select v-model="queryParams.projectId" clearable placeholder="请选择">
+              <el-option v-for="item in queryProjectSelectList" :key="item.id" :label="item.projectName" :value="item.projectId">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item style="width: 130px">
-            <el-input v-model="input" placeholder="请输入设备SN" />
+          <el-form-item label="设备SN">
+            <el-input v-model="queryParams.nodeId" placeholder="请输入设备SN" @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search">搜索</el-button>
-            <el-button icon="el-icon-refresh">重置</el-button>
+            <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>
           </el-form-item>
         </el-form>
-        <el-row>
-          <el-button size="small">批量升级</el-button>
-          <el-button size="small">增加</el-button>
-          <el-button size="small">删除</el-button>
-          <el-button size="small">修改</el-button>
+        <el-row class="mb8">
+          <el-col :span="1.5">
+            <el-button size="mini" type="primary" icon="el-icon-set-up" @click="handleOTAUpdate">批量升级</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-          <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
-            @selection-change="handleSelectionChange">
-            <el-table-column align="center" type="selection" width="55">
-            </el-table-column>
-            <el-table-column align="center" prop="nodeId" label="节点SN">
-            </el-table-column>
-            <el-table-column align="center" prop="deviceId" label="设备SN">
-            </el-table-column>
-            <el-table-column align="center" prop="productName" label="产品名称">
-            </el-table-column>
-            <el-table-column align="center" prop="userName" label="所属客户">
-            </el-table-column>
-            <el-table-column align="center" prop="projectName" label="所属项目">
-            </el-table-column>
-            <el-table-column align="center" prop="nowVersion" label="当前软件版本">
-            </el-table-column>
-            <el-table-column align="center" prop="version" label="可升级软件版本">
-            </el-table-column>
-            <el-table-column align="center" prop="onUpdateTime" label="上次升级时间">
-            </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-              <template>
-                <el-button size="mini" type="text" >
-                  升级
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
+        <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
+          <el-table-column align="center" type="selection" width="55">
+          </el-table-column>
+          <el-table-column align="center" prop="nodeId" label="节点SN">
+          </el-table-column>
+          <el-table-column align="center" prop="deviceId" label="设备SN">
+          </el-table-column>
+          <el-table-column align="center" prop="productName" label="产品名称">
+          </el-table-column>
+          <el-table-column align="center" prop="userName" label="所属客户">
+          </el-table-column>
+          <el-table-column align="center" prop="projectName" label="所属项目">
+          </el-table-column>
+          <el-table-column align="center" prop="nowVersion" label="当前软件版本">
+          </el-table-column>
+          <el-table-column align="center" prop="version" label="可升级软件版本">
+          </el-table-column>
+          <el-table-column align="center" prop="onUpdateTime" 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" @click="handleOneOTAUpdate(scope.row)">
+                升级
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
         <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
           @pagination="getList" />
       </el-col>
@@ -80,14 +79,31 @@
 </template>
 
 <script>
-import { list } from "@/api/firmware/firmwareupdate";
+import Region from "@/components/Region";
+
+import { list, OTAUpdate, OTAUpdates } from "@/api/firmware/firmwareupdate";
+import { select as projectSelect } from "@/api/hardware/project";
+import { select as productSelect } from "@/api/hardware/product";
+import { productNodeList, productNodeSelect } from "@/api/hardware/productNode";
+import { userSelect } from "@/api/system/user";
+
+
 export default {
-  name: "Uplist",
+  name: "FirmwareUpdate",
+  components: {
+    Region,
+  },
   data () {
     return {
+      showSearch: true,
+      queryProductSelectList: [],
+      queryNodeSelectList: [],
+      queryUserSelectList: [],
+      queryProjectSelectList: [],
       value: '',
       options: '',
       input: '',
+      ids: [],
       // 表格数据
       tableData: null,
       // 总条数
@@ -100,10 +116,111 @@ export default {
     }
   },
   created () {
+    productSelect().then(({ code, msg, select }) => {
+      if (code == 200) {
+        this.queryProductSelectList = select;
+      } else {
+        this.$message.error(msg);
+      }
+    })
+    userSelect().then(({ code, msg, select }) => {
+      if (code == 200) {
+        this.queryUserSelectList = select;
+      } else {
+        this.$message.error(msg);
+      }
+    })
     this.getList();
   },
   methods: {
-    handleSelectionChange () { },
+    queryProductIdChange (productId) {
+      delete this.queryParams.nodeId;
+      productNodeSelect({ productId }).then(({ code, msg, select }) => {
+        if (code == 200) {
+          this.queryNodeSelectList = select;
+        } else {
+          this.$message.error(msg);
+        }
+      })
+    },
+    queryUserIdChange (userId) {
+      delete this.queryParams.projectId;
+      projectSelect({ userId }).then(({ code, msg, select }) => {
+        if (code == 200) {
+          this.queryProjectSelectList = select;
+        } else {
+          this.$message.error(msg);
+        }
+      })
+    },
+    selectdRegionCode ({ code }) {
+      this.queryParams.provinceCode = code;
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery () {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    handleOneOTAUpdate ({ productId, nodeId, deviceId }) {
+      this.$confirm(`是否确认升级${deviceId}?`, "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.OTAUpdate([{ productId, nodeId, deviceId }])
+      }).catch((res) => { });
+    },
+    handleOTAUpdate () {
+      if (this.ids.length) {
+        let snap = this.ids.map(({ productId, nodeId, deviceId }) => {
+          return { productId, nodeId, deviceId }
+        });
+        const h = this.$createElement;
+        this.$confirm(`是否确认批量升级\r\n${snap.map(v => v.deviceId).join(',\r\n')}?`, "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          this.OTAUpdate(snap);
+        }).catch((res) => { });
+
+      } else {
+        let snap = Object.assign({}, this.queryParams);
+        delete snap.pageNum;
+        delete snap.pageSize;
+        this.OTAUpdates(snap);
+      }
+    },
+
+    OTAUpdate (device) {
+      OTAUpdate({ device }).then(({ code, msg }) => {
+        if (200 == code) {
+          this.msgSuccess(msg)
+        } else {
+          this.msgError(msg)
+        }
+      })
+    },
+    OTAUpdates (deviceNode) {
+      OTAUpdates(deviceNode).then(({code, msg}) => {
+        if (200 == code) {
+          this.msgSuccess(msg)
+        } else {
+          this.msgError(msg)
+        }
+      })
+    },
+    resetQuery () {
+      this.queryParams = { pageNum: 1, pageSize: 10 };
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange (selection) {
+      console.log(selection)
+      this.ids = selection;
+    },
     getList () {
       list(this.queryParams).then((response) => {
         this.tableData = response.rows;
diff --git a/src/views/hardware/deviceList/index.vue b/src/views/hardware/deviceList/index.vue
index 4969d33..e8285a1 100644
--- a/src/views/hardware/deviceList/index.vue
+++ b/src/views/hardware/deviceList/index.vue
@@ -37,24 +37,24 @@
         <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center">
           </el-table-column>
-          <el-table-column prop="deviceId" align="center" label="设备ID">
+          <el-table-column prop="deviceId" align="center" label="设备SN">
           </el-table-column>
           <el-table-column prop="deviceName" align="center" label="设备名称">
           </el-table-column>
-          <el-table-column prop="deviceCode" align="center" label="设备编码">
+          <!-- <el-table-column prop="deviceCode" align="center" label="设备编码">
           </el-table-column>
           <el-table-column prop="deviceType" align="center" label="类型">
           </el-table-column>
           <el-table-column prop="deviceModel" align="center" label="装置模型">
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column prop="proName" align="center" label="省份">
           </el-table-column>
           <el-table-column prop="cityName" align="center" label="市">
           </el-table-column>
           <el-table-column prop="disName" align="center" label="区">
           </el-table-column>
-          <el-table-column prop="status" align="center" label="在线状态">
-          </el-table-column>
+          <!-- <el-table-column prop="status" align="center" 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-plus" @click="handleAddnode(scope.row)">新增节点
@@ -75,13 +75,13 @@
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="设备ID" prop="deviceId">
-          <el-input v-model="form.deviceId" placeholder="请输入设备ID" />
+        <el-form-item label="设备SN" prop="deviceId">
+          <el-input v-model="form.deviceId" placeholder="请输入设备SN" />
         </el-form-item>
         <el-form-item label="设备名称" prop="deviceName">
           <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
         </el-form-item>
-        <el-form-item label="设备编码" prop="deviceCode">
+        <!-- <el-form-item label="设备编码" prop="deviceCode">
           <el-input v-model="form.deviceCode" placeholder="请输入设备编码" />
         </el-form-item>
         <el-form-item label="设备类型" prop="deviceType">
@@ -89,7 +89,7 @@
         </el-form-item>
         <el-form-item label="设备型号" prop="deviceModel">
           <el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="产品" prop="productId">
           <el-select v-model="form.productId" clearable placeholder="请选择">
             <el-option v-for="item in productSelectList" :key="item.id" :label="item.productName" :value="item.productId">
@@ -140,7 +140,7 @@
       <el-table :data="nodeData" @selection-change="nodeHandleSelectionChange">
         <el-table-column type="selection" width="55" align="center">
         </el-table-column>
-        <el-table-column prop="deviceId" label="设备ID"></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 label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
@@ -154,8 +154,8 @@
     <!-- 添加节点参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="nodeOpen" width="500px" append-to-body>
       <el-form ref="nodeForm" :model="nodeForm" :rules="nodeRules" label-width="100px">
-        <el-form-item label="设备ID" prop="deviceId">
-          <el-input v-model="nodeForm.deviceId" disabled placeholder="请输入设备ID" />
+        <el-form-item label="设备SN" prop="deviceId">
+          <el-input v-model="nodeForm.deviceId" disabled placeholder="请输入设备SN" />
         </el-form-item>
         <el-form-item label="节点名称" prop="nodeDataId">
           <el-select v-model="nodeForm.nodeDataId" :disabled="!!nodeForm.id" clearable placeholder="请选择">
@@ -247,7 +247,7 @@ export default {
       },
       rules: {
         deviceId: [
-          { required: true, message: "设备ID不能为空", trigger: "blur" },
+          { required: true, message: "设备SN不能为空", trigger: "blur" },
         ],
         deviceName: [
           { required: true, message: "设备名称不能为空", trigger: "blur" },
@@ -279,7 +279,7 @@ export default {
           { required: true, message: "节点SN不能为空", trigger: "blur" },
         ],
         deviceId: [
-          { required: true, message: "设备ID不能为空", trigger: "blur" },
+          { required: true, message: "设备SN不能为空", trigger: "blur" },
         ],
         nodeDataId: [
           { required: true, message: "节点真正ID不能为空", trigger: "blur" },
diff --git a/src/views/hardware/productList/index.vue b/src/views/hardware/productList/index.vue
index bb0ad00..9766692 100644
--- a/src/views/hardware/productList/index.vue
+++ b/src/views/hardware/productList/index.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="app-container">
     <el-row>
-      <el-col :span="22">
+      <el-col :span="24">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="名称" prop="productName">
             <el-input v-model="queryParams.productName" placeholder="请输入名称" clearable size="small" style="width: 240px"
@@ -38,12 +38,14 @@
           </el-table-column>
           <el-table-column prop="productName" align="center" label="产品名称">
           </el-table-column>
-          <el-table-column prop="productType" align="center" label="产品编码">
-          </el-table-column>
-          <el-table-column prop="productType" align="center" label="类型">
-          </el-table-column>
-          <el-table-column prop="status" align="center" label="状态">
+          <el-table-column prop="remark" align="center" label="产品备注">
           </el-table-column>
+          <!-- <el-table-column prop="productType" align="center" label="产品编码">
+          </el-table-column> -->
+          <!-- <el-table-column prop="productType" align="center" label="类型">
+          </el-table-column> -->
+          <!-- <el-table-column prop="status" align="center" label="状态">
+          </el-table-column> -->
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300px">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAddnode(scope.row)"
@@ -73,12 +75,12 @@
         <el-form-item label="产品名称" prop="productName">
           <el-input v-model="form.productName" placeholder="请输入产品名称" />
         </el-form-item>
-        <el-form-item label="类型" prop="productType">
+        <!-- <el-form-item label="类型" prop="productType">
           <el-input v-model="form.productType" placeholder="请输入产品类型" />
-        </el-form-item>
-        <el-form-item label="状态">
+        </el-form-item> -->
+        <!-- <el-form-item label="状态">
           <el-input v-model="form.status" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="备注">
           <el-input v-model="form.remark" />
         </el-form-item>
@@ -97,9 +99,9 @@
         <el-form-item label="节点名称" prop="nodeName">
           <el-input v-model="nodeForm.nodeName" placeholder="请输入节点名称" />
         </el-form-item>
-        <el-form-item label="状态">
+        <!-- <el-form-item label="状态">
           <el-input v-model="nodeForm.status" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="备注">
           <el-input v-model="nodeForm.remark" />
         </el-form-item>
@@ -111,12 +113,16 @@
     </el-dialog>
     <!-- 节点列表弹框 -->
     <el-dialog title="节点列表" :visible.sync="nodeDialog">
-      <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="nodeMultiple" @click="batchHandleDeletenode"
-        v-hasPermi="['monitor:node:remove']">批量删除</el-button>
+      <el-row :gutter="10" class="mb8">
+        <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="nodeMultiple" @click="batchHandleDeletenode"
+          v-hasPermi="['monitor:node:remove']">批量删除</el-button>
+      </el-row>
+
       <el-table :data="nodeData" @selection-change="nodeHandleSelectionChange">
         <el-table-column type="selection" width="55" align="center">
         </el-table-column>
         <el-table-column prop="nodeName" label="节点名称"></el-table-column>
+        <el-table-column prop="remark" 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)" v-hasPermi="['system:node:edit']">
@@ -228,6 +234,7 @@ export default {
 
     // 获取节点数据列表
     getListnode ({ productId }) {
+      this.nodeData = [];
       productNodeList({ productId }).then((response) => {
         this.nodeData = response.rows;
       });
diff --git a/src/views/hardware/projectList/index.vue b/src/views/hardware/projectList/index.vue
index d18d904..c28772f 100644
--- a/src/views/hardware/projectList/index.vue
+++ b/src/views/hardware/projectList/index.vue
@@ -29,8 +29,8 @@
           </el-table-column>
           <el-table-column prop="createTime" align="center" label="创建时间">
           </el-table-column>
-          <el-table-column prop="status" align="center" label="状态">
-          </el-table-column>
+          <!-- <el-table-column prop="status" align="center" 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="handleUpdate(scope.row)" v-hasPermi="['system:project:edit']">
@@ -56,9 +56,9 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="状态">
+          <!-- <el-form-item label="状态">
             <el-input v-model="form.status" />
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/vue.config.js b/vue.config.js
index eed2fbf..005efaa 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.0.129:8080`,
-        target: `http://121.37.250.170:8080`,
+        target: `http://192.168.0.129:8080`,
+        // target: `http://121.37.250.170:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''