diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcTimerServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcTimerServiceImpl.java index 0233226..5d58b98 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcTimerServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcTimerServiceImpl.java @@ -269,10 +269,6 @@ public class PsdcTimerServiceImpl implements IPsdcTimerService { job.setJobId(psdcTimer.getJobId().longValue()); job.setJobGroup("psdc"); int i = jobService.deleteJob(job); - if (i > 0) { - return psdcTimerMapper.deleteById(timerId); - } else { - throw new ServiceException("删除定时任务失败"); - } + return psdcTimerMapper.deleteById(timerId); } } \ No newline at end of file diff --git a/psdc-business/src/main/resources/mapper/business/PsdcTimerMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcTimerMapper.xml index 8715af1..5562d67 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcTimerMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcTimerMapper.xml @@ -80,7 +80,7 @@ and pt.control_context = #{controlContext} - + and pt.timer_status = #{timerStatus} diff --git a/psdc-ui/src/api/bigview/bigview.js b/psdc-ui/src/api/bigview/bigview.js index 968f708..44d0c7c 100644 --- a/psdc-ui/src/api/bigview/bigview.js +++ b/psdc-ui/src/api/bigview/bigview.js @@ -2,13 +2,13 @@ import request from '@/utils/request' /** 8个温度传感器接口*/ export function getTemperature(data) { - return request.get('/indexLook/8wd/'+data) + return request.post('/indexLook/8wd?modelTypeName='+data) } /**运行设备工作信息查询接口*/ export function getDevicesInfo() { return request.get('/indexLook/devicesInfo') } /**总电表接口*/ -export function getZdb() { - return request.get('/indexLook/zdb') +export function getZdb(data) { + return request.get('/indexLook/zdb/'+data) } \ No newline at end of file diff --git a/psdc-ui/src/api/control/timer.js b/psdc-ui/src/api/control/timer.js index 2e5dd27..75e69cd 100644 --- a/psdc-ui/src/api/control/timer.js +++ b/psdc-ui/src/api/control/timer.js @@ -12,3 +12,7 @@ export function getAddTimer(data) { export function getDeleteTimer(data) { return request.get('/control/timer/deleteTimer/' + data) } +/** 修改定时任务的状态*/ +export function getUpDateStatus(timerId,status) { + return request.get('/control/timer/updateStatus/' + timerId + '/' + status) +} diff --git a/psdc-ui/src/api/emonitor/api.js b/psdc-ui/src/api/emonitor/api.js index 672ab00..7b18cd3 100644 --- a/psdc-ui/src/api/emonitor/api.js +++ b/psdc-ui/src/api/emonitor/api.js @@ -36,7 +36,7 @@ export function getFrld(data) { } //温度传感器 export function getWdcgq(data) { - return request.get('/monitor/wdcgq/index/sel1/'+data) + return request.post('/monitor/wdcgq/index/sel1?modelTypeName='+data) } //沙盘 export function getSp(data) { @@ -61,4 +61,23 @@ export function postDel(data) { //获取用户设备列表 export function getSb() { return request.get('/monitor/db/index/selMydevices') +} +//设备管理 +export function getYh() { + return request.get('system/device/index/selusers') +} +export function getSbTab(data) { + return request.post('system/device/index/devicesList',data) +} +export function getMx() { + return request.get('system/device/index/selmodels') +} +export function postNew1(data) { + return request.post('system/device/index',data) +} +export function postXg1(data) { + return request.put('system/device/index',data) +} +export function postDel1(data) { + return request.post('system/device/index/del',data) } \ No newline at end of file diff --git a/psdc-ui/src/api/system/userInfo.js b/psdc-ui/src/api/system/userInfo.js new file mode 100644 index 0000000..7c830f7 --- /dev/null +++ b/psdc-ui/src/api/system/userInfo.js @@ -0,0 +1,6 @@ +import request from '@/utils/request' + +/** 获取设备*/ +export function getUpdatePwd(oldPassword,newPassword) { + return request.put(`/system/user/profile/updatePwd?oldPassword=${oldPassword}&newPassword=${newPassword}`) +} \ No newline at end of file diff --git a/psdc-ui/src/assets/images/shapan.png b/psdc-ui/src/assets/images/shapan.png new file mode 100644 index 0000000..85c3e31 Binary files /dev/null and b/psdc-ui/src/assets/images/shapan.png differ diff --git a/psdc-ui/src/assets/styles/energy.scss b/psdc-ui/src/assets/styles/energy.scss index 20377d1..6130a0b 100644 --- a/psdc-ui/src/assets/styles/energy.scss +++ b/psdc-ui/src/assets/styles/energy.scss @@ -75,16 +75,19 @@ .el-overlay .el-overlay-dialog .el-dialog .el-dialog__body .el-form--label-right .el-row .el-col .asterisk-left .el-form-item__content .el-select .select-trigger .el-input .el-input__wrapper .el-input__inner{ - color: #fff !important; + //color: #fff !important; + color: #606266 !important; } .el-overlay .el-overlay-dialog .el-dialog .el-dialog__body .el-form--label-right .el-row .el-col .asterisk-left .el-form-item__content .el-input .el-input__wrapper .el-input__inner{ - color: #fff !important; + color: #606266 !important; } .el-input__wrapper{ - background-color: #1b2553 !important; - border: 1px solid #32467a !important; + //background-color: #1b2553 !important; + //border: 1px solid #32467a !important; + background-color: #fff !important; + border: 1px solid #ddd !important; color: #596a85 !important; box-shadow: none !important; } diff --git a/psdc-ui/src/views/analyse/nhfx/index.vue b/psdc-ui/src/views/analyse/nhfx/index.vue index d6a1a0b..16b0e70 100644 --- a/psdc-ui/src/views/analyse/nhfx/index.vue +++ b/psdc-ui/src/views/analyse/nhfx/index.vue @@ -9,7 +9,7 @@ - + 上一年 下一年 查询 @@ -21,10 +21,10 @@
- - - - + + + +
@@ -37,7 +37,7 @@ - + 查询
@@ -45,8 +45,8 @@ - - + +