Merge branch 'master' of gitee.com:willamet/rn-bms-vue

src/api/hardware/product.js

@@ -43,3 +43,10 @@ export function del(ids) {
     })
 }
 
+// 产品下拉
+export function select() {
+    return request({
+        url: '/system/product/select',
+        method: 'get',
+    })
+}

src/api/system/user.js

@@ -125,3 +125,11 @@ export function importTemplate() {
     method: 'get'
   })
 }
+
+// 获取客户下拉
+export function userSelect() {
+  return request({
+    url: '/system/user/select',
+    method: 'get'
+  })
+}

src/utils/request.js

@@ -10,7 +10,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  // timeout: 10000
 })
 // request拦截器
 service.interceptors.request.use(config => {

src/views/firmware/firmwareList/index.vue

@@ -1,8 +1,5 @@
 <template>
   <section class="app-container">
-    <el-row>
-      <el-col :span="4">左侧区域</el-col>
-      <el-col :span="20">
     <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"
@@ -37,8 +34,7 @@
       </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)"
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:management:edit']">
-                v-hasPermi="['system:management:edit']">
             修改
           </el-button>
           <el-button class="text-danger" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -48,19 +44,47 @@
     </el-table>
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
-      </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="产品" prop="productId">
+          <el-select v-model="form.productId" clearable placeholder="请选择" @change="productIdChange">
+            <el-option v-for="item in productSelectList" :key="item.id" :label="item.productName" :value="item.productId">
+            </el-option>
+          </el-select>
+        </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>
+          </el-select>
+        </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>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="项目" prop="projectId">
+          <el-select v-model="form.projectId" clearable placeholder="请选择">
+            <el-option v-for="item in projectSelectList" :key="item.id" :label="item.projectName" :value="item.projectId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="上传文件" prop="version">
+          <el-upload ref="upload" :limit="1" :show-file-list="false" accept=".bin" :headers="upload.headers" :action="upload.url"
+            :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess">
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">
+              <el-input v-model="form.fileName" disabled placeholder="文件名称" />
+            </div>
+          </el-upload>
+        </el-form-item>
         <el-form-item label="固件版本号" prop="version">
           <el-input v-model="form.version" placeholder="请输入固件版本号" />
         </el-form-item>
-        <el-form-item label="固件名称" prop="fileName">
+        <el-form-item label="硬件版本号" prop="fwVersion">
-          <el-input v-model="form.fileName" placeholder="请输入固件名称" />
+          <el-input v-model="form.fwVersion" placeholder="请输入硬件版本号" />
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-input v-model="form.status" />
         </el-form-item>
         <el-form-item label="备注">
           <el-input v-model="form.remark" />
@@ -75,11 +99,30 @@
 </template>
 
 <script>
+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 projectSelect } from "@/api/hardware/project";
+import { userSelect } from "@/api/system/user";
 export default {
   name: "FirmwareList",
   data () {
     return {
+      // 产品下拉列表
+      productSelectList: [],
+      nodeSelectList: [],
+      userSelectList: [],
+      projectSelectList: [],
+      // 固件上传
+      upload: {
+        // 是否禁用上传
+        isUploading: false,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/minio/uploadFirmwareFile"
+      },
       // 选中数组
       ids: [],
       // 非多个禁用
@@ -105,16 +148,81 @@ export default {
         version: [
           { required: true, message: "固件版本号不能为空", trigger: "blur" },
         ],
+        fwVersion: [
+          { required: true, message: "硬件版本号不能为空", trigger: "blur" },
+        ],
         fileName: [
-          { required: true, message: "固件名称不能为空", trigger: "blur" },
+          { required: true, message: "必须上传文件", trigger: "blur" },
-        ]
+        ],
+        productId: [
+          { required: true, message: "产品不能为空", trigger: "blur" },
+        ],
+        nodeId: [
+          { required: true, message: "节点不能为空", trigger: "blur" },
+        ],
+        userId: [
+          { required: true, message: "客户不能为空", trigger: "blur" },
+        ],
+        projectId: [
+          { required: true, message: "项目不能为空", trigger: "blur" },
+        ],
       },
     };
   },
   created () {
+    productSelect().then(({ code, msg, select }) => {
+      if (code == 200) {
+        this.productSelectList = select;
+      } else {
+        this.$message.error(msg);
+      }
+    })
+    userSelect().then(({ code, msg, select }) => {
+      if (code == 200) {
+        this.userSelectList = select;
+      } else {
+        this.$message.error(msg);
+      }
+    })
     this.getList();
   },
   methods: {
+    productIdChange (productId) {
+      delete this.form.nodeId;
+      nodeSelect({ productId }).then(({ code, msg, select }) => {
+        if (code == 200) {
+          this.nodeSelectList = select;
+        } else {
+          this.$message.error(msg);
+        }
+      })
+    },
+    userIdChange(userId) {
+      delete this.form.projectId;
+      projectSelect({ userId }).then(({ code, msg, select }) => {
+        if (code == 200) {
+          this.projectSelectList = select;
+        } else {
+          this.$message.error(msg);
+        }
+      })
+    },
+    // 文件上传中处理
+    handleFileUploadProgress (event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess (res, file, fileList) {
+      if (res.code == 200) {
+        this.$message.success(res.msg);
+        let { fileName, length, url } = res;
+        this.form = Object.assign({}, this.form, { fileName, length, filePath: url });
+      } else {
+        this.$message.error(res.msg);
+      }
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+    },
     /** 搜索按钮操作 */
     handleQuery () {
       this.queryParams.pageNum = 1;

src/views/system/user/index.vue

@@ -4,77 +4,33 @@
       <!--部门数据-->
       <el-col :span="4" :xs="24">
         <div class="head-container">
-          <el-input
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
-            v-model="deptName"
+            style="margin-bottom: 20px" />
-            placeholder="请输入部门名称"
-            clearable
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
         </div>
         <div class="head-container">
-          <el-tree
+          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree"
-            :data="deptOptions"
+            default-expand-all @node-click="handleNodeClick" />
-            :props="defaultProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            default-expand-all
-            @node-click="handleNodeClick"
-          />
         </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="用户名称" prop="userName">
-            <el-input
+            <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable size="small" style="width: 240px"
-              v-model="queryParams.userName"
+              @keyup.enter.native="handleQuery" />
-              placeholder="请输入用户名称"
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
           </el-form-item>
           <el-form-item label="手机号码" prop="phonenumber">
-            <el-input
+            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable size="small" style="width: 240px"
-              v-model="queryParams.phonenumber"
+              @keyup.enter.native="handleQuery" />
-              placeholder="请输入手机号码"
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
           </el-form-item>
           <el-form-item label="状态" prop="status">
-            <el-select
+            <el-select v-model="queryParams.status" placeholder="用户状态" clearable size="small" style="width: 240px">
-              v-model="queryParams.status"
+              <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
-              placeholder="用户状态"
-              clearable
-              size="small"
-              style="width: 240px"
-            >
-              <el-option
-                v-for="dict in statusOptions"
-                :key="dict.dictValue"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
-              />
             </el-select>
           </el-form-item>
           <el-form-item label="创建时间">
-            <el-date-picker
+            <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-              v-model="dateRange"
+              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-              size="small"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -84,51 +40,23 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['system:user:add']"
-            >新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-              type="success"
+              v-hasPermi="['system:user:edit']">修改</el-button>
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
-            >修改</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-              type="danger"
+              v-hasPermi="['system:user:remove']">删除</el-button>
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
-            >删除</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:user:import']">导入
-              type="info"
+            </el-button>
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-              v-hasPermi="['system:user:import']"
-            >导入</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出
-              type="warning"
+            </el-button>
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['system:user:export']"
-            >导出</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -142,12 +70,7 @@
           <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" />
           <el-table-column label="状态" align="center">
             <template slot-scope="scope">
-              <el-switch
+              <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
-                v-model="scope.row.status"
-                active-value="0"
-                inactive-value="1"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
             </template>
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" width="160">
@@ -155,46 +78,20 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
-            label="操作"
-            align="center"
-            width="160"
-            class-name="small-padding fixed-width"
-          >
             <template slot-scope="scope">
-              <el-button
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">修改
-                size="mini"
+              </el-button>
-                type="text"
+              <el-button v-if="scope.row.userId !== 1" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                icon="el-icon-edit"
+                v-hasPermi="['system:user:remove']">删除</el-button>
-                @click="handleUpdate(scope.row)"
+              <el-button size="mini" type="text" icon="el-icon-key" @click="handleResetPwd(scope.row)"
-                v-hasPermi="['system:user:edit']"
+                v-hasPermi="['system:user:resetPwd']">重置</el-button>
-              >修改</el-button>
-              <el-button
-                v-if="scope.row.userId !== 1"
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
-              >删除</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-key"
-                @click="handleResetPwd(scope.row)"
-                v-hasPermi="['system:user:resetPwd']"
-              >重置</el-button>
             </template>
           </el-table-column>
         </el-table>
 
-        <pagination
+        <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          v-show="total>0"
+          @pagination="getList" />
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
       </el-col>
     </el-row>
 
@@ -241,51 +138,40 @@
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择">
-                <el-option
+                <el-option v-for="dict in sexOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"></el-option>
-                  v-for="dict in sexOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio
+                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{dict.dictLabel}}</el-radio>
-                  v-for="dict in statusOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictValue"
-                >{{dict.dictLabel}}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col v-if="form.userId == undefined" :span="12">
+            <el-form-item label="用户类型">
+              <el-select v-model="form.userType" placeholder="请选择">
+                <el-option label="系统用户" value="00"></el-option>
+                <el-option label="客户" value="01"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.userType == '00'" :span="12">
             <el-form-item label="岗位">
               <el-select v-model="form.postIds" multiple placeholder="请选择">
-                <el-option
+                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
-                  v-for="item in postOptions"
+                  :disabled="item.status == 1"></el-option>
-                  :key="item.postId"
-                  :label="item.postName"
-                  :value="item.postId"
-                  :disabled="item.status == 1"
-                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="角色">
               <el-select v-model="form.roleIds" multiple placeholder="请选择">
-                <el-option
+                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
-                  v-for="item in roleOptions"
+                  :disabled="item.status == 1"></el-option>
-                  :key="item.roleId"
-                  :label="item.roleName"
-                  :value="item.roleId"
-                  :disabled="item.status == 1"
-                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -306,18 +192,9 @@
 
     <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-        ref="upload"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-        :limit="1"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">
           将文件拖到此处，或