From 67ef18157c6cbad22f8651ccfa9e1d4a4e38ab10 Mon Sep 17 00:00:00 2001
From: hh <292475944@qq.com>
Date: Thu, 12 Nov 2020 14:46:36 +0800
Subject: [PATCH] up

---
 .env.production                             |  2 +-
 src/views/firmware/firmwareList/index.vue   | 66 +++++++++++++++++++--
 src/views/firmware/firmwareUpdate/index.vue |  3 +-
 3 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/.env.production b/.env.production
index 0e9361e..01fb5ee 100644
--- a/.env.production
+++ b/.env.production
@@ -2,4 +2,4 @@
 ENV = 'production'
 
 # 管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'http://121.37.250.170:8080'
diff --git a/src/views/firmware/firmwareList/index.vue b/src/views/firmware/firmwareList/index.vue
index 67a11fc..dbfb2c7 100644
--- a/src/views/firmware/firmwareList/index.vue
+++ b/src/views/firmware/firmwareList/index.vue
@@ -1,10 +1,34 @@
 <template>
   <section class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item prop="version">
-        <el-input v-model="queryParams.version" placeholder="请输入版本号" clearable size="small" style="width: 240px"
+      <el-form-item label="固件名称">
+        <el-input v-model="queryParams.fileName" placeholder="请输入固件名称" clearable size="small" style="width: 240px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <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 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>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="客户" prop="userId">
+        <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 label="项目" prop="projectId">
+        <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>
         <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>
@@ -28,6 +52,14 @@
       </el-table-column>
       <el-table-column prop="fileName" align="center" label="固件名称">
       </el-table-column>
+      <el-table-column prop="productName" align="center" label="产品名称">
+      </el-table-column>
+      <el-table-column prop="nodeName" align="center" label="节点名称">
+      </el-table-column>
+      <el-table-column prop="userName" align="center" label="客户名称">
+      </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="remark" align="center" label="备注">
@@ -61,7 +93,7 @@
         </el-form-item>
         <el-form-item label="客户" prop="userId">
           <el-select v-model="form.userId" clearable placeholder="请选择" @change="userIdChange">
-            <el-option v-for="item in userSelectList" :key="item.id" :label="item.nickName" :value="item.userId" >
+            <el-option v-for="item in userSelectList" :key="item.id" :label="item.nickName" :value="item.userId">
             </el-option>
           </el-select>
         </el-form-item>
@@ -110,6 +142,10 @@ export default {
   data () {
     return {
       // 产品下拉列表
+      queryProductSelectList: [],
+      queryNodeSelectList: [],
+      queryUserSelectList: [],
+      queryProjectSelectList: [],
       productSelectList: [],
       nodeSelectList: [],
       userSelectList: [],
@@ -172,6 +208,7 @@ export default {
   created () {
     productSelect().then(({ code, msg, select }) => {
       if (code == 200) {
+        this.queryProductSelectList = select;
         this.productSelectList = select;
       } else {
         this.$message.error(msg);
@@ -179,6 +216,7 @@ export default {
     })
     userSelect().then(({ code, msg, select }) => {
       if (code == 200) {
+        this.queryUserSelectList = select;
         this.userSelectList = select;
       } else {
         this.$message.error(msg);
@@ -187,6 +225,16 @@ export default {
     this.getList();
   },
   methods: {
+    queryProductIdChange (productId) {
+      delete this.queryParams.nodeId;
+      nodeSelect({ productId }).then(({ code, msg, select }) => {
+        if (code == 200) {
+          this.queryNodeSelectList = select;
+        } else {
+          this.$message.error(msg);
+        }
+      })
+    },
     productIdChange (productId) {
       delete this.form.nodeId;
       nodeSelect({ productId }).then(({ code, msg, select }) => {
@@ -197,7 +245,17 @@ export default {
         }
       })
     },
-    userIdChange(userId) {
+    queryUserIdChange (userId) {
+      delete this.queryParams.projectId;
+      projectSelect({ userId }).then(({ code, msg, select }) => {
+        if (code == 200) {
+          this.queryProjectSelectList = select;
+        } else {
+          this.$message.error(msg);
+        }
+      })
+    },
+    userIdChange (userId) {
       delete this.form.projectId;
       projectSelect({ userId }).then(({ code, msg, select }) => {
         if (code == 200) {
diff --git a/src/views/firmware/firmwareUpdate/index.vue b/src/views/firmware/firmwareUpdate/index.vue
index 91bd10b..0b7bc75 100644
--- a/src/views/firmware/firmwareUpdate/index.vue
+++ b/src/views/firmware/firmwareUpdate/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>1111</div>
+  <center>固件升级</center>
 </template>
 
 <script>
@@ -9,5 +9,4 @@ export default {
 </script>
 
 <style>
-
 </style>
\ No newline at end of file