diff --git a/api/check.js b/api/check.js index 417f242..719e90d 100644 --- a/api/check.js +++ b/api/check.js @@ -1,13 +1,64 @@ import fetch from '@/common/fetchs.js'; import useNetWork from '@/common/useNetWork.js'; -const visitReason = 'http://111.198.10.15:11406/device/list-page' -const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' -const Login = 'http://111.198.10.15:11406/sys/user/login' -const Alarm = 'http://111.198.10.15:11406/alarm/list' +const visitReason = 'https://smartwell.gd.smartlog.work/device/list-page' +const baseConfig = 'https://smartwell.gd.smartlog.work/sys/config/baseConfig' +const Login = 'https://smartwell.gd.smartlog.work/sys/user/login' +const Alarm = 'https://smartwell.gd.smartlog.work/alarm/list' +const JobInfo = 'https://smartwell.gd.smartlog.work/job/info' +const DeviceDetail = 'https://smartwell.gd.smartlog.work/overview/deviceDetail' +const WellInfo = 'https://smartwell.gd.smartlog.work/well/info' /** + * 获取井口详情 + * @param {*} + */ +export function getWellInfo(params) { + useNetWork(); + return fetch.get(WellInfo,params).then(res => res); +} + +/** + * 获取设备详情 + * @param {*} + */ +export function getDeviceDetail(params) { + useNetWork(); + return fetch.get(DeviceDetail,params).then(res => res); +} + +/** + * 批量消警 + * @param {*} + */ +export function getBatchCancel(data) { + useNetWork(); + const BatchCancel = `https://smartwell.gd.smartlog.work/alarm/batchCancel?keywords=${data.keywords}&alarmType=${data.alarmType} + &alarmContent=${data.alarmContent}&beginTime=${data.beginTime}&endTime=${data.endTime}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(BatchCancel).then(res => res); +} + +/** + * 获取宵禁时间 + * @param {*} + */ +export function getJobInfo(params) { + useNetWork(); + return fetch.get(JobInfo,params).then(res => res); +} + +/** + * 取消报警 + * @param {*} + */ +export function getCancelAlarm(data) { + useNetWork(); + const CancelAlarm = `https://smartwell.gd.smartlog.work/alarm/cancelAlarm?id=${data.id}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(CancelAlarm).then(res => res); +} + +/** * 获取到报警列表 * @param {*} */ diff --git a/api/check.js b/api/check.js index 417f242..719e90d 100644 --- a/api/check.js +++ b/api/check.js @@ -1,13 +1,64 @@ import fetch from '@/common/fetchs.js'; import useNetWork from '@/common/useNetWork.js'; -const visitReason = 'http://111.198.10.15:11406/device/list-page' -const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' -const Login = 'http://111.198.10.15:11406/sys/user/login' -const Alarm = 'http://111.198.10.15:11406/alarm/list' +const visitReason = 'https://smartwell.gd.smartlog.work/device/list-page' +const baseConfig = 'https://smartwell.gd.smartlog.work/sys/config/baseConfig' +const Login = 'https://smartwell.gd.smartlog.work/sys/user/login' +const Alarm = 'https://smartwell.gd.smartlog.work/alarm/list' +const JobInfo = 'https://smartwell.gd.smartlog.work/job/info' +const DeviceDetail = 'https://smartwell.gd.smartlog.work/overview/deviceDetail' +const WellInfo = 'https://smartwell.gd.smartlog.work/well/info' /** + * 获取井口详情 + * @param {*} + */ +export function getWellInfo(params) { + useNetWork(); + return fetch.get(WellInfo,params).then(res => res); +} + +/** + * 获取设备详情 + * @param {*} + */ +export function getDeviceDetail(params) { + useNetWork(); + return fetch.get(DeviceDetail,params).then(res => res); +} + +/** + * 批量消警 + * @param {*} + */ +export function getBatchCancel(data) { + useNetWork(); + const BatchCancel = `https://smartwell.gd.smartlog.work/alarm/batchCancel?keywords=${data.keywords}&alarmType=${data.alarmType} + &alarmContent=${data.alarmContent}&beginTime=${data.beginTime}&endTime=${data.endTime}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(BatchCancel).then(res => res); +} + +/** + * 获取宵禁时间 + * @param {*} + */ +export function getJobInfo(params) { + useNetWork(); + return fetch.get(JobInfo,params).then(res => res); +} + +/** + * 取消报警 + * @param {*} + */ +export function getCancelAlarm(data) { + useNetWork(); + const CancelAlarm = `https://smartwell.gd.smartlog.work/alarm/cancelAlarm?id=${data.id}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(CancelAlarm).then(res => res); +} + +/** * 获取到报警列表 * @param {*} */ diff --git a/pages/check/check.vue b/pages/check/check.vue index 07237ef..1fc2909 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -8,12 +8,12 @@ v-model="params.keywords" @change="inputChage" > - + - + {{item.deviceTypeName}} ({{item.devcode}}) @@ -27,8 +27,8 @@ - - + + @@ -87,6 +87,9 @@ this.getList() }, navigateCheck(index,type){ // 跳转 + if( typeof(type) === 'object' ) { + uni.setStorageSync('checkrow',type) + } if(index === '1') { wx.navigateTo({ url: '/pages/reportList/reportList', diff --git a/api/check.js b/api/check.js index 417f242..719e90d 100644 --- a/api/check.js +++ b/api/check.js @@ -1,13 +1,64 @@ import fetch from '@/common/fetchs.js'; import useNetWork from '@/common/useNetWork.js'; -const visitReason = 'http://111.198.10.15:11406/device/list-page' -const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' -const Login = 'http://111.198.10.15:11406/sys/user/login' -const Alarm = 'http://111.198.10.15:11406/alarm/list' +const visitReason = 'https://smartwell.gd.smartlog.work/device/list-page' +const baseConfig = 'https://smartwell.gd.smartlog.work/sys/config/baseConfig' +const Login = 'https://smartwell.gd.smartlog.work/sys/user/login' +const Alarm = 'https://smartwell.gd.smartlog.work/alarm/list' +const JobInfo = 'https://smartwell.gd.smartlog.work/job/info' +const DeviceDetail = 'https://smartwell.gd.smartlog.work/overview/deviceDetail' +const WellInfo = 'https://smartwell.gd.smartlog.work/well/info' /** + * 获取井口详情 + * @param {*} + */ +export function getWellInfo(params) { + useNetWork(); + return fetch.get(WellInfo,params).then(res => res); +} + +/** + * 获取设备详情 + * @param {*} + */ +export function getDeviceDetail(params) { + useNetWork(); + return fetch.get(DeviceDetail,params).then(res => res); +} + +/** + * 批量消警 + * @param {*} + */ +export function getBatchCancel(data) { + useNetWork(); + const BatchCancel = `https://smartwell.gd.smartlog.work/alarm/batchCancel?keywords=${data.keywords}&alarmType=${data.alarmType} + &alarmContent=${data.alarmContent}&beginTime=${data.beginTime}&endTime=${data.endTime}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(BatchCancel).then(res => res); +} + +/** + * 获取宵禁时间 + * @param {*} + */ +export function getJobInfo(params) { + useNetWork(); + return fetch.get(JobInfo,params).then(res => res); +} + +/** + * 取消报警 + * @param {*} + */ +export function getCancelAlarm(data) { + useNetWork(); + const CancelAlarm = `https://smartwell.gd.smartlog.work/alarm/cancelAlarm?id=${data.id}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(CancelAlarm).then(res => res); +} + +/** * 获取到报警列表 * @param {*} */ diff --git a/pages/check/check.vue b/pages/check/check.vue index 07237ef..1fc2909 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -8,12 +8,12 @@ v-model="params.keywords" @change="inputChage" > - + - + {{item.deviceTypeName}} ({{item.devcode}}) @@ -27,8 +27,8 @@ - - + + @@ -87,6 +87,9 @@ this.getList() }, navigateCheck(index,type){ // 跳转 + if( typeof(type) === 'object' ) { + uni.setStorageSync('checkrow',type) + } if(index === '1') { wx.navigateTo({ url: '/pages/reportList/reportList', diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index db45e8d..242bb23 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,7 +6,7 @@ }} - + {{item.name}} @@ -29,7 +29,7 @@ - + {{item.name}} @@ -49,7 +49,7 @@ - + {{item.name}} @@ -151,8 +151,9 @@ type: '' // 控制表格展示 } }, - onLoad(option){ + onLoad(option){ this.type = option.type + }, methods: { // 确认导出 diff --git a/api/check.js b/api/check.js index 417f242..719e90d 100644 --- a/api/check.js +++ b/api/check.js @@ -1,13 +1,64 @@ import fetch from '@/common/fetchs.js'; import useNetWork from '@/common/useNetWork.js'; -const visitReason = 'http://111.198.10.15:11406/device/list-page' -const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' -const Login = 'http://111.198.10.15:11406/sys/user/login' -const Alarm = 'http://111.198.10.15:11406/alarm/list' +const visitReason = 'https://smartwell.gd.smartlog.work/device/list-page' +const baseConfig = 'https://smartwell.gd.smartlog.work/sys/config/baseConfig' +const Login = 'https://smartwell.gd.smartlog.work/sys/user/login' +const Alarm = 'https://smartwell.gd.smartlog.work/alarm/list' +const JobInfo = 'https://smartwell.gd.smartlog.work/job/info' +const DeviceDetail = 'https://smartwell.gd.smartlog.work/overview/deviceDetail' +const WellInfo = 'https://smartwell.gd.smartlog.work/well/info' /** + * 获取井口详情 + * @param {*} + */ +export function getWellInfo(params) { + useNetWork(); + return fetch.get(WellInfo,params).then(res => res); +} + +/** + * 获取设备详情 + * @param {*} + */ +export function getDeviceDetail(params) { + useNetWork(); + return fetch.get(DeviceDetail,params).then(res => res); +} + +/** + * 批量消警 + * @param {*} + */ +export function getBatchCancel(data) { + useNetWork(); + const BatchCancel = `https://smartwell.gd.smartlog.work/alarm/batchCancel?keywords=${data.keywords}&alarmType=${data.alarmType} + &alarmContent=${data.alarmContent}&beginTime=${data.beginTime}&endTime=${data.endTime}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(BatchCancel).then(res => res); +} + +/** + * 获取宵禁时间 + * @param {*} + */ +export function getJobInfo(params) { + useNetWork(); + return fetch.get(JobInfo,params).then(res => res); +} + +/** + * 取消报警 + * @param {*} + */ +export function getCancelAlarm(data) { + useNetWork(); + const CancelAlarm = `https://smartwell.gd.smartlog.work/alarm/cancelAlarm?id=${data.id}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(CancelAlarm).then(res => res); +} + +/** * 获取到报警列表 * @param {*} */ diff --git a/pages/check/check.vue b/pages/check/check.vue index 07237ef..1fc2909 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -8,12 +8,12 @@ v-model="params.keywords" @change="inputChage" > - + - + {{item.deviceTypeName}} ({{item.devcode}}) @@ -27,8 +27,8 @@ - - + + @@ -87,6 +87,9 @@ this.getList() }, navigateCheck(index,type){ // 跳转 + if( typeof(type) === 'object' ) { + uni.setStorageSync('checkrow',type) + } if(index === '1') { wx.navigateTo({ url: '/pages/reportList/reportList', diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index db45e8d..242bb23 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,7 +6,7 @@ }} - + {{item.name}} @@ -29,7 +29,7 @@ - + {{item.name}} @@ -49,7 +49,7 @@ - + {{item.name}} @@ -151,8 +151,9 @@ type: '' // 控制表格展示 } }, - onLoad(option){ + onLoad(option){ this.type = option.type + }, methods: { // 确认导出 diff --git a/pages/reportInfo/reportInfo.vue b/pages/reportInfo/reportInfo.vue index f2447ed..bd9ea58 100644 --- a/pages/reportInfo/reportInfo.vue +++ b/pages/reportInfo/reportInfo.vue @@ -4,19 +4,19 @@ 设备编号 - 312022040441 + {{info.devcode}} 设备类型 - 燃气智能监测终端 + {{info.alarmContentName}} 设备位置 - 职工食堂 + {{info.position}} 井编号 - 1 + {{info.wellCode}} 井类型 @@ -24,49 +24,49 @@ 井名称 - 其他 + {{timeInfo.wellName}} 告警原因 - 浓度超限 + {{info.alarmTypeName}} 告警数值 - 90 + {{info.alarmValue}} 告警等级 - 一级告警 + {{info.alarmLevel}} 告警时间 - 2022-10-29 12:25:00 + {{info.alarmTime}} 告警状态 - 历史告警 + {{info.statusName}} - + 告警取消原因 - 已处理 + {{info.jobStatusName}} - + 备注 - 无 + {{timeInfo.handleMessage}} - + 处置人 - 张三 + {{timeInfo.handleJobPerson}} - + 处置时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 消警时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 取消告警 @@ -129,51 +129,37 @@ diff --git a/api/check.js b/api/check.js index 417f242..719e90d 100644 --- a/api/check.js +++ b/api/check.js @@ -1,13 +1,64 @@ import fetch from '@/common/fetchs.js'; import useNetWork from '@/common/useNetWork.js'; -const visitReason = 'http://111.198.10.15:11406/device/list-page' -const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' -const Login = 'http://111.198.10.15:11406/sys/user/login' -const Alarm = 'http://111.198.10.15:11406/alarm/list' +const visitReason = 'https://smartwell.gd.smartlog.work/device/list-page' +const baseConfig = 'https://smartwell.gd.smartlog.work/sys/config/baseConfig' +const Login = 'https://smartwell.gd.smartlog.work/sys/user/login' +const Alarm = 'https://smartwell.gd.smartlog.work/alarm/list' +const JobInfo = 'https://smartwell.gd.smartlog.work/job/info' +const DeviceDetail = 'https://smartwell.gd.smartlog.work/overview/deviceDetail' +const WellInfo = 'https://smartwell.gd.smartlog.work/well/info' /** + * 获取井口详情 + * @param {*} + */ +export function getWellInfo(params) { + useNetWork(); + return fetch.get(WellInfo,params).then(res => res); +} + +/** + * 获取设备详情 + * @param {*} + */ +export function getDeviceDetail(params) { + useNetWork(); + return fetch.get(DeviceDetail,params).then(res => res); +} + +/** + * 批量消警 + * @param {*} + */ +export function getBatchCancel(data) { + useNetWork(); + const BatchCancel = `https://smartwell.gd.smartlog.work/alarm/batchCancel?keywords=${data.keywords}&alarmType=${data.alarmType} + &alarmContent=${data.alarmContent}&beginTime=${data.beginTime}&endTime=${data.endTime}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(BatchCancel).then(res => res); +} + +/** + * 获取宵禁时间 + * @param {*} + */ +export function getJobInfo(params) { + useNetWork(); + return fetch.get(JobInfo,params).then(res => res); +} + +/** + * 取消报警 + * @param {*} + */ +export function getCancelAlarm(data) { + useNetWork(); + const CancelAlarm = `https://smartwell.gd.smartlog.work/alarm/cancelAlarm?id=${data.id}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(CancelAlarm).then(res => res); +} + +/** * 获取到报警列表 * @param {*} */ diff --git a/pages/check/check.vue b/pages/check/check.vue index 07237ef..1fc2909 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -8,12 +8,12 @@ v-model="params.keywords" @change="inputChage" > - + - + {{item.deviceTypeName}} ({{item.devcode}}) @@ -27,8 +27,8 @@ - - + + @@ -87,6 +87,9 @@ this.getList() }, navigateCheck(index,type){ // 跳转 + if( typeof(type) === 'object' ) { + uni.setStorageSync('checkrow',type) + } if(index === '1') { wx.navigateTo({ url: '/pages/reportList/reportList', diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index db45e8d..242bb23 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,7 +6,7 @@ }} - + {{item.name}} @@ -29,7 +29,7 @@ - + {{item.name}} @@ -49,7 +49,7 @@ - + {{item.name}} @@ -151,8 +151,9 @@ type: '' // 控制表格展示 } }, - onLoad(option){ + onLoad(option){ this.type = option.type + }, methods: { // 确认导出 diff --git a/pages/reportInfo/reportInfo.vue b/pages/reportInfo/reportInfo.vue index f2447ed..bd9ea58 100644 --- a/pages/reportInfo/reportInfo.vue +++ b/pages/reportInfo/reportInfo.vue @@ -4,19 +4,19 @@ 设备编号 - 312022040441 + {{info.devcode}} 设备类型 - 燃气智能监测终端 + {{info.alarmContentName}} 设备位置 - 职工食堂 + {{info.position}} 井编号 - 1 + {{info.wellCode}} 井类型 @@ -24,49 +24,49 @@ 井名称 - 其他 + {{timeInfo.wellName}} 告警原因 - 浓度超限 + {{info.alarmTypeName}} 告警数值 - 90 + {{info.alarmValue}} 告警等级 - 一级告警 + {{info.alarmLevel}} 告警时间 - 2022-10-29 12:25:00 + {{info.alarmTime}} 告警状态 - 历史告警 + {{info.statusName}} - + 告警取消原因 - 已处理 + {{info.jobStatusName}} - + 备注 - 无 + {{timeInfo.handleMessage}} - + 处置人 - 张三 + {{timeInfo.handleJobPerson}} - + 处置时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 消警时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 取消告警 @@ -129,51 +129,37 @@ diff --git a/static/checkIcon/gas-terminal.jpg b/static/checkIcon/gas-terminal.jpg new file mode 100644 index 0000000..00eb20c --- /dev/null +++ b/static/checkIcon/gas-terminal.jpg Binary files differ diff --git a/api/check.js b/api/check.js index 417f242..719e90d 100644 --- a/api/check.js +++ b/api/check.js @@ -1,13 +1,64 @@ import fetch from '@/common/fetchs.js'; import useNetWork from '@/common/useNetWork.js'; -const visitReason = 'http://111.198.10.15:11406/device/list-page' -const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' -const Login = 'http://111.198.10.15:11406/sys/user/login' -const Alarm = 'http://111.198.10.15:11406/alarm/list' +const visitReason = 'https://smartwell.gd.smartlog.work/device/list-page' +const baseConfig = 'https://smartwell.gd.smartlog.work/sys/config/baseConfig' +const Login = 'https://smartwell.gd.smartlog.work/sys/user/login' +const Alarm = 'https://smartwell.gd.smartlog.work/alarm/list' +const JobInfo = 'https://smartwell.gd.smartlog.work/job/info' +const DeviceDetail = 'https://smartwell.gd.smartlog.work/overview/deviceDetail' +const WellInfo = 'https://smartwell.gd.smartlog.work/well/info' /** + * 获取井口详情 + * @param {*} + */ +export function getWellInfo(params) { + useNetWork(); + return fetch.get(WellInfo,params).then(res => res); +} + +/** + * 获取设备详情 + * @param {*} + */ +export function getDeviceDetail(params) { + useNetWork(); + return fetch.get(DeviceDetail,params).then(res => res); +} + +/** + * 批量消警 + * @param {*} + */ +export function getBatchCancel(data) { + useNetWork(); + const BatchCancel = `https://smartwell.gd.smartlog.work/alarm/batchCancel?keywords=${data.keywords}&alarmType=${data.alarmType} + &alarmContent=${data.alarmContent}&beginTime=${data.beginTime}&endTime=${data.endTime}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(BatchCancel).then(res => res); +} + +/** + * 获取宵禁时间 + * @param {*} + */ +export function getJobInfo(params) { + useNetWork(); + return fetch.get(JobInfo,params).then(res => res); +} + +/** + * 取消报警 + * @param {*} + */ +export function getCancelAlarm(data) { + useNetWork(); + const CancelAlarm = `https://smartwell.gd.smartlog.work/alarm/cancelAlarm?id=${data.id}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(CancelAlarm).then(res => res); +} + +/** * 获取到报警列表 * @param {*} */ diff --git a/pages/check/check.vue b/pages/check/check.vue index 07237ef..1fc2909 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -8,12 +8,12 @@ v-model="params.keywords" @change="inputChage" > - + - + {{item.deviceTypeName}} ({{item.devcode}}) @@ -27,8 +27,8 @@ - - + + @@ -87,6 +87,9 @@ this.getList() }, navigateCheck(index,type){ // 跳转 + if( typeof(type) === 'object' ) { + uni.setStorageSync('checkrow',type) + } if(index === '1') { wx.navigateTo({ url: '/pages/reportList/reportList', diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index db45e8d..242bb23 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,7 +6,7 @@ }} - + {{item.name}} @@ -29,7 +29,7 @@ - + {{item.name}} @@ -49,7 +49,7 @@ - + {{item.name}} @@ -151,8 +151,9 @@ type: '' // 控制表格展示 } }, - onLoad(option){ + onLoad(option){ this.type = option.type + }, methods: { // 确认导出 diff --git a/pages/reportInfo/reportInfo.vue b/pages/reportInfo/reportInfo.vue index f2447ed..bd9ea58 100644 --- a/pages/reportInfo/reportInfo.vue +++ b/pages/reportInfo/reportInfo.vue @@ -4,19 +4,19 @@ 设备编号 - 312022040441 + {{info.devcode}} 设备类型 - 燃气智能监测终端 + {{info.alarmContentName}} 设备位置 - 职工食堂 + {{info.position}} 井编号 - 1 + {{info.wellCode}} 井类型 @@ -24,49 +24,49 @@ 井名称 - 其他 + {{timeInfo.wellName}} 告警原因 - 浓度超限 + {{info.alarmTypeName}} 告警数值 - 90 + {{info.alarmValue}} 告警等级 - 一级告警 + {{info.alarmLevel}} 告警时间 - 2022-10-29 12:25:00 + {{info.alarmTime}} 告警状态 - 历史告警 + {{info.statusName}} - + 告警取消原因 - 已处理 + {{info.jobStatusName}} - + 备注 - 无 + {{timeInfo.handleMessage}} - + 处置人 - 张三 + {{timeInfo.handleJobPerson}} - + 处置时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 消警时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 取消告警 @@ -129,51 +129,37 @@ diff --git a/static/checkIcon/gas-terminal.jpg b/static/checkIcon/gas-terminal.jpg new file mode 100644 index 0000000..00eb20c --- /dev/null +++ b/static/checkIcon/gas-terminal.jpg Binary files differ diff --git a/static/checkIcon/liquid.jpg b/static/checkIcon/liquid.jpg new file mode 100644 index 0000000..2135c54 --- /dev/null +++ b/static/checkIcon/liquid.jpg Binary files differ diff --git a/api/check.js b/api/check.js index 417f242..719e90d 100644 --- a/api/check.js +++ b/api/check.js @@ -1,13 +1,64 @@ import fetch from '@/common/fetchs.js'; import useNetWork from '@/common/useNetWork.js'; -const visitReason = 'http://111.198.10.15:11406/device/list-page' -const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' -const Login = 'http://111.198.10.15:11406/sys/user/login' -const Alarm = 'http://111.198.10.15:11406/alarm/list' +const visitReason = 'https://smartwell.gd.smartlog.work/device/list-page' +const baseConfig = 'https://smartwell.gd.smartlog.work/sys/config/baseConfig' +const Login = 'https://smartwell.gd.smartlog.work/sys/user/login' +const Alarm = 'https://smartwell.gd.smartlog.work/alarm/list' +const JobInfo = 'https://smartwell.gd.smartlog.work/job/info' +const DeviceDetail = 'https://smartwell.gd.smartlog.work/overview/deviceDetail' +const WellInfo = 'https://smartwell.gd.smartlog.work/well/info' /** + * 获取井口详情 + * @param {*} + */ +export function getWellInfo(params) { + useNetWork(); + return fetch.get(WellInfo,params).then(res => res); +} + +/** + * 获取设备详情 + * @param {*} + */ +export function getDeviceDetail(params) { + useNetWork(); + return fetch.get(DeviceDetail,params).then(res => res); +} + +/** + * 批量消警 + * @param {*} + */ +export function getBatchCancel(data) { + useNetWork(); + const BatchCancel = `https://smartwell.gd.smartlog.work/alarm/batchCancel?keywords=${data.keywords}&alarmType=${data.alarmType} + &alarmContent=${data.alarmContent}&beginTime=${data.beginTime}&endTime=${data.endTime}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(BatchCancel).then(res => res); +} + +/** + * 获取宵禁时间 + * @param {*} + */ +export function getJobInfo(params) { + useNetWork(); + return fetch.get(JobInfo,params).then(res => res); +} + +/** + * 取消报警 + * @param {*} + */ +export function getCancelAlarm(data) { + useNetWork(); + const CancelAlarm = `https://smartwell.gd.smartlog.work/alarm/cancelAlarm?id=${data.id}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(CancelAlarm).then(res => res); +} + +/** * 获取到报警列表 * @param {*} */ diff --git a/pages/check/check.vue b/pages/check/check.vue index 07237ef..1fc2909 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -8,12 +8,12 @@ v-model="params.keywords" @change="inputChage" > - + - + {{item.deviceTypeName}} ({{item.devcode}}) @@ -27,8 +27,8 @@ - - + + @@ -87,6 +87,9 @@ this.getList() }, navigateCheck(index,type){ // 跳转 + if( typeof(type) === 'object' ) { + uni.setStorageSync('checkrow',type) + } if(index === '1') { wx.navigateTo({ url: '/pages/reportList/reportList', diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index db45e8d..242bb23 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,7 +6,7 @@ }} - + {{item.name}} @@ -29,7 +29,7 @@ - + {{item.name}} @@ -49,7 +49,7 @@ - + {{item.name}} @@ -151,8 +151,9 @@ type: '' // 控制表格展示 } }, - onLoad(option){ + onLoad(option){ this.type = option.type + }, methods: { // 确认导出 diff --git a/pages/reportInfo/reportInfo.vue b/pages/reportInfo/reportInfo.vue index f2447ed..bd9ea58 100644 --- a/pages/reportInfo/reportInfo.vue +++ b/pages/reportInfo/reportInfo.vue @@ -4,19 +4,19 @@ 设备编号 - 312022040441 + {{info.devcode}} 设备类型 - 燃气智能监测终端 + {{info.alarmContentName}} 设备位置 - 职工食堂 + {{info.position}} 井编号 - 1 + {{info.wellCode}} 井类型 @@ -24,49 +24,49 @@ 井名称 - 其他 + {{timeInfo.wellName}} 告警原因 - 浓度超限 + {{info.alarmTypeName}} 告警数值 - 90 + {{info.alarmValue}} 告警等级 - 一级告警 + {{info.alarmLevel}} 告警时间 - 2022-10-29 12:25:00 + {{info.alarmTime}} 告警状态 - 历史告警 + {{info.statusName}} - + 告警取消原因 - 已处理 + {{info.jobStatusName}} - + 备注 - 无 + {{timeInfo.handleMessage}} - + 处置人 - 张三 + {{timeInfo.handleJobPerson}} - + 处置时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 消警时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 取消告警 @@ -129,51 +129,37 @@ diff --git a/static/checkIcon/gas-terminal.jpg b/static/checkIcon/gas-terminal.jpg new file mode 100644 index 0000000..00eb20c --- /dev/null +++ b/static/checkIcon/gas-terminal.jpg Binary files differ diff --git a/static/checkIcon/liquid.jpg b/static/checkIcon/liquid.jpg new file mode 100644 index 0000000..2135c54 --- /dev/null +++ b/static/checkIcon/liquid.jpg Binary files differ diff --git a/static/checkIcon/manhole.jpg b/static/checkIcon/manhole.jpg new file mode 100644 index 0000000..bd7fc76 --- /dev/null +++ b/static/checkIcon/manhole.jpg Binary files differ diff --git a/api/check.js b/api/check.js index 417f242..719e90d 100644 --- a/api/check.js +++ b/api/check.js @@ -1,13 +1,64 @@ import fetch from '@/common/fetchs.js'; import useNetWork from '@/common/useNetWork.js'; -const visitReason = 'http://111.198.10.15:11406/device/list-page' -const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' -const Login = 'http://111.198.10.15:11406/sys/user/login' -const Alarm = 'http://111.198.10.15:11406/alarm/list' +const visitReason = 'https://smartwell.gd.smartlog.work/device/list-page' +const baseConfig = 'https://smartwell.gd.smartlog.work/sys/config/baseConfig' +const Login = 'https://smartwell.gd.smartlog.work/sys/user/login' +const Alarm = 'https://smartwell.gd.smartlog.work/alarm/list' +const JobInfo = 'https://smartwell.gd.smartlog.work/job/info' +const DeviceDetail = 'https://smartwell.gd.smartlog.work/overview/deviceDetail' +const WellInfo = 'https://smartwell.gd.smartlog.work/well/info' /** + * 获取井口详情 + * @param {*} + */ +export function getWellInfo(params) { + useNetWork(); + return fetch.get(WellInfo,params).then(res => res); +} + +/** + * 获取设备详情 + * @param {*} + */ +export function getDeviceDetail(params) { + useNetWork(); + return fetch.get(DeviceDetail,params).then(res => res); +} + +/** + * 批量消警 + * @param {*} + */ +export function getBatchCancel(data) { + useNetWork(); + const BatchCancel = `https://smartwell.gd.smartlog.work/alarm/batchCancel?keywords=${data.keywords}&alarmType=${data.alarmType} + &alarmContent=${data.alarmContent}&beginTime=${data.beginTime}&endTime=${data.endTime}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(BatchCancel).then(res => res); +} + +/** + * 获取宵禁时间 + * @param {*} + */ +export function getJobInfo(params) { + useNetWork(); + return fetch.get(JobInfo,params).then(res => res); +} + +/** + * 取消报警 + * @param {*} + */ +export function getCancelAlarm(data) { + useNetWork(); + const CancelAlarm = `https://smartwell.gd.smartlog.work/alarm/cancelAlarm?id=${data.id}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(CancelAlarm).then(res => res); +} + +/** * 获取到报警列表 * @param {*} */ diff --git a/pages/check/check.vue b/pages/check/check.vue index 07237ef..1fc2909 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -8,12 +8,12 @@ v-model="params.keywords" @change="inputChage" > - + - + {{item.deviceTypeName}} ({{item.devcode}}) @@ -27,8 +27,8 @@ - - + + @@ -87,6 +87,9 @@ this.getList() }, navigateCheck(index,type){ // 跳转 + if( typeof(type) === 'object' ) { + uni.setStorageSync('checkrow',type) + } if(index === '1') { wx.navigateTo({ url: '/pages/reportList/reportList', diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index db45e8d..242bb23 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,7 +6,7 @@ }} - + {{item.name}} @@ -29,7 +29,7 @@ - + {{item.name}} @@ -49,7 +49,7 @@ - + {{item.name}} @@ -151,8 +151,9 @@ type: '' // 控制表格展示 } }, - onLoad(option){ + onLoad(option){ this.type = option.type + }, methods: { // 确认导出 diff --git a/pages/reportInfo/reportInfo.vue b/pages/reportInfo/reportInfo.vue index f2447ed..bd9ea58 100644 --- a/pages/reportInfo/reportInfo.vue +++ b/pages/reportInfo/reportInfo.vue @@ -4,19 +4,19 @@ 设备编号 - 312022040441 + {{info.devcode}} 设备类型 - 燃气智能监测终端 + {{info.alarmContentName}} 设备位置 - 职工食堂 + {{info.position}} 井编号 - 1 + {{info.wellCode}} 井类型 @@ -24,49 +24,49 @@ 井名称 - 其他 + {{timeInfo.wellName}} 告警原因 - 浓度超限 + {{info.alarmTypeName}} 告警数值 - 90 + {{info.alarmValue}} 告警等级 - 一级告警 + {{info.alarmLevel}} 告警时间 - 2022-10-29 12:25:00 + {{info.alarmTime}} 告警状态 - 历史告警 + {{info.statusName}} - + 告警取消原因 - 已处理 + {{info.jobStatusName}} - + 备注 - 无 + {{timeInfo.handleMessage}} - + 处置人 - 张三 + {{timeInfo.handleJobPerson}} - + 处置时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 消警时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 取消告警 @@ -129,51 +129,37 @@ diff --git a/static/checkIcon/gas-terminal.jpg b/static/checkIcon/gas-terminal.jpg new file mode 100644 index 0000000..00eb20c --- /dev/null +++ b/static/checkIcon/gas-terminal.jpg Binary files differ diff --git a/static/checkIcon/liquid.jpg b/static/checkIcon/liquid.jpg new file mode 100644 index 0000000..2135c54 --- /dev/null +++ b/static/checkIcon/liquid.jpg Binary files differ diff --git a/static/checkIcon/manhole.jpg b/static/checkIcon/manhole.jpg new file mode 100644 index 0000000..bd7fc76 --- /dev/null +++ b/static/checkIcon/manhole.jpg Binary files differ diff --git a/uni_modules/uview-ui/components/u-album/props.js b/uni_modules/uview-ui/components/u-album/props.js deleted file mode 100644 index 75cdb37..0000000 --- a/uni_modules/uview-ui/components/u-album/props.js +++ /dev/null @@ -1,59 +0,0 @@ -export default { - props: { - // 图片地址，Array|Array形式 - urls: { - type: Array, - default: uni.$u.props.album.urls - }, - // 指定从数组的对象元素中读取哪个属性作为图片地址 - keyName: { - type: String, - default: uni.$u.props.album.keyName - }, - // 单图时，图片长边的长度 - singleSize: { - type: [String, Number], - default: uni.$u.props.album.singleSize - }, - // 多图时，图片边长 - multipleSize: { - type: [String, Number], - default: uni.$u.props.album.multipleSize - }, - // 多图时，图片水平和垂直之间的间隔 - space: { - type: [String, Number], - default: uni.$u.props.album.space - }, - // 单图时，图片缩放裁剪的模式 - singleMode: { - type: String, - default: uni.$u.props.album.singleMode - }, - // 多图时，图片缩放裁剪的模式 - multipleMode: { - type: String, - default: uni.$u.props.album.multipleMode - }, - // 最多展示的图片数量，超出时最后一个位置将会显示剩余图片数量 - maxCount: { - type: [String, Number], - default: uni.$u.props.album.maxCount - }, - // 是否可以预览图片 - previewFullImage: { - type: Boolean, - default: uni.$u.props.album.previewFullImage - }, - // 每行展示图片数量，如设置，singleSize和multipleSize将会无效 - rowCount: { - type: [String, Number], - default: uni.$u.props.album.rowCount - }, - // 超出maxCount时是否显示查看更多的提示 - showMore: { - type: Boolean, - default: uni.$u.props.album.showMore - } - } -} diff --git a/api/check.js b/api/check.js index 417f242..719e90d 100644 --- a/api/check.js +++ b/api/check.js @@ -1,13 +1,64 @@ import fetch from '@/common/fetchs.js'; import useNetWork from '@/common/useNetWork.js'; -const visitReason = 'http://111.198.10.15:11406/device/list-page' -const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' -const Login = 'http://111.198.10.15:11406/sys/user/login' -const Alarm = 'http://111.198.10.15:11406/alarm/list' +const visitReason = 'https://smartwell.gd.smartlog.work/device/list-page' +const baseConfig = 'https://smartwell.gd.smartlog.work/sys/config/baseConfig' +const Login = 'https://smartwell.gd.smartlog.work/sys/user/login' +const Alarm = 'https://smartwell.gd.smartlog.work/alarm/list' +const JobInfo = 'https://smartwell.gd.smartlog.work/job/info' +const DeviceDetail = 'https://smartwell.gd.smartlog.work/overview/deviceDetail' +const WellInfo = 'https://smartwell.gd.smartlog.work/well/info' /** + * 获取井口详情 + * @param {*} + */ +export function getWellInfo(params) { + useNetWork(); + return fetch.get(WellInfo,params).then(res => res); +} + +/** + * 获取设备详情 + * @param {*} + */ +export function getDeviceDetail(params) { + useNetWork(); + return fetch.get(DeviceDetail,params).then(res => res); +} + +/** + * 批量消警 + * @param {*} + */ +export function getBatchCancel(data) { + useNetWork(); + const BatchCancel = `https://smartwell.gd.smartlog.work/alarm/batchCancel?keywords=${data.keywords}&alarmType=${data.alarmType} + &alarmContent=${data.alarmContent}&beginTime=${data.beginTime}&endTime=${data.endTime}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(BatchCancel).then(res => res); +} + +/** + * 获取宵禁时间 + * @param {*} + */ +export function getJobInfo(params) { + useNetWork(); + return fetch.get(JobInfo,params).then(res => res); +} + +/** + * 取消报警 + * @param {*} + */ +export function getCancelAlarm(data) { + useNetWork(); + const CancelAlarm = `https://smartwell.gd.smartlog.work/alarm/cancelAlarm?id=${data.id}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(CancelAlarm).then(res => res); +} + +/** * 获取到报警列表 * @param {*} */ diff --git a/pages/check/check.vue b/pages/check/check.vue index 07237ef..1fc2909 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -8,12 +8,12 @@ v-model="params.keywords" @change="inputChage" > - + - + {{item.deviceTypeName}} ({{item.devcode}}) @@ -27,8 +27,8 @@ - - + + @@ -87,6 +87,9 @@ this.getList() }, navigateCheck(index,type){ // 跳转 + if( typeof(type) === 'object' ) { + uni.setStorageSync('checkrow',type) + } if(index === '1') { wx.navigateTo({ url: '/pages/reportList/reportList', diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index db45e8d..242bb23 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,7 +6,7 @@ }} - + {{item.name}} @@ -29,7 +29,7 @@ - + {{item.name}} @@ -49,7 +49,7 @@ - + {{item.name}} @@ -151,8 +151,9 @@ type: '' // 控制表格展示 } }, - onLoad(option){ + onLoad(option){ this.type = option.type + }, methods: { // 确认导出 diff --git a/pages/reportInfo/reportInfo.vue b/pages/reportInfo/reportInfo.vue index f2447ed..bd9ea58 100644 --- a/pages/reportInfo/reportInfo.vue +++ b/pages/reportInfo/reportInfo.vue @@ -4,19 +4,19 @@ 设备编号 - 312022040441 + {{info.devcode}} 设备类型 - 燃气智能监测终端 + {{info.alarmContentName}} 设备位置 - 职工食堂 + {{info.position}} 井编号 - 1 + {{info.wellCode}} 井类型 @@ -24,49 +24,49 @@ 井名称 - 其他 + {{timeInfo.wellName}} 告警原因 - 浓度超限 + {{info.alarmTypeName}} 告警数值 - 90 + {{info.alarmValue}} 告警等级 - 一级告警 + {{info.alarmLevel}} 告警时间 - 2022-10-29 12:25:00 + {{info.alarmTime}} 告警状态 - 历史告警 + {{info.statusName}} - + 告警取消原因 - 已处理 + {{info.jobStatusName}} - + 备注 - 无 + {{timeInfo.handleMessage}} - + 处置人 - 张三 + {{timeInfo.handleJobPerson}} - + 处置时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 消警时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 取消告警 @@ -129,51 +129,37 @@ diff --git a/static/checkIcon/gas-terminal.jpg b/static/checkIcon/gas-terminal.jpg new file mode 100644 index 0000000..00eb20c --- /dev/null +++ b/static/checkIcon/gas-terminal.jpg Binary files differ diff --git a/static/checkIcon/liquid.jpg b/static/checkIcon/liquid.jpg new file mode 100644 index 0000000..2135c54 --- /dev/null +++ b/static/checkIcon/liquid.jpg Binary files differ diff --git a/static/checkIcon/manhole.jpg b/static/checkIcon/manhole.jpg new file mode 100644 index 0000000..bd7fc76 --- /dev/null +++ b/static/checkIcon/manhole.jpg Binary files differ diff --git a/uni_modules/uview-ui/components/u-album/props.js b/uni_modules/uview-ui/components/u-album/props.js deleted file mode 100644 index 75cdb37..0000000 --- a/uni_modules/uview-ui/components/u-album/props.js +++ /dev/null @@ -1,59 +0,0 @@ -export default { - props: { - // 图片地址，Array|Array形式 - urls: { - type: Array, - default: uni.$u.props.album.urls - }, - // 指定从数组的对象元素中读取哪个属性作为图片地址 - keyName: { - type: String, - default: uni.$u.props.album.keyName - }, - // 单图时，图片长边的长度 - singleSize: { - type: [String, Number], - default: uni.$u.props.album.singleSize - }, - // 多图时，图片边长 - multipleSize: { - type: [String, Number], - default: uni.$u.props.album.multipleSize - }, - // 多图时，图片水平和垂直之间的间隔 - space: { - type: [String, Number], - default: uni.$u.props.album.space - }, - // 单图时，图片缩放裁剪的模式 - singleMode: { - type: String, - default: uni.$u.props.album.singleMode - }, - // 多图时，图片缩放裁剪的模式 - multipleMode: { - type: String, - default: uni.$u.props.album.multipleMode - }, - // 最多展示的图片数量，超出时最后一个位置将会显示剩余图片数量 - maxCount: { - type: [String, Number], - default: uni.$u.props.album.maxCount - }, - // 是否可以预览图片 - previewFullImage: { - type: Boolean, - default: uni.$u.props.album.previewFullImage - }, - // 每行展示图片数量，如设置，singleSize和multipleSize将会无效 - rowCount: { - type: [String, Number], - default: uni.$u.props.album.rowCount - }, - // 超出maxCount时是否显示查看更多的提示 - showMore: { - type: Boolean, - default: uni.$u.props.album.showMore - } - } -} diff --git a/uni_modules/uview-ui/components/u-album/u-album.vue b/uni_modules/uview-ui/components/u-album/u-album.vue deleted file mode 100644 index 687e2d5..0000000 --- a/uni_modules/uview-ui/components/u-album/u-album.vue +++ /dev/null @@ -1,259 +0,0 @@ - - - - - \ No newline at end of file diff --git a/api/check.js b/api/check.js index 417f242..719e90d 100644 --- a/api/check.js +++ b/api/check.js @@ -1,13 +1,64 @@ import fetch from '@/common/fetchs.js'; import useNetWork from '@/common/useNetWork.js'; -const visitReason = 'http://111.198.10.15:11406/device/list-page' -const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' -const Login = 'http://111.198.10.15:11406/sys/user/login' -const Alarm = 'http://111.198.10.15:11406/alarm/list' +const visitReason = 'https://smartwell.gd.smartlog.work/device/list-page' +const baseConfig = 'https://smartwell.gd.smartlog.work/sys/config/baseConfig' +const Login = 'https://smartwell.gd.smartlog.work/sys/user/login' +const Alarm = 'https://smartwell.gd.smartlog.work/alarm/list' +const JobInfo = 'https://smartwell.gd.smartlog.work/job/info' +const DeviceDetail = 'https://smartwell.gd.smartlog.work/overview/deviceDetail' +const WellInfo = 'https://smartwell.gd.smartlog.work/well/info' /** + * 获取井口详情 + * @param {*} + */ +export function getWellInfo(params) { + useNetWork(); + return fetch.get(WellInfo,params).then(res => res); +} + +/** + * 获取设备详情 + * @param {*} + */ +export function getDeviceDetail(params) { + useNetWork(); + return fetch.get(DeviceDetail,params).then(res => res); +} + +/** + * 批量消警 + * @param {*} + */ +export function getBatchCancel(data) { + useNetWork(); + const BatchCancel = `https://smartwell.gd.smartlog.work/alarm/batchCancel?keywords=${data.keywords}&alarmType=${data.alarmType} + &alarmContent=${data.alarmContent}&beginTime=${data.beginTime}&endTime=${data.endTime}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(BatchCancel).then(res => res); +} + +/** + * 获取宵禁时间 + * @param {*} + */ +export function getJobInfo(params) { + useNetWork(); + return fetch.get(JobInfo,params).then(res => res); +} + +/** + * 取消报警 + * @param {*} + */ +export function getCancelAlarm(data) { + useNetWork(); + const CancelAlarm = `https://smartwell.gd.smartlog.work/alarm/cancelAlarm?id=${data.id}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(CancelAlarm).then(res => res); +} + +/** * 获取到报警列表 * @param {*} */ diff --git a/pages/check/check.vue b/pages/check/check.vue index 07237ef..1fc2909 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -8,12 +8,12 @@ v-model="params.keywords" @change="inputChage" > - + - + {{item.deviceTypeName}} ({{item.devcode}}) @@ -27,8 +27,8 @@ - - + + @@ -87,6 +87,9 @@ this.getList() }, navigateCheck(index,type){ // 跳转 + if( typeof(type) === 'object' ) { + uni.setStorageSync('checkrow',type) + } if(index === '1') { wx.navigateTo({ url: '/pages/reportList/reportList', diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index db45e8d..242bb23 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,7 +6,7 @@ }} - + {{item.name}} @@ -29,7 +29,7 @@ - + {{item.name}} @@ -49,7 +49,7 @@ - + {{item.name}} @@ -151,8 +151,9 @@ type: '' // 控制表格展示 } }, - onLoad(option){ + onLoad(option){ this.type = option.type + }, methods: { // 确认导出 diff --git a/pages/reportInfo/reportInfo.vue b/pages/reportInfo/reportInfo.vue index f2447ed..bd9ea58 100644 --- a/pages/reportInfo/reportInfo.vue +++ b/pages/reportInfo/reportInfo.vue @@ -4,19 +4,19 @@ 设备编号 - 312022040441 + {{info.devcode}} 设备类型 - 燃气智能监测终端 + {{info.alarmContentName}} 设备位置 - 职工食堂 + {{info.position}} 井编号 - 1 + {{info.wellCode}} 井类型 @@ -24,49 +24,49 @@ 井名称 - 其他 + {{timeInfo.wellName}} 告警原因 - 浓度超限 + {{info.alarmTypeName}} 告警数值 - 90 + {{info.alarmValue}} 告警等级 - 一级告警 + {{info.alarmLevel}} 告警时间 - 2022-10-29 12:25:00 + {{info.alarmTime}} 告警状态 - 历史告警 + {{info.statusName}} - + 告警取消原因 - 已处理 + {{info.jobStatusName}} - + 备注 - 无 + {{timeInfo.handleMessage}} - + 处置人 - 张三 + {{timeInfo.handleJobPerson}} - + 处置时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 消警时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 取消告警 @@ -129,51 +129,37 @@ diff --git a/static/checkIcon/gas-terminal.jpg b/static/checkIcon/gas-terminal.jpg new file mode 100644 index 0000000..00eb20c --- /dev/null +++ b/static/checkIcon/gas-terminal.jpg Binary files differ diff --git a/static/checkIcon/liquid.jpg b/static/checkIcon/liquid.jpg new file mode 100644 index 0000000..2135c54 --- /dev/null +++ b/static/checkIcon/liquid.jpg Binary files differ diff --git a/static/checkIcon/manhole.jpg b/static/checkIcon/manhole.jpg new file mode 100644 index 0000000..bd7fc76 --- /dev/null +++ b/static/checkIcon/manhole.jpg Binary files differ diff --git a/uni_modules/uview-ui/components/u-album/props.js b/uni_modules/uview-ui/components/u-album/props.js deleted file mode 100644 index 75cdb37..0000000 --- a/uni_modules/uview-ui/components/u-album/props.js +++ /dev/null @@ -1,59 +0,0 @@ -export default { - props: { - // 图片地址，Array|Array形式 - urls: { - type: Array, - default: uni.$u.props.album.urls - }, - // 指定从数组的对象元素中读取哪个属性作为图片地址 - keyName: { - type: String, - default: uni.$u.props.album.keyName - }, - // 单图时，图片长边的长度 - singleSize: { - type: [String, Number], - default: uni.$u.props.album.singleSize - }, - // 多图时，图片边长 - multipleSize: { - type: [String, Number], - default: uni.$u.props.album.multipleSize - }, - // 多图时，图片水平和垂直之间的间隔 - space: { - type: [String, Number], - default: uni.$u.props.album.space - }, - // 单图时，图片缩放裁剪的模式 - singleMode: { - type: String, - default: uni.$u.props.album.singleMode - }, - // 多图时，图片缩放裁剪的模式 - multipleMode: { - type: String, - default: uni.$u.props.album.multipleMode - }, - // 最多展示的图片数量，超出时最后一个位置将会显示剩余图片数量 - maxCount: { - type: [String, Number], - default: uni.$u.props.album.maxCount - }, - // 是否可以预览图片 - previewFullImage: { - type: Boolean, - default: uni.$u.props.album.previewFullImage - }, - // 每行展示图片数量，如设置，singleSize和multipleSize将会无效 - rowCount: { - type: [String, Number], - default: uni.$u.props.album.rowCount - }, - // 超出maxCount时是否显示查看更多的提示 - showMore: { - type: Boolean, - default: uni.$u.props.album.showMore - } - } -} diff --git a/uni_modules/uview-ui/components/u-album/u-album.vue b/uni_modules/uview-ui/components/u-album/u-album.vue deleted file mode 100644 index 687e2d5..0000000 --- a/uni_modules/uview-ui/components/u-album/u-album.vue +++ /dev/null @@ -1,259 +0,0 @@ - - - - - \ No newline at end of file diff --git a/uni_modules/uview-ui/components/u-alert/props.js b/uni_modules/uview-ui/components/u-alert/props.js deleted file mode 100644 index 4297e2c..0000000 --- a/uni_modules/uview-ui/components/u-alert/props.js +++ /dev/null @@ -1,44 +0,0 @@ -export default { - props: { - // 显示文字 - title: { - type: String, - default: uni.$u.props.alert.title - }, - // 主题，success/warning/info/error - type: { - type: String, - default: uni.$u.props.alert.type - }, - // 辅助性文字 - description: { - type: String, - default: uni.$u.props.alert.description - }, - // 是否可关闭 - closable: { - type: Boolean, - default: uni.$u.props.alert.closable - }, - // 是否显示图标 - showIcon: { - type: Boolean, - default: uni.$u.props.alert.showIcon - }, - // 浅或深色调，light-浅色，dark-深色 - effect: { - type: String, - default: uni.$u.props.alert.effect - }, - // 文字是否居中 - center: { - type: Boolean, - default: uni.$u.props.alert.center - }, - // 字体大小 - fontSize: { - type: [String, Number], - default: uni.$u.props.alert.fontSize - } - } -} diff --git a/api/check.js b/api/check.js index 417f242..719e90d 100644 --- a/api/check.js +++ b/api/check.js @@ -1,13 +1,64 @@ import fetch from '@/common/fetchs.js'; import useNetWork from '@/common/useNetWork.js'; -const visitReason = 'http://111.198.10.15:11406/device/list-page' -const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' -const Login = 'http://111.198.10.15:11406/sys/user/login' -const Alarm = 'http://111.198.10.15:11406/alarm/list' +const visitReason = 'https://smartwell.gd.smartlog.work/device/list-page' +const baseConfig = 'https://smartwell.gd.smartlog.work/sys/config/baseConfig' +const Login = 'https://smartwell.gd.smartlog.work/sys/user/login' +const Alarm = 'https://smartwell.gd.smartlog.work/alarm/list' +const JobInfo = 'https://smartwell.gd.smartlog.work/job/info' +const DeviceDetail = 'https://smartwell.gd.smartlog.work/overview/deviceDetail' +const WellInfo = 'https://smartwell.gd.smartlog.work/well/info' /** + * 获取井口详情 + * @param {*} + */ +export function getWellInfo(params) { + useNetWork(); + return fetch.get(WellInfo,params).then(res => res); +} + +/** + * 获取设备详情 + * @param {*} + */ +export function getDeviceDetail(params) { + useNetWork(); + return fetch.get(DeviceDetail,params).then(res => res); +} + +/** + * 批量消警 + * @param {*} + */ +export function getBatchCancel(data) { + useNetWork(); + const BatchCancel = `https://smartwell.gd.smartlog.work/alarm/batchCancel?keywords=${data.keywords}&alarmType=${data.alarmType} + &alarmContent=${data.alarmContent}&beginTime=${data.beginTime}&endTime=${data.endTime}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(BatchCancel).then(res => res); +} + +/** + * 获取宵禁时间 + * @param {*} + */ +export function getJobInfo(params) { + useNetWork(); + return fetch.get(JobInfo,params).then(res => res); +} + +/** + * 取消报警 + * @param {*} + */ +export function getCancelAlarm(data) { + useNetWork(); + const CancelAlarm = `https://smartwell.gd.smartlog.work/alarm/cancelAlarm?id=${data.id}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(CancelAlarm).then(res => res); +} + +/** * 获取到报警列表 * @param {*} */ diff --git a/pages/check/check.vue b/pages/check/check.vue index 07237ef..1fc2909 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -8,12 +8,12 @@ v-model="params.keywords" @change="inputChage" > - + - + {{item.deviceTypeName}} ({{item.devcode}}) @@ -27,8 +27,8 @@ - - + + @@ -87,6 +87,9 @@ this.getList() }, navigateCheck(index,type){ // 跳转 + if( typeof(type) === 'object' ) { + uni.setStorageSync('checkrow',type) + } if(index === '1') { wx.navigateTo({ url: '/pages/reportList/reportList', diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index db45e8d..242bb23 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,7 +6,7 @@ }} - + {{item.name}} @@ -29,7 +29,7 @@ - + {{item.name}} @@ -49,7 +49,7 @@ - + {{item.name}} @@ -151,8 +151,9 @@ type: '' // 控制表格展示 } }, - onLoad(option){ + onLoad(option){ this.type = option.type + }, methods: { // 确认导出 diff --git a/pages/reportInfo/reportInfo.vue b/pages/reportInfo/reportInfo.vue index f2447ed..bd9ea58 100644 --- a/pages/reportInfo/reportInfo.vue +++ b/pages/reportInfo/reportInfo.vue @@ -4,19 +4,19 @@ 设备编号 - 312022040441 + {{info.devcode}} 设备类型 - 燃气智能监测终端 + {{info.alarmContentName}} 设备位置 - 职工食堂 + {{info.position}} 井编号 - 1 + {{info.wellCode}} 井类型 @@ -24,49 +24,49 @@ 井名称 - 其他 + {{timeInfo.wellName}} 告警原因 - 浓度超限 + {{info.alarmTypeName}} 告警数值 - 90 + {{info.alarmValue}} 告警等级 - 一级告警 + {{info.alarmLevel}} 告警时间 - 2022-10-29 12:25:00 + {{info.alarmTime}} 告警状态 - 历史告警 + {{info.statusName}} - + 告警取消原因 - 已处理 + {{info.jobStatusName}} - + 备注 - 无 + {{timeInfo.handleMessage}} - + 处置人 - 张三 + {{timeInfo.handleJobPerson}} - + 处置时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 消警时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 取消告警 @@ -129,51 +129,37 @@ diff --git a/static/checkIcon/gas-terminal.jpg b/static/checkIcon/gas-terminal.jpg new file mode 100644 index 0000000..00eb20c --- /dev/null +++ b/static/checkIcon/gas-terminal.jpg Binary files differ diff --git a/static/checkIcon/liquid.jpg b/static/checkIcon/liquid.jpg new file mode 100644 index 0000000..2135c54 --- /dev/null +++ b/static/checkIcon/liquid.jpg Binary files differ diff --git a/static/checkIcon/manhole.jpg b/static/checkIcon/manhole.jpg new file mode 100644 index 0000000..bd7fc76 --- /dev/null +++ b/static/checkIcon/manhole.jpg Binary files differ diff --git a/uni_modules/uview-ui/components/u-album/props.js b/uni_modules/uview-ui/components/u-album/props.js deleted file mode 100644 index 75cdb37..0000000 --- a/uni_modules/uview-ui/components/u-album/props.js +++ /dev/null @@ -1,59 +0,0 @@ -export default { - props: { - // 图片地址，Array|Array形式 - urls: { - type: Array, - default: uni.$u.props.album.urls - }, - // 指定从数组的对象元素中读取哪个属性作为图片地址 - keyName: { - type: String, - default: uni.$u.props.album.keyName - }, - // 单图时，图片长边的长度 - singleSize: { - type: [String, Number], - default: uni.$u.props.album.singleSize - }, - // 多图时，图片边长 - multipleSize: { - type: [String, Number], - default: uni.$u.props.album.multipleSize - }, - // 多图时，图片水平和垂直之间的间隔 - space: { - type: [String, Number], - default: uni.$u.props.album.space - }, - // 单图时，图片缩放裁剪的模式 - singleMode: { - type: String, - default: uni.$u.props.album.singleMode - }, - // 多图时，图片缩放裁剪的模式 - multipleMode: { - type: String, - default: uni.$u.props.album.multipleMode - }, - // 最多展示的图片数量，超出时最后一个位置将会显示剩余图片数量 - maxCount: { - type: [String, Number], - default: uni.$u.props.album.maxCount - }, - // 是否可以预览图片 - previewFullImage: { - type: Boolean, - default: uni.$u.props.album.previewFullImage - }, - // 每行展示图片数量，如设置，singleSize和multipleSize将会无效 - rowCount: { - type: [String, Number], - default: uni.$u.props.album.rowCount - }, - // 超出maxCount时是否显示查看更多的提示 - showMore: { - type: Boolean, - default: uni.$u.props.album.showMore - } - } -} diff --git a/uni_modules/uview-ui/components/u-album/u-album.vue b/uni_modules/uview-ui/components/u-album/u-album.vue deleted file mode 100644 index 687e2d5..0000000 --- a/uni_modules/uview-ui/components/u-album/u-album.vue +++ /dev/null @@ -1,259 +0,0 @@ - - - - - \ No newline at end of file diff --git a/uni_modules/uview-ui/components/u-alert/props.js b/uni_modules/uview-ui/components/u-alert/props.js deleted file mode 100644 index 4297e2c..0000000 --- a/uni_modules/uview-ui/components/u-alert/props.js +++ /dev/null @@ -1,44 +0,0 @@ -export default { - props: { - // 显示文字 - title: { - type: String, - default: uni.$u.props.alert.title - }, - // 主题，success/warning/info/error - type: { - type: String, - default: uni.$u.props.alert.type - }, - // 辅助性文字 - description: { - type: String, - default: uni.$u.props.alert.description - }, - // 是否可关闭 - closable: { - type: Boolean, - default: uni.$u.props.alert.closable - }, - // 是否显示图标 - showIcon: { - type: Boolean, - default: uni.$u.props.alert.showIcon - }, - // 浅或深色调，light-浅色，dark-深色 - effect: { - type: String, - default: uni.$u.props.alert.effect - }, - // 文字是否居中 - center: { - type: Boolean, - default: uni.$u.props.alert.center - }, - // 字体大小 - fontSize: { - type: [String, Number], - default: uni.$u.props.alert.fontSize - } - } -} diff --git a/uni_modules/uview-ui/components/u-alert/u-alert.vue b/uni_modules/uview-ui/components/u-alert/u-alert.vue deleted file mode 100644 index 81f7d43..0000000 --- a/uni_modules/uview-ui/components/u-alert/u-alert.vue +++ /dev/null @@ -1,243 +0,0 @@ - - - - - diff --git a/api/check.js b/api/check.js index 417f242..719e90d 100644 --- a/api/check.js +++ b/api/check.js @@ -1,13 +1,64 @@ import fetch from '@/common/fetchs.js'; import useNetWork from '@/common/useNetWork.js'; -const visitReason = 'http://111.198.10.15:11406/device/list-page' -const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' -const Login = 'http://111.198.10.15:11406/sys/user/login' -const Alarm = 'http://111.198.10.15:11406/alarm/list' +const visitReason = 'https://smartwell.gd.smartlog.work/device/list-page' +const baseConfig = 'https://smartwell.gd.smartlog.work/sys/config/baseConfig' +const Login = 'https://smartwell.gd.smartlog.work/sys/user/login' +const Alarm = 'https://smartwell.gd.smartlog.work/alarm/list' +const JobInfo = 'https://smartwell.gd.smartlog.work/job/info' +const DeviceDetail = 'https://smartwell.gd.smartlog.work/overview/deviceDetail' +const WellInfo = 'https://smartwell.gd.smartlog.work/well/info' /** + * 获取井口详情 + * @param {*} + */ +export function getWellInfo(params) { + useNetWork(); + return fetch.get(WellInfo,params).then(res => res); +} + +/** + * 获取设备详情 + * @param {*} + */ +export function getDeviceDetail(params) { + useNetWork(); + return fetch.get(DeviceDetail,params).then(res => res); +} + +/** + * 批量消警 + * @param {*} + */ +export function getBatchCancel(data) { + useNetWork(); + const BatchCancel = `https://smartwell.gd.smartlog.work/alarm/batchCancel?keywords=${data.keywords}&alarmType=${data.alarmType} + &alarmContent=${data.alarmContent}&beginTime=${data.beginTime}&endTime=${data.endTime}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(BatchCancel).then(res => res); +} + +/** + * 获取宵禁时间 + * @param {*} + */ +export function getJobInfo(params) { + useNetWork(); + return fetch.get(JobInfo,params).then(res => res); +} + +/** + * 取消报警 + * @param {*} + */ +export function getCancelAlarm(data) { + useNetWork(); + const CancelAlarm = `https://smartwell.gd.smartlog.work/alarm/cancelAlarm?id=${data.id}&jobStatus=${data.jobStatus}&handleMessage=${data.handleMessage}` + return fetch.post(CancelAlarm).then(res => res); +} + +/** * 获取到报警列表 * @param {*} */ diff --git a/pages/check/check.vue b/pages/check/check.vue index 07237ef..1fc2909 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -8,12 +8,12 @@ v-model="params.keywords" @change="inputChage" > - + - + {{item.deviceTypeName}} ({{item.devcode}}) @@ -27,8 +27,8 @@ - - + + @@ -87,6 +87,9 @@ this.getList() }, navigateCheck(index,type){ // 跳转 + if( typeof(type) === 'object' ) { + uni.setStorageSync('checkrow',type) + } if(index === '1') { wx.navigateTo({ url: '/pages/reportList/reportList', diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index db45e8d..242bb23 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,7 +6,7 @@ }} - + {{item.name}} @@ -29,7 +29,7 @@ - + {{item.name}} @@ -49,7 +49,7 @@ - + {{item.name}} @@ -151,8 +151,9 @@ type: '' // 控制表格展示 } }, - onLoad(option){ + onLoad(option){ this.type = option.type + }, methods: { // 确认导出 diff --git a/pages/reportInfo/reportInfo.vue b/pages/reportInfo/reportInfo.vue index f2447ed..bd9ea58 100644 --- a/pages/reportInfo/reportInfo.vue +++ b/pages/reportInfo/reportInfo.vue @@ -4,19 +4,19 @@ 设备编号 - 312022040441 + {{info.devcode}} 设备类型 - 燃气智能监测终端 + {{info.alarmContentName}} 设备位置 - 职工食堂 + {{info.position}} 井编号 - 1 + {{info.wellCode}} 井类型 @@ -24,49 +24,49 @@ 井名称 - 其他 + {{timeInfo.wellName}} 告警原因 - 浓度超限 + {{info.alarmTypeName}} 告警数值 - 90 + {{info.alarmValue}} 告警等级 - 一级告警 + {{info.alarmLevel}} 告警时间 - 2022-10-29 12:25:00 + {{info.alarmTime}} 告警状态 - 历史告警 + {{info.statusName}} - + 告警取消原因 - 已处理 + {{info.jobStatusName}} - + 备注 - 无 + {{timeInfo.handleMessage}} - + 处置人 - 张三 + {{timeInfo.handleJobPerson}} - + 处置时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 消警时间 - 2022-10-29 16:25:00 + {{timeInfo.alarmTime}} - + 取消告警 @@ -129,51 +129,37 @@ diff --git a/static/checkIcon/gas-terminal.jpg b/static/checkIcon/gas-terminal.jpg new file mode 100644 index 0000000..00eb20c --- /dev/null +++ b/static/checkIcon/gas-terminal.jpg Binary files differ diff --git a/static/checkIcon/liquid.jpg b/static/checkIcon/liquid.jpg new file mode 100644 index 0000000..2135c54 --- /dev/null +++ b/static/checkIcon/liquid.jpg Binary files differ diff --git a/static/checkIcon/manhole.jpg b/static/checkIcon/manhole.jpg new file mode 100644 index 0000000..bd7fc76 --- /dev/null +++ b/static/checkIcon/manhole.jpg Binary files differ diff --git a/uni_modules/uview-ui/components/u-album/props.js b/uni_modules/uview-ui/components/u-album/props.js deleted file mode 100644 index 75cdb37..0000000 --- a/uni_modules/uview-ui/components/u-album/props.js +++ /dev/null @@ -1,59 +0,0 @@ -export default { - props: { - // 图片地址，Array|Array形式 - urls: { - type: Array, - default: uni.$u.props.album.urls - }, - // 指定从数组的对象元素中读取哪个属性作为图片地址 - keyName: { - type: String, - default: uni.$u.props.album.keyName - }, - // 单图时，图片长边的长度 - singleSize: { - type: [String, Number], - default: uni.$u.props.album.singleSize - }, - // 多图时，图片边长 - multipleSize: { - type: [String, Number], - default: uni.$u.props.album.multipleSize - }, - // 多图时，图片水平和垂直之间的间隔 - space: { - type: [String, Number], - default: uni.$u.props.album.space - }, - // 单图时，图片缩放裁剪的模式 - singleMode: { - type: String, - default: uni.$u.props.album.singleMode - }, - // 多图时，图片缩放裁剪的模式 - multipleMode: { - type: String, - default: uni.$u.props.album.multipleMode - }, - // 最多展示的图片数量，超出时最后一个位置将会显示剩余图片数量 - maxCount: { - type: [String, Number], - default: uni.$u.props.album.maxCount - }, - // 是否可以预览图片 - previewFullImage: { - type: Boolean, - default: uni.$u.props.album.previewFullImage - }, - // 每行展示图片数量，如设置，singleSize和multipleSize将会无效 - rowCount: { - type: [String, Number], - default: uni.$u.props.album.rowCount - }, - // 超出maxCount时是否显示查看更多的提示 - showMore: { - type: Boolean, - default: uni.$u.props.album.showMore - } - } -} diff --git a/uni_modules/uview-ui/components/u-album/u-album.vue b/uni_modules/uview-ui/components/u-album/u-album.vue deleted file mode 100644 index 687e2d5..0000000 --- a/uni_modules/uview-ui/components/u-album/u-album.vue +++ /dev/null @@ -1,259 +0,0 @@ - - - - - \ No newline at end of file diff --git a/uni_modules/uview-ui/components/u-alert/props.js b/uni_modules/uview-ui/components/u-alert/props.js deleted file mode 100644 index 4297e2c..0000000 --- a/uni_modules/uview-ui/components/u-alert/props.js +++ /dev/null @@ -1,44 +0,0 @@ -export default { - props: { - // 显示文字 - title: { - type: String, - default: uni.$u.props.alert.title - }, - // 主题，success/warning/info/error - type: { - type: String, - default: uni.$u.props.alert.type - }, - // 辅助性文字 - description: { - type: String, - default: uni.$u.props.alert.description - }, - // 是否可关闭 - closable: { - type: Boolean, - default: uni.$u.props.alert.closable - }, - // 是否显示图标 - showIcon: { - type: Boolean, - default: uni.$u.props.alert.showIcon - }, - // 浅或深色调，light-浅色，dark-深色 - effect: { - type: String, - default: uni.$u.props.alert.effect - }, - // 文字是否居中 - center: { - type: Boolean, - default: uni.$u.props.alert.center - }, - // 字体大小 - fontSize: { - type: [String, Number], - default: uni.$u.props.alert.fontSize - } - } -} diff --git a/uni_modules/uview-ui/components/u-alert/u-alert.vue b/uni_modules/uview-ui/components/u-alert/u-alert.vue deleted file mode 100644 index 81f7d43..0000000 --- a/uni_modules/uview-ui/components/u-alert/u-alert.vue +++ /dev/null @@ -1,243 +0,0 @@ - - - - - diff --git a/utils/check.js b/utils/check.js deleted file mode 100644 index 8857ebc..0000000 --- a/utils/check.js +++ /dev/null @@ -1,12 +0,0 @@ -//引入下载好的js文件 -import CryptoJS from '../node_modules/crypto-js/crypto-js.js' -// 加密 -const keyStr = 'test' // 解密用的key -export function encrypt (word) { - const time = Date.now() - - const key = CryptoJS.enc.Utf8.parse(keyStr) - const srcs = CryptoJS.enc.Utf8.parse(time + word) // 加密方式: 时间戳 + 密文 - const encrypted = CryptoJS.AES.encrypt(srcs, key, {mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7}) - return encrypted.toString() -} \ No newline at end of file