Skip to content

P
property-management
Commit e22a8a60 by 416409548@qq.com
Options

bug优化

parent e5799bfa
Showing with 46 additions and 9 deletions
ant-design-vue-jeecg/src/components/tools/UserMenu.vue
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<span v-if="isDesktop()">欢迎您，{{ nickname() }}</span> <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
</span> </span>
<a-menu slot="overlay" class="user-dropdown-menu-wrapper"> <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
<a-menu-item key="0"> <!-- <a-menu-item key="0">
<router-link :to="{ name: 'account-center' }"> <router-link :to="{ name: 'account-center' }">
<a-icon type="user"/> <a-icon type="user"/>
<span>个人中心</span> <span>个人中心</span>
...@@ -52,16 +52,16 @@ ...@@ -52,16 +52,16 @@
</a-menu-item> </a-menu-item>
<a-menu-item key="3" @click="systemSetting"> <a-menu-item key="3" @click="systemSetting">
<a-icon type="tool"/> <a-icon type="tool"/>
<span>系统设置</span> <span>系统设置</span> -->
</a-menu-item> <!-- </a-menu-item> -->
<a-menu-item key="4" @click="updatePassword"> <a-menu-item key="4" @click="updatePassword">
<a-icon type="setting"/> <a-icon type="setting"/>
<span>密码修改</span> <span>密码修改</span>
</a-menu-item> </a-menu-item>
<a-menu-item key="5" @click="updateCurrentDepart"> <!-- <a-menu-item key="5" @click="updateCurrentDepart">
<a-icon type="cluster"/> <a-icon type="cluster"/>
<span>切换部门</span> <span>切换部门</span>
</a-menu-item> </a-menu-item> -->
<a-menu-item key="6" @click="clearCache"> <a-menu-item key="6" @click="clearCache">
<a-icon type="sync"/> <a-icon type="sync"/>
<span>清理缓存</span> <span>清理缓存</span>
......
ant-design-vue-jeecg/src/views/pm/access-control-device/modules/PmAccessControlDeviceForm.vue
...@@ -196,7 +196,8 @@ export default { ...@@ -196,7 +196,8 @@ export default {
required: true, required: true,
message: '请输入设备位置', message: '请输入设备位置',
trigger: 'blur' trigger: 'blur'
} },
{min: 0, max: 50, message: '长度不超过50个字符', trigger: 'blur' }
], ],
dateOfProduction: [ dateOfProduction: [
{ {
......
ant-design-vue-jeecg/src/views/pm/advertising_screen_setting/modules/AdvertisingScreenSettingForm.vue
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
export default { export default {
name: 'AdvertisingScreenSettingForm', name: 'AdvertisingScreenSettingForm',
components: { components: {
}, },
props: { props: {
//表单禁用 //表单禁用
...@@ -60,6 +61,39 @@ ...@@ -60,6 +61,39 @@
}, },
confirmLoading: false, confirmLoading: false,
validatorRules: { validatorRules: {
code: [
{
required: true,
message: '请输入设备编码',
trigger: 'blur'
},
{min: 0, max: 50, message: '长度不超过50个字符', trigger: 'blur' }
],
name: [
{
required: true,
message: '请输入设备名称',
trigger: 'blur'
},
{min: 0, max: 50, message: '长度不超过50个字符', trigger: 'blur' }
],
ip: [
{
required: true,
message: '请输入设备ip',
trigger: 'blur'
},
{min: 0, max: 50, message: '长度不超过50个字符', trigger: 'blur' }
],
districtName: [
{
required: true,
message: '请输入区域名称',
trigger: 'blur'
},
{min: 0, max: 50, message: '长度不超过50个字符', trigger: 'blur' }
],
}, },
url: { url: {
add: "/pm/advertisingScreenSetting/add", add: "/pm/advertisingScreenSetting/add",
......
jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/client/HikvisionBaseClient.java
...@@ -52,8 +52,8 @@ public class HikvisionBaseClient extends HikvisionAbstractClient { ...@@ -52,8 +52,8 @@ public class HikvisionBaseClient extends HikvisionAbstractClient {
if (response.isSuccess) { if (response.isSuccess) {
opUserUuid = response.getResult().getData(); opUserUuid = response.getResult().getData();
} else { } else {
// opUserUuid = "5b2eb534696b11e89c2e438f92627767"; opUserUuid = "5b2eb534696b11e89c2e438f92627767";
throw new JeecgBootException("初始化海康威视SDK异常：无法获取opUserUuid"); // throw new JeecgBootException("初始化海康威视SDK异常：无法获取opUserUuid");
} }
} }
......
jeecg-boot-parent/jeecg-boot-module-property/src/main/java/org/jeecg/pm/entity/PmAccessControlDevice.java
...@@ -79,6 +79,7 @@ public class PmAccessControlDevice implements Serializable { ...@@ -79,6 +79,7 @@ public class PmAccessControlDevice implements Serializable {
* xy值 * xy值
*/ */
@ApiModelProperty(value = "xy值") @ApiModelProperty(value = "xy值")
@Excel(name = "xy值", width = 15)
@TableField(typeHandler = Coordinate.TypeHandler.class) @TableField(typeHandler = Coordinate.TypeHandler.class)
private Coordinate coordinate; private Coordinate coordinate;
/** /**
...@@ -135,7 +136,7 @@ public class PmAccessControlDevice implements Serializable { ...@@ -135,7 +136,7 @@ public class PmAccessControlDevice implements Serializable {
/** /**
* 创建时间 * 创建时间
*/ */
@Excel(name = "修改时间", width = 15, format = "yyyy-MM-dd hh:mm:ss") @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd hh:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
......
jeecg-boot-parent/jeecg-boot-module-property/src/main/java/org/jeecg/pm/entity/PmMonitoringDevice.java
...@@ -65,6 +65,7 @@ public class PmMonitoringDevice implements Serializable { ...@@ -65,6 +65,7 @@ public class PmMonitoringDevice implements Serializable {
* xy值 * xy值
*/ */
@ApiModelProperty(value = "xy值") @ApiModelProperty(value = "xy值")
@Excel(name = "xy值", width = 15)
@TableField(typeHandler = Coordinate.TypeHandler.class) @TableField(typeHandler = Coordinate.TypeHandler.class)
private Coordinate coordinate; private Coordinate coordinate;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment