mirror of
https://github.com/kerwincui/FastBee.git
synced 2025-10-24 00:23:14 +08:00
界面优化
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
<div style="display:table;margin-bottom:10px;">
|
||||
<div style="width:70px;font-weight: bold;display:table-cell;">联系作者</div>
|
||||
<div style="display:table-cell;">
|
||||
<span>QQ164770707</span>
|
||||
<span>QQ 164770707</span>
|
||||
</div>
|
||||
</div>
|
||||
<div style="display:table;margin-bottom:15px;">
|
||||
@@ -341,6 +341,11 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<div style="width:100%;text-align:center;font-size:14px;color:#666;line-height:32px;margin-top:150px;">
|
||||
<span>Copyright © 2021-2022 <a href="https://wumei.live/" target="_blank">Wumei Smart</a> | <a href="https://wumei.live/" target="_blank">物美智能</a> | Apache License</span><br />
|
||||
<span>项目文档<a href="https://wumei.live/doc/" target="_blank"> https://wumei.live/doc/</a></span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -940,9 +945,6 @@ export default {
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.app-container {
|
||||
padding-bottom: 200px;
|
||||
}
|
||||
|
||||
.description {
|
||||
font-size: 14px;
|
||||
|
@@ -32,8 +32,9 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-button size="small" type="primary" style="padding:5px;" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:category:edit']" v-if="scope.row.isSys == '1' && isTenant!=true">修改</el-button>
|
||||
<el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:category:remove']" v-if="scope.row.isSys == '1' && isTenant!=true">删除</el-button>
|
||||
<el-button size="small" type="primary" style="padding:5px;" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:category:edit']" v-if="scope.row.isSys == '0'? true:!isTenant">修改</el-button>
|
||||
<el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:category:remove']" v-if="scope.row.isSys == '0'? true:!isTenant">删除</el-button>
|
||||
<span style="font-size:10px;color:#999;" v-if="scope.row.isSys == '1' && isTenant">系统定义,不能修改</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -100,7 +101,7 @@ export default {
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
categoryName: null,
|
||||
isSys: null,
|
||||
},
|
||||
|
@@ -194,6 +194,7 @@ export default {
|
||||
productId: 0,
|
||||
status: 1,
|
||||
isCustomLocation: 1,
|
||||
firmwareVersion: 1.0,
|
||||
},
|
||||
// 图片地址
|
||||
imageUrl: require('@/assets/images/product.jpg'),
|
||||
@@ -297,7 +298,7 @@ export default {
|
||||
tenantId: null,
|
||||
tenantName: null,
|
||||
serialNumber: null,
|
||||
firmwareVersion: null,
|
||||
firmwareVersion: 1.0,
|
||||
status: 1,
|
||||
rssi: null,
|
||||
networkAddress: null,
|
||||
|
@@ -119,8 +119,7 @@ export default {
|
||||
}
|
||||
},
|
||||
/**监测统计数据 */
|
||||
getStatistic() {
|
||||
|
||||
getStatistic() {
|
||||
let color = ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'];
|
||||
for (let i = 0; i < this.monitorThings.length; i++) {
|
||||
// 设置宽度
|
||||
@@ -141,7 +140,7 @@ export default {
|
||||
grid: {
|
||||
top: '80px',
|
||||
left: '40px',
|
||||
right: '80px',
|
||||
right: '20px',
|
||||
bottom: '60px',
|
||||
containLabel: true
|
||||
},
|
||||
@@ -156,23 +155,9 @@ export default {
|
||||
},
|
||||
xAxis: {
|
||||
type: 'time',
|
||||
boundaryGap: false,
|
||||
name: "时间", //坐标名字
|
||||
nameLocation: "end", //坐标位置,支持start,end,middle
|
||||
nameTextStyle: { //字体样式
|
||||
fontSize: 16, //字体大小
|
||||
padding: 20 //距离坐标位置的距离
|
||||
},
|
||||
},
|
||||
yAxis: {
|
||||
type: 'value',
|
||||
boundaryGap: [0, '100%'],
|
||||
name: this.monitorThings[i].name, //坐标名字
|
||||
nameLocation: "end", //坐标位置,支持start,end,middle
|
||||
nameTextStyle: { //字体样式
|
||||
fontSize: 16, //字体大小
|
||||
padding: 10 //距离坐标位置的距离
|
||||
},
|
||||
},
|
||||
dataZoom: [{
|
||||
type: 'inside',
|
||||
@@ -192,17 +177,6 @@ export default {
|
||||
itemStyle: {
|
||||
color: i>9? color[0]:color[i]
|
||||
},
|
||||
areaStyle: {
|
||||
// color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
|
||||
// offset: 0,
|
||||
// color: 'rgb(64, 158, 255)'
|
||||
// },
|
||||
// {
|
||||
// offset: 1,
|
||||
// color: 'rgb(255, 255, 255)'
|
||||
// }
|
||||
// ])
|
||||
},
|
||||
data: []
|
||||
}]
|
||||
};
|
||||
|
@@ -22,7 +22,6 @@
|
||||
<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="tenantName" />
|
||||
<el-table-column label="固件版本" align="center" prop="version">
|
||||
<template slot-scope="scope">
|
||||
<span>Version </span> {{scope.row.version}}
|
||||
|
@@ -41,7 +41,7 @@
|
||||
<el-tag type="info" v-else>未使用</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="授权码" width="300" align="center" prop="authorizeCode" />
|
||||
<el-table-column label="授权码" width="310" 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" />
|
||||
|
@@ -33,7 +33,7 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备认证" prop="vertificateMethod">
|
||||
<el-select v-model="form.vertificateMethod" placeholder="请选择认证方式" disabled style="width:100%">
|
||||
<el-select v-model="form.vertificateMethod" placeholder="请选择认证方式" style="width:100%">
|
||||
<el-option v-for="dict in dict.type.iot_vertificate_method" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
@@ -61,8 +61,9 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-button size="small" type="primary" style="padding:5px;" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:template:edit']" v-if="scope.row.isSys == '1' && isTenant!=true" >修改</el-button>
|
||||
<el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:template:remove']" v-if="scope.row.isSys == '1' && isTenant!=true">删除</el-button>
|
||||
<el-button size="small" type="primary" style="padding:5px;" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:template:edit']" v-if="scope.row.isSys == '0'? true:!isTenant" >修改</el-button>
|
||||
<el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:template:remove']" v-if="scope.row.isSys == '0'? true:!isTenant">删除</el-button>
|
||||
<span style="font-size:10px;color:#999;" v-if="scope.row.isSys == '1' && isTenant">系统定义,不能修改</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
@@ -123,7 +123,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope" v-if="scope.row.roleId !== 1 && scope.row.roleId !== 2 && scope.row.roleId !== 3">
|
||||
<template slot-scope="scope" v-if="scope.row.roleId !== 1 && scope.row.roleId !== 1 && scope.row.roleId !== 1">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
|
Reference in New Issue
Block a user