diff --git a/src/api/ss/risk.js b/src/api/ss/risk.js
new file mode 100644
index 0000000..53bf629
--- /dev/null
+++ b/src/api/ss/risk.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询风控列表
+export function listRisk(query) {
+ return request({
+ url: '/ss/risk/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询风控详细
+export function getRisk(riskId) {
+ return request({
+ url: '/ss/risk/' + riskId,
+ method: 'get'
+ })
+}
+
+// 新增风控
+export function addRisk(data) {
+ return request({
+ url: '/ss/risk',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改风控
+export function updateRisk(data) {
+ return request({
+ url: '/ss/risk',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除风控
+export function delRisk(riskId) {
+ return request({
+ url: '/ss/risk/' + riskId,
+ method: 'delete'
+ })
+}
diff --git a/src/views/ss/risk/index.vue b/src/views/ss/risk/index.vue
new file mode 100644
index 0000000..9a8f54d
--- /dev/null
+++ b/src/views/ss/risk/index.vue
@@ -0,0 +1,338 @@
+<template>
+ <div class="app-container">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="用户" prop="userName">
+ <el-input
+ v-model="queryParams.userName"
+ placeholder="请输入用户名称"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="类型" prop="type">
+ <el-select v-model="queryParams.type" placeholder="请选择类型" clearable @change="handleQuery">
+ <el-option
+ v-for="dict in dict.type.risk_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="风控原因" prop="reason">
+ <el-input
+ v-model="queryParams.reason"
+ placeholder="请输入风控原因"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </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>
+ </el-form-item>
+ </el-form>
+
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ plain
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ v-hasPermi="['ss:risk:remove']"
+ >删除</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ v-hasPermi="['ss:risk:export']"
+ >导出</el-button>
+ </el-col>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+ </el-row>
+
+ <el-table v-loading="loading" :data="riskList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="onSortChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <template v-for="column of showColumns">
+ <el-table-column
+ :key="column.key"
+ :label="column.label"
+ :prop="column.key"
+ :align="column.align"
+ :min-width="column.minWidth"
+ :sort-orders="orderSorts"
+ :sortable="column.sortable"
+ :show-overflow-tooltip="column.overflow"
+ :width="column.width"
+ >
+ <template slot-scope="d">
+ <template v-if="column.key === 'riskId'">
+ {{d.row[column.key]}}
+ </template>
+ <template v-else-if="column.key === 'type'">
+ <dict-tag :options="dict.type.risk_type" :value="d.row[column.key]"/>
+ </template>
+ <template v-else>
+ {{d.row[column.key]}}
+ </template>
+ </template>
+ </el-table-column>
+ </template>
+ <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="['ss:risk:edit']"
+ >修改</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['ss:risk:remove']"
+ >删除</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-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form-item label="用户ID" prop="userId">
+ <el-input v-model="form.userId" placeholder="请输入用户ID" />
+ </el-form-item>
+ <el-form-item label="类型" prop="type">
+ <el-select v-model="form.type" placeholder="请选择类型">
+ <el-option
+ v-for="dict in dict.type.risk_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="风控原因" prop="reason">
+ <el-input v-model="form.reason" placeholder="请输入风控原因" />
+ </el-form-item>
+ <el-form-item label="结束时间" prop="endTime">
+ <el-date-picker clearable
+ v-model="form.endTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="请选择结束时间">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="实名认证ID" prop="realNameId">
+ <el-input v-model="form.realNameId" placeholder="请输入实名认证ID" />
+ </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 { listRisk, getRisk, delRisk, addRisk, updateRisk } from "@/api/ss/risk";
+import { $showColumns } from '@/utils/mixins';
+
+// 默认排序字段
+const defaultSort = {
+ prop: "createTime",
+ order: "descending"
+}
+
+export default {
+ name: "Risk",
+ mixins: [$showColumns],
+ dicts: ['risk_type'],
+ data() {
+ return {
+ // 字段列表
+ columns: [
+ {key: 'riskId', visible: true, label: '风控ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+ {key: 'userId', visible: true, label: '用户ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+ {key: 'type', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+ {key: 'reason', visible: true, label: '风控原因', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+ {key: 'endTime', visible: true, label: '结束时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
+ {key: 'realNameId', visible: true, label: '实名认证ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+ ],
+ // 排序方式
+ orderSorts: ['ascending', 'descending', null],
+ // 遮罩层
+ loading: true,
+ // 选中数组
+ ids: [],
+ // 非单个禁用
+ single: true,
+ // 非多个禁用
+ multiple: true,
+ // 显示搜索条件
+ showSearch: true,
+ // 总条数
+ total: 0,
+ // 风控表格数据
+ riskList: [],
+ // 弹出层标题
+ title: "",
+ // 是否显示弹出层
+ open: false,
+ defaultSort,
+ // 查询参数
+ queryParams: {
+ pageNum: 1,
+ pageSize: 20,
+ orderByColumn: defaultSort.prop,
+ isAsc: defaultSort.order,
+ riskId: null,
+ userId: null,
+ type: null,
+ reason: null,
+ realNameId: null
+ },
+ // 表单参数
+ form: {},
+ // 表单校验
+ rules: {
+ userId: [
+ { required: true, message: "用户ID不能为空", trigger: "blur" }
+ ],
+ type: [
+ { required: true, message: "类型不能为空", trigger: "change" }
+ ],
+ }
+ };
+ },
+ created() {
+ this.getList();
+ },
+ methods: {
+ /** 当排序按钮被点击时触发 **/
+ onSortChange(column) {
+ if (column.order == null) {
+ this.queryParams.orderByColumn = defaultSort.prop;
+ this.queryParams.isAsc = defaultSort.order;
+ } else {
+ this.queryParams.orderByColumn = column.prop;
+ this.queryParams.isAsc = column.order;
+ }
+ this.getList();
+ },
+ /** 查询风控列表 */
+ getList() {
+ this.loading = true;
+ listRisk(this.queryParams).then(response => {
+ this.riskList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+ // 取消按钮
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ // 表单重置
+ reset() {
+ this.form = {
+ riskId: null,
+ userId: null,
+ type: null,
+ reason: null,
+ endTime: null,
+ createTime: null,
+ realNameId: null
+ };
+ this.resetForm("form");
+ },
+ /** 搜索按钮操作 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 重置按钮操作 */
+ resetQuery() {
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+ // 多选框选中数据
+ handleSelectionChange(selection) {
+ this.ids = selection.map(item => item.riskId)
+ this.single = selection.length!==1
+ this.multiple = !selection.length
+ },
+ /** 新增按钮操作 */
+ handleAdd() {
+ this.reset();
+ this.open = true;
+ this.title = "添加风控";
+ },
+ /** 修改按钮操作 */
+ handleUpdate(row) {
+ this.reset();
+ const riskId = row.riskId || this.ids
+ getRisk(riskId).then(response => {
+ this.form = response.data;
+ this.open = true;
+ this.title = "修改风控";
+ });
+ },
+ /** 提交按钮 */
+ submitForm() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ if (this.form.riskId != null) {
+ updateRisk(this.form).then(response => {
+ this.$modal.msgSuccess("修改成功");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addRisk(this.form).then(response => {
+ this.$modal.msgSuccess("新增成功");
+ this.open = false;
+ this.getList();
+ });
+ }
+ }
+ });
+ },
+ /** 删除按钮操作 */
+ handleDelete(row) {
+ const riskIds = row.riskId || this.ids;
+ this.$modal.confirm('是否确认删除风控编号为"' + riskIds + '"的数据项？').then(function() {
+ return delRisk(riskIds);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("删除成功");
+ }).catch(() => {});
+ },
+ /** 导出按钮操作 */
+ handleExport() {
+ this.download('ss/risk/export', {
+ ...this.queryParams
+ }, `risk_${new Date().getTime()}.xlsx`)
+ }
+ }
+};
+</script>
diff --git a/src/views/system/device/detail.vue b/src/views/system/device/detail.vue
index cd26a22..b4cadfc 100644
--- a/src/views/system/device/detail.vue
+++ b/src/views/system/device/detail.vue
@@ -63,6 +63,9 @@
<el-descriptions-item label="最后在线时间">
{{deviceData.lastOnlineStatus | defaultValue}}
</el-descriptions-item>
+ <el-descriptions-item label="版本号">
+ {{deviceData.version | defaultValue}}
+ </el-descriptions-item>
<el-descriptions-item label="WIFI">{{deviceData.wifi | defaultValue}}</el-descriptions-item>
<el-descriptions-item label="开关状态">
<el-tag :type="isOpen ? 'success' : 'danger'" size="mini">{{isOpen ? '已开启' : '已关闭'}}</el-tag>