设备授权界面调整

vue/src/views/iot/device/device-edit.vue

@@ -377,7 +377,6 @@ export default {
         getProductData(product) {
             this.form.productId = product.productId;
             this.form.productName = product.productName;
-            console.log(product);
         },
         // 获取选中的用户
         getUserData(user) {

vue/src/views/iot/firmware/index.vue

@@ -12,9 +12,9 @@
                 <el-button type="primary" 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-item style="float:right;">
+            <!-- <el-form-item style="float:right;">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['iot:firmware:add']">新增</el-button>
-            </el-form-item>
+            </el-form-item> -->
         </el-form>
     </el-card>
 
@@ -22,25 +22,29 @@
         <el-table v-loading="loading" :data="firmwareList" @selection-change="handleSelectionChange">
             <el-table-column label="固件名称" align="center" prop="firmwareName" />
             <el-table-column label="产品名称" align="center" prop="productName" />
+
+            <el-table-column label="下载地址" align="center" prop="filePath" width="400">
+                <template slot-scope="scope">
+                    <el-link :href="getDownloadUrl(scope.row.filePath)" :underline="false" type="primary">{{getDownloadUrl(scope.row.filePath)}}</el-link>
+                </template>
+            </el-table-column>
             <el-table-column label="固件版本" align="center" prop="version">
                 <template slot-scope="scope">
                     <span>Version </span> {{scope.row.version}}
                 </template>
             </el-table-column>
-            <el-table-column label="路径" align="left" prop="filePath" />
-            <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+            <el-table-column label="创建时间" align="center" prop="createTime">
                 <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
                 </template>
             </el-table-column>
             <el-table-column label="备注" align="center" prop="remark" />
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+            <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
                 <template slot-scope="scope">
-                    <el-button size="small" type="info" style="padding:5px;" icon="el-icon-download" @click="handleDownload(scope.row)">下载</el-button>
                     <el-button size="small" type="primary" style="padding:5px;" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:firmware:edit']">修改</el-button>
-                    <el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:firmware:remove']" >删除</el-button>
+                    <el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:firmware:remove']">删除</el-button>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
         </el-table>
 
         <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
@@ -67,7 +71,7 @@
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm" >确 定</el-button>
+                <el-button type="primary" @click="submitForm">确 定</el-button>
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog>
@@ -182,6 +186,9 @@ export default {
         this.getProductShortList();
     },
     methods: {
+        getDownloadUrl(path) {
+            return window.location.origin + process.env.VUE_APP_BASE_API + path;
+        },
         /** 查询产品固件列表 */
         getList() {
             this.loading = true;
@@ -328,7 +335,7 @@ export default {
         },
         // 文件下载处理
         handleDownload(row) {
-            window.open(process.env.VUE_APP_BASE_API+row.filePath);
+            window.open(process.env.VUE_APP_BASE_API + row.filePath);
         }
 
     },

vue/src/views/iot/product/product-alert.vue

@@ -12,11 +12,8 @@
         <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-tag type="danger" style="margin-left:15px;">该功能暂不可用,后面版本发布</el-tag>
         </el-form-item>
-        <el-form-item>
-            <el-link type="danger" style="padding-top:5px" :underline="false">该功能，未完成</el-link>
-        </el-form-item>
-
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -50,8 +47,6 @@
                 <dict-tag :options="dict.type.iot_alert_level" :value="scope.row.alertLevel" />
             </template>
         </el-table-column>
-        <el-table-column label="产品ID" align="center" prop="productId" />
-        <el-table-column label="产品名称" align="center" prop="productName" />
         <el-table-column label="触发器" align="center" prop="triggers" />
         <el-table-column label="执行动作" align="center" prop="actions" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -73,27 +68,28 @@
     <!-- 添加或修改设备告警对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-            <el-row>
-                <el-col :span="15">
+            <el-row style="border-bottom:1px solid #ddd;margin-bottom:20px;" :gutter="50">
+                <el-col :span="12">
                     <el-form-item label="告警名称" prop="alertName">
                         <el-input v-model="form.alertName" placeholder="请输入告警名称" />
                     </el-form-item>
-                </el-col>
-                <el-col :span="20">
                     <el-form-item label="告警级别" prop="alertLevel">
-                        <el-select v-model="form.alertLevel" placeholder="请选择告警级别">
+                        <el-select v-model="form.alertLevel" placeholder="请选择告警级别" style="width:100%;">
                             <el-option v-for="dict in dict.type.iot_alert_level" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
                         </el-select>
                     </el-form-item>
-                </el-col>
-                <el-col :span="21">
                     <el-form-item label="告警状态">
-                        <el-radio-group v-model="form.status">
-                            <el-radio v-for="dict in alertType" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
-                        </el-radio-group>
+                        <el-switch v-model="form.status" :active-value="1" :inactive-value="0" />
                     </el-form-item>
                 </el-col>
+                <el-col :span="12">
+                    <el-form-item label="备注" prop="remark">
+                        <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" rows="6" />
+                    </el-form-item>
+                </el-col>
+            </el-row>
 
+            <el-row style="border-bottom:1px solid #ddd;margin-bottom:20px;">
                 <el-col :span="24">
                     <el-form-item label="触发器" prop="griggers">
                         <el-select v-model="form.condition" placeholder="请选择" size="small" style="margin-bottom:10px;">
@@ -180,12 +176,13 @@
                                     <el-input v-model="item.value" placeholder="值" size="small" />
                                 </el-col>
                             </el-row>
-
                         </div>
                         <div>+ <a style="color:#409EFF" @click="addTriggerItem()">添加触发器</a></div>
                     </el-form-item>
                 </el-col>
+            </el-row>
 
+            <el-row>
                 <el-col :span="24">
                     <el-form-item label="执行动作">
                         <el-row v-for="(item,index) in form.actions" :key="index" style="margin-bottom:10px;">
@@ -211,12 +208,6 @@
                 </el-col>
             </el-row>
 
-            <el-col :span="16">
-                <el-form-item label="备注" prop="remark">
-                    <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                </el-form-item>
-            </el-col>
-
         </el-form>
         <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submitForm" disabled>确 定</el-button>

vue/src/views/iot/product/product-app.vue

@@ -2,7 +2,7 @@
 <div style="padding-left:20px;">
     <el-row :gutter="10">
         <el-col :span="14">
-         <el-link type="danger" style="padding-top:5px" :underline="false">该功能，未完成</el-link>
+            <el-tag type="danger" style="margin-left:15px;">该功能暂不可用,后面版本发布</el-tag>
             <el-table v-loading="loading" :data="modelList" border style="margin-bottom:60px;margin-top:20px;">
                 <el-table-column label="名称" align="center" prop="modelName" />
                 <el-table-column label="标识符" align="center" prop="identifier" />
@@ -116,6 +116,7 @@ export default {
     top: 45px;
     left: 12px;
     border: 1px solid #888;
-    background: linear-gradient(23deg, #AFF7FF 0%, #ffc3a0 100%);
+    background-color:rgb(245, 245, 255);
+
 }
 </style>

vue/src/views/iot/product/product-authorize.vue

@@ -1,15 +1,20 @@
 <template>
 <div style="padding-left:20px;">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
-        <el-form-item label="授权码" prop="authorizeCode">
-            <el-input v-model="queryParams.authorizeCode" placeholder="请输入授权码" clearable size="small" @keyup.enter.native="handleQuery" />
-        </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="70px">
         <el-form-item label="设备编号" prop="serialNumber">
             <el-input v-model="queryParams.serialNumber" placeholder="请输入设备编号" clearable size="small" @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="用户名称" prop="userName">
             <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable size="small" @keyup.enter.native="handleQuery" />
         </el-form-item>
+        <el-form-item label="授权码" prop="authorizeCode">
+            <el-input v-model="queryParams.authorizeCode" placeholder="请输入授权码" clearable size="small" @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+            <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
+                <el-option v-for="dict in dict.type.iot_auth_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+        </el-form-item>
         <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -27,26 +32,24 @@
             <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple || productInfo.status==2" @click="handleDelete" v-hasPermi="['iot:authorize:remove']">删除</el-button>
         </el-col>
         <el-col :span="1.5">
-            <el-link type="danger" style="padding-top:5px" :underline="false">Tips：双击可以复制授权码。</el-link>
+            <el-link type="info" style="padding-top:5px" :underline="false">Tips：双击可以复制授权码。</el-link>
         </el-col>
         <right-toolbar @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="authorizeList" @selection-change="handleSelectionChange" @cell-dblclick="celldblclick">
-        <el-table-column type="selection" :selectable="selectable" width="55" align="center"/>
-        <el-table-column label="ID"  width="55" align="center" prop="authorizeId" />
+        <el-table-column type="selection" :selectable="selectable" width="55" align="center" />
         <el-table-column label="状态" align="center" prop="active" width="80">
             <template slot-scope="scope">
-                <el-tag type="success" v-if="scope.row.deviceId">已使用</el-tag>
-                <el-tag type="info" v-else>未使用</el-tag>
+                <dict-tag :options="dict.type.iot_auth_status" :value="scope.row.status" />
             </template>
         </el-table-column>
-        <el-table-column label="授权码" width="310" align="center" prop="authorizeCode" />
+        <el-table-column label="授权码" width="320" align="center" prop="authorizeCode" />
         <el-table-column label="设备ID" width="75" align="center" prop="deviceId" />
         <el-table-column label="设备编号" width="150" align="center" prop="serialNumber" />
         <el-table-column label="用户ID" width="75" align="center" prop="userId" />
         <el-table-column label="用户名称" align="center" prop="userName" />
-        <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+        <el-table-column label="授权时间" align="center" prop="updateTime" width="180">
             <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
             </template>
@@ -90,10 +93,11 @@
 </template>
 
 <style>
-.createNum{
+.createNum {
     width: 300px;
 }
-.createNum input{
+
+.createNum input {
     width: 260px;
 }
 </style>
@@ -111,6 +115,7 @@ import {
 } from '@/utils/index'
 export default {
     name: "product-authorize",
+    dicts: ['iot_auth_status'],
     props: {
         product: {
             type: Object,
@@ -159,6 +164,7 @@ export default {
                 serialNumber: null,
                 userId: null,
                 userName: null,
+                status: null,
             },
             // 表单参数
             form: {},
@@ -223,20 +229,22 @@ export default {
         },
         /** 批量新增按钮操作 */
         handleAdd() {
-            this.$prompt('', '输入新增授权码数量', {
-              customClass: 'createNum',
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              inputPattern: /[0-9\-]/,
-              inputErrorMessage: '数量内容不正确',
-              inputType: 'number',
-              inputValue: this.createNum
-            }).then(({ value }) => {
+            this.$prompt('', '输入授权码数量', {
+                customClass: 'createNum',
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                inputPattern: /[0-9\-]/,
+                inputErrorMessage: '数量内容不正确',
+                inputType: 'number',
+                inputValue: this.createNum
+            }).then(({
+                value
+            }) => {
                 this.createNum = value
                 if (this.queryParams.productId != null) {
                     let _addData = {
-                        productId : this.queryParams.productId,
-                        createNum : this.createNum
+                        productId: this.queryParams.productId,
+                        createNum: this.createNum
                     }
                     addProductAuthorizeByNum(_addData).then(response => {
                         this.$modal.msgSuccess("新增授权码成功");
@@ -246,9 +254,9 @@ export default {
                 }
             }).catch(() => {
                 this.$message({
-                  type: 'info',
-                  message: '取消新增'
-                });       
+                    type: 'info',
+                    message: '取消新增'
+                });
             });
         },
         /** 修改按钮操作 */

vue/src/views/iot/product/product-edit.vue

@@ -2,7 +2,7 @@
 <el-card style="margin:6px;padding-bottom:100px;">
     <el-tabs v-model="activeName" tab-position="left" style="padding:10px;">
         <el-tab-pane name="basic">
-            <span slot="label"> * 基本信息</span>
+            <span slot="label"><span style="color:red;">* </span>基本信息</span>
             <el-form ref="form" :model="form" :rules="rules" label-width="100px">
                 <el-row :gutter="100">
                     <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
@@ -72,22 +72,26 @@
         </el-tab-pane>
 
         <el-tab-pane label="" name="things" :disabled="form.productId==0">
-            <span slot="label">* 物模型</span>
+            <span slot="label"><span style="color:red;">* </span>产品模型</span>
+            <product-things-model ref="productThingsModel" :product="form" />
+        </el-tab-pane>
+        <el-tab-pane label="" name="firmware" :disabled="form.productId==0">
+            <span slot="label">固件管理</span>
             <product-things-model ref="productThingsModel" :product="form" />
         </el-tab-pane>
 
         <el-tab-pane label="" name="productAuthorize" :disabled="form.productId==0 || form.isAuthorize==0">
-            <span slot="label">授权码</span>
+            <span slot="label">设备授权</span>
             <product-authorize ref="productAuthorize" :product="form" />
         </el-tab-pane>
 
-        <el-tab-pane label="" name="alert" disabled>
+        <el-tab-pane label="" name="alert">
             <span slot="label"> 告警配置</span>
             <product-alert ref="productAlert" :product="form"></product-alert>
         </el-tab-pane>
 
-        <el-tab-pane label="" name="productApp" disabled>
-            <span slot="label">自定义APP</span>
+        <el-tab-pane label="" name="productApp">
+            <span slot="label">产品界面</span>
             <product-app ref="productApp" :product="form" />
         </el-tab-pane>
 
@@ -252,9 +256,9 @@ export default {
         changeProductStatus(status) {
             let message = "发生错误了";
             if (status == 2) {
-                message = "产品发布后不能再更改产品内容和对应物模型 ！";
+                message = "产品发布后不能再更改产品内容和对应物模型";
             } else if (status == 1) {
-                message = "产品下不能有已经创建的设备，才能取消发布哦 ！"
+                message = "产品下不能有已经创建的设备，才能取消发布哦"
             }
             this.$confirm(message, '提示', {
                 confirmButtonText: '确定',