完善前端

This commit is contained in:
kerwincui
2022-04-14 00:47:59 +08:00
parent 8c50fe34a0
commit 69c4111f02
14 changed files with 1154 additions and 502 deletions

View File

@@ -178,13 +178,14 @@
</el-dialog>
<!-- Mqtt通讯 -->
<mqtt-client ref="mqttClient" :publish="publish" :subscribes="subscribes" @callbackEvent="mqttCallback($event)" />
<mqttClient ref="mqttClient" :publish="publish" :subscribes="subscribes" @callbackEvent="mqttCallback($event)" />
</el-card>
</div>
</template>
<script>
import * as echarts from 'echarts';
import mqttClient from './mqtt-client.vue'
import {
listDeviceShort,
delDevice,
@@ -196,6 +197,7 @@ import {
export default {
name: "Device",
dicts: ['iot_device_status', 'iot_is_enable'],
components: {mqttClient},
data() {
return {
// 实时监测间隔

View File

@@ -53,8 +53,8 @@ export default {
connectTimeout: 60000
}
// 配置Mqtt地址
// let ssl_url = "wss://domain.com/mqtt"
let url = "ws://" + window.location.hostname + ":8083/mqtt";
let url = "wss://iot.wumei.live/mqtt"
// let url = "ws://" + window.location.hostname + ":8083/mqtt";
console.log("mqtt地址", url);
this.client = mqtt.connect(url, options);
this.client.on("connect", (e) => {

View File

@@ -176,10 +176,12 @@ import {
cacheJsonThingsModel
} from "@/api/iot/model";
import * as echarts from 'echarts';
import mqttClient from './mqtt-client.vue'
export default {
name: "running-status",
dicts: ['iot_yes_no'],
components: {mqttClient},
props: {
device: {
type: Object,

View File

@@ -0,0 +1,363 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="标题" prop="title">
<el-input v-model="queryParams.title" placeholder="请输入标题" clearable size="small" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="置顶" prop="isTop">
<el-select v-model="queryParams.isTop" placeholder="请选择置顶" clearable size="small">
<el-option v-for="dict in dict.type.iot_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="广告" prop="isBanner">
<el-select v-model="queryParams.isBanner" placeholder="请选择广告" clearable size="small">
<el-option v-for="dict in dict.type.iot_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="分类名称" prop="categoryName">
<el-input v-model="queryParams.categoryName" 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_yes_no" :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>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['iot:news:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['iot:news:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['iot:news: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="['iot:news:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="newsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="图片" align="center" prop="imgUrl">
<template slot-scope="scope">
<el-image style="border-radius:5px;height:60px;width:120px;margin-bottom:-5px;" lazy :preview-src-list="[baseUrl+scope.row.imgUrl]" :src="baseUrl+scope.row.imgUrl" fit="cover"></el-image>
</template>
</el-table-column>
<el-table-column label="标题" align="center" prop="title" />
<el-table-column label="作者" align="center" prop="author" />
<el-table-column label="分类" align="center" prop="categoryName">
<template slot-scope="scope">
<el-tag type="info">{{scope.row.categoryName}}</el-tag>
</template>
</el-table-column>
<el-table-column label="置顶" align="center" prop="isTop">
<template slot-scope="scope">
<dict-tag :options="dict.type.iot_yes_no" :value="scope.row.isTop" />
</template>
</el-table-column>
<el-table-column label="广告" align="center" prop="isBanner">
<template slot-scope="scope">
<dict-tag :options="dict.type.iot_yes_no" :value="scope.row.isBanner" />
</template>
</el-table-column>
<el-table-column label="发布" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.iot_yes_no" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<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">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:news:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:news: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="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="60px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="标题" prop="title">
<el-input v-model="form.title" placeholder="请输入标题" />
</el-form-item>
<el-form-item label="作者" prop="author">
<el-input v-model="form.author" placeholder="请输入作者" />
</el-form-item>
<el-form-item label="摘要" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" rows="3" />
</el-form-item>
<el-row>
<el-col :span="8">
<el-form-item label="置顶" prop="isTop">
<el-switch v-model="form.isTop" active-text="" inactive-text="" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="轮播" prop="isBanner">
<el-switch v-model="form.isBanner" active-text="" inactive-text="" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发布" prop="status">
<el-switch v-model="form.status" active-text="" inactive-text="" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="12">
<el-form-item label="分类" prop="categoryId">
<el-select v-model="form.categoryId" placeholder="请选择分类" @change="selectCategory">
<el-option v-for="category in categoryList" :key="category.id" :label="category.name" :value="category.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="图片">
<imageUpload ref="image-upload" :value="form.imgUrl" :limit="1" :fileSize="1" @input="getImagePath($event)"></imageUpload>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="内容">
<editor v-model="form.content" :min-height="192" />
</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 {
listNews,
getNews,
delNews,
addNews,
updateNews
} from "@/api/iot/news";
import {
listShortNewsCategory
} from '@/api/iot/newsCategory'
import imageUpload from "../../../components/ImageUpload/index"
export default {
name: "News",
dicts: ['iot_yes_no'],
components: {
imageUpload
},
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 新闻资讯表格数据
newsList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 分类列表
categoryList: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
title: null,
isTop: null,
isBanner: null,
categoryName: null,
status: null,
},
// 表单参数
form: {},
baseUrl: process.env.VUE_APP_BASE_API,
// 表单校验
rules: {
title: [{
required: true,
message: "标题不能为空",
trigger: "blur"
}],
content: [{
required: true,
message: "内容不能为空",
trigger: "blur"
}],
categoryId: [{
required: true,
message: "分类不能为空",
trigger: "blur"
}],
author: [{
required: true,
message: "作者不能为空",
trigger: "blur"
}],
}
};
},
created() {
this.getList();
// 获取分类列表
listShortNewsCategory().then(response => {
this.categoryList = response.data;
})
},
methods: {
/** 查询新闻资讯列表 */
getList() {
this.loading = true;
listNews(this.queryParams).then(response => {
this.newsList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/**获取上传图片的路径 */
getImagePath(data) {
this.form.imgUrl = data;
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
newsId: null,
title: null,
content: "暂无内容",
imgUrl: "",
isTop: null,
isBanner: null,
categoryId: null,
categoryName: null,
status: null,
author: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: 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.newsId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加新闻资讯";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const newsId = row.newsId || this.ids
getNews(newsId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改新闻资讯";
});
},
/** 提交按钮 */
submitForm() {
console.log(this.form);
if(this.form.imgUrl==null || this.form.imgUrl==""){
this.$modal.msgError("请上传图片");
return;
}
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.newsId != null) {
updateNews(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addNews(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const newsIds = row.newsId || this.ids;
this.$modal.confirm('是否确认删除新闻资讯编号为"' + newsIds + '"的数据项?').then(function () {
return delNews(newsIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('iot/news/export', {
...this.queryParams
}, `news_${new Date().getTime()}.xlsx`)
},
/** 选择分类 */
selectCategory(val) {
for (var i = 0; i < this.categoryList.length; i++) {
if (this.categoryList[i].id == val) {
this.form.categoryName = this.categoryList[i].name;
return;
}
}
},
}
};
</script>
<style src="@wangeditor/editor/dist/css/style.css"></style>

View File

@@ -0,0 +1,228 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="分类名称" prop="categoryName">
<el-input v-model="queryParams.categoryName" placeholder="请输入分类名称" clearable size="small" @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="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['iot:category:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['iot:category:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['iot:category: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="['iot:category:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="categoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="分类编号" align="center" prop="categoryId" />
<el-table-column label="分类名称" align="center" prop="categoryName" />
<el-table-column label="显示顺序" align="center" prop="orderNum" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<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" min-width="200" header-align="center" />
<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="['iot:category:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:category: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="分类名称" prop="categoryName">
<el-input v-model="form.categoryName" placeholder="请输入分类名称" />
</el-form-item>
<el-form-item label="显示顺序" prop="orderNum">
<el-input v-model="form.orderNum" placeholder="请输入显示顺序" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</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 {
listNewsCategory,
getNewsCategory,
delNewsCategory,
addNewsCategory,
updateNewsCategory
} from "@/api/iot/newsCategory";
export default {
name: "Category",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 新闻分类表格数据
categoryList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
categoryName: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
categoryName: [{
required: true,
message: "分类名字不能为空",
trigger: "blur"
}],
orderNum: [{
required: true,
message: "显示顺序不能为空",
trigger: "blur"
}],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询新闻分类列表 */
getList() {
this.loading = true;
listNewsCategory(this.queryParams).then(response => {
this.categoryList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
categoryId: null,
categoryName: null,
orderNum: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: 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.categoryId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加新闻分类";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const categoryId = row.categoryId || this.ids
getNewsCategory(categoryId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改新闻分类";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.categoryId != null) {
updateNewsCategory(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addNewsCategory(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const categoryIds = row.categoryId || this.ids;
this.$modal.confirm('是否确认删除新闻分类编号为"' + categoryIds + '"的数据项?').then(function () {
return delNewsCategory(categoryIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('iot/newsCategory/export', {
...this.queryParams
}, `category_${new Date().getTime()}.xlsx`)
}
}
};
</script>

View File

@@ -18,7 +18,7 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['iot:authorize:add']">新增授权码</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['iot:authorize:add']">生成授权码</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['iot:authorize:edit']">修改</el-button>
@@ -94,7 +94,7 @@
width: 300px;
}
.createNum input{
width: 130px;
width: 260px;
}
</style>
@@ -223,7 +223,7 @@ export default {
},
/** 批量新增按钮操作 */
handleAdd() {
this.$prompt('输入新增授权码数量', '提示', {
this.$prompt('', '输入新增授权码数量', {
customClass: 'createNum',
confirmButtonText: '确定',
cancelButtonText: '取消',

View File

@@ -296,10 +296,8 @@ export default {
},
// 授权码状态修改
changeIsAuthorize() {
let text = this.form.isAuthorize === "1" ? "启用" : "停用";
let _this = this;
this.$modal.confirm('确认要[' + text + ']' + this.form.productName + '授权码吗?').then(function () {
_this.submitForm();
let text = this.form.isAuthorize == "1" ? "启用" : "停用";
this.$modal.confirm('确认要' + text + '授权码吗?').then(function () {
}).catch(() => {
this.form.isAuthorize = 0;
});