diff --git a/src/api/cs-harmonic-boot/recruitment.ts b/src/api/cs-harmonic-boot/recruitment.ts index 7d617e8..bda809f 100644 --- a/src/api/cs-harmonic-boot/recruitment.ts +++ b/src/api/cs-harmonic-boot/recruitment.ts @@ -1,27 +1,36 @@ -import createAxios from '@/utils/request' - -// 获取设备补召页面数据 -export function getMakeUpData(data: any) { - return createAxios({ - url: '/cs-harmonic-boot/offlineDataUpload/makeUpData?lineId='+data, - method: 'POST' - }) -} - -//查询装置目录-文件 -export function getAskDirOrFile(data: any) { - return createAxios({ - url: `/cs-harmonic-boot/offlineDataUpload/askDirOrFile?fileType=${data.fileType}&nDid=${data.nDid}&path=${data.path}&prjName=${data.prjName}`, - method: 'POST' - }) -} - -//设备补召操作 -// 获取设备补召页面数据 -export function offlineDataUploadMakeUp(data: any) { - return createAxios({ - url: '/cs-harmonic-boot/offlineDataUpload/makeUp', - method: 'POST', - data - }) -} +import createAxios from '@/utils/request' + +// 获取设备补召页面数据 +export function getMakeUpData(data: any) { + return createAxios({ + url: '/cs-harmonic-boot/offlineDataUpload/makeUpData?lineId='+data, + method: 'POST' + }) +} + +//查询装置目录-文件 +export function getAskDirOrFile(data: any) { + return createAxios({ + url: `/cs-harmonic-boot/offlineDataUpload/askDirOrFile?fileType=${data.fileType}&nDid=${data.nDid}&path=${data.path}&prjName=${data.prjName}`, + method: 'POST' + }) +} + +//设备补召操作 +// 获取设备补召页面数据 +export function offlineDataUploadMakeUp(data: any) { + return createAxios({ + url: '/cs-harmonic-boot/offlineDataUpload/makeUp', + method: 'POST', + data + }) +} +//设备补召操作 +// 根据id集合获取敏感负荷用户列表 +export function getListByIds() { + return createAxios({ + url: '/cs-harmonic-boot/pqSensitiveUser/getListByIds', + method: 'POST', + + }) +} diff --git a/src/api/system-boot/csDictData.ts b/src/api/system-boot/csDictData.ts index 4bb381c..cbf0ecd 100644 --- a/src/api/system-boot/csDictData.ts +++ b/src/api/system-boot/csDictData.ts @@ -1,118 +1,126 @@ -import request from '@/utils/request' -// 新增字典数据 -export const addCsDictData = (data: any) => { - return request({ - url: '/system-boot/csDictData/add', - method: 'post', - data: data - }) -} - -// 查询字典数据 -export const queryCsDictDataPage = (data: any) => { - return request({ - url: '/system-boot/csDictData/list', - method: 'post', - data: Object.assign( - { - orderBy: '', - pageNum: 0, - pageSize: 0, - searchBeginTime: '', - searchEndTime: '', - searchState: 0, - searchValue: '', - dataType: '', - sortBy: '' - }, - data - ) - }) -} - -//删除字典数据 -export const delCsDictData = (id: string) => { - let form = new FormData() - form.append('id', id) - return request({ - url: '/system-boot/csDictData/delete', - method: 'post', - data: form, - headers: { - 'Content-Type': 'application/x-www-form-urlencoded' - } - }) -} - -// 修改字典数据 -export const updateCsDictData = (data: any) => { - return request({ - url: '/system-boot/csDictData/update', - method: 'post', - data: data - }) -} - -// 执行算法 -export const timerRun = (params: any) => { - return request({ - url: '/system-boot/timer/run', - method: 'GET', - params - }) -} -// 任务表达式 -export const getActionClasses = () => { - return request({ - url: '/system-boot/timer/getActionClasses', - method: 'GET' - }) -} -// 新增任务 -export const addTimer = (data: any) => { - return request({ - url: '/system-boot/timer/add', - method: 'POST', - data - }) -} -// 修改任务 -export const updateTimer = (data: any) => { - return request({ - url: '/system-boot/timer/update', - method: 'POST', - data - }) -} -// 补招配置 -export const runTimer = (data: any) => { - return request({ - url: '/system-boot/timer/run', - method: 'GET', - params: data - }) -} -// 删除任务 -export const deleteTimer = (data: any) => { - return request({ - url: '/system-boot/timer/delete', - method: 'POST', - data: data - }) -} -// 关闭任务 -export const stop = (params: any) => { - return request({ - url: '/system-boot/timer/stop', - method: 'get', - params - }) -} -// 启动任务 -export const start = (params: any) => { - return request({ - url: '/system-boot/timer/start', - method: 'get', - params - }) +import request from '@/utils/request' +// 新增字典数据 +export const addCsDictData = (data: any) => { + return request({ + url: '/system-boot/csDictData/add', + method: 'post', + data: data + }) +} + +// 查询字典数据 +export const queryCsDictDataPage = (data: any) => { + return request({ + url: '/system-boot/csDictData/list', + method: 'post', + data: Object.assign( + { + orderBy: '', + pageNum: 0, + pageSize: 0, + searchBeginTime: '', + searchEndTime: '', + searchState: 0, + searchValue: '', + dataType: '', + sortBy: '' + }, + data + ) + }) +} + +//删除字典数据 +export const delCsDictData = (id: string) => { + let form = new FormData() + form.append('id', id) + return request({ + url: '/system-boot/csDictData/delete', + method: 'post', + data: form, + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + } + }) +} + +// 修改字典数据 +export const updateCsDictData = (data: any) => { + return request({ + url: '/system-boot/csDictData/update', + method: 'post', + data: data + }) +} + +// 执行算法 +export const timerRun = (params: any) => { + return request({ + url: '/system-boot/timer/run', + method: 'GET', + params + }) +} +// 任务表达式 +export const getActionClasses = () => { + return request({ + url: '/system-boot/timer/getActionClasses', + method: 'GET' + }) +} +// 新增任务 +export const addTimer = (data: any) => { + return request({ + url: '/system-boot/timer/add', + method: 'POST', + data + }) +} +// 修改任务 +export const updateTimer = (data: any) => { + return request({ + url: '/system-boot/timer/update', + method: 'POST', + data + }) +} +// 补招配置 +export const runTimer = (data: any) => { + return request({ + url: '/system-boot/timer/run', + method: 'GET', + params: data + }) +} +// 删除任务 +export const deleteTimer = (data: any) => { + return request({ + url: '/system-boot/timer/delete', + method: 'POST', + data: data + }) +} +// 关闭任务 +export const stop = (params: any) => { + return request({ + url: '/system-boot/timer/stop', + method: 'get', + params + }) +} +// 启动任务 +export const start = (params: any) => { + return request({ + url: '/system-boot/timer/start', + method: 'get', + params + }) +} +// 查询监测对象类型 +export const getDicDataByTypeCode = (params: any) => { + return request({ + url: '/system-boot/dictData/getDicDataByTypeCode', + method: 'get', + params + }) } \ No newline at end of file diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts index 07c14a3..ecc4148 100644 --- a/src/utils/formatTime.ts +++ b/src/utils/formatTime.ts @@ -361,3 +361,21 @@ export function getTimeOfTheMonth(key: any): [string, string] { throw new Error('Invalid key') } } +/** + * 获取当月时间 + * @param timeKey 组件外部时间 1 年 2 季 3 月 4 周 5 日 + * @param timeList 组件勾选时间 [] + * @param fullScreen 是否全屏 true 是 false 否 + * @param externalTime //外部传入时间 + */ + +export function getTime(timeKey: number, timeList: any[], fullScreen: boolean, externalTime: any[]) { + // 1、先匹配时间 + // if(匹配上){ + // 是全屏 返回缓存值 + // 不是全屏返回外部传入时间 externalTime + // }else{ + // 返回 getTimeOfTheMonth(timeList.at(-1)) + // } + +} \ No newline at end of file diff --git a/src/views/govern/cloudDeviceEntry/index.vue b/src/views/govern/cloudDeviceEntry/index.vue index d2a15d7..7f135b3 100644 --- a/src/views/govern/cloudDeviceEntry/index.vue +++ b/src/views/govern/cloudDeviceEntry/index.vue @@ -2,12 +2,17 @@
- +
- + {{ nodeLevel == 0 @@ -52,14 +57,19 @@ - - 当前操作节点： + + + 当前操作节点： +
- {{ index == 0 ? '' : ' >　' }}{{ item }} + + {{ index == 0 ? '' : ' >　' }}{{ item }} +
-
@@ -69,14 +79,13 @@ label-width="120px" :inline="true" ref="mainForm" - > - + > - - - - + + + - + - - - + + - + - - - - - - - + + + + + + +
@@ -221,11 +256,14 @@
-
+
+ id="id200" + class="form-item" + label="装置类型:" + :rules="[ + { required: true, message: '请选择装置类型', trigger: 'change' } + ]" + > - + + id="id200" + class="form-item" + label="装置型号:" + :rules="[ + { required: true, message: '请选择装置型号', trigger: 'change' } + ]" + > - + id="id200" + class="form-item" + label="装置接入方式:" + :rules="[ + { required: true, message: '请选择装置接入方式', trigger: 'change' } + ]" + > - + - + -
+
- : + + : +
@@ -508,18 +643,118 @@ :min="1" style="width: 48%" v-model="lineItem.ctRatio" - :disabled="!((nodeLevel == 4 && pageStatus == 3) || ((nodeLevel == 3 || (nodeLevel == 2 && pageStatus == 2)) && pageStatus == 2))" + :disabled=" + !( + (nodeLevel == 4 && pageStatus == 3) || + ((nodeLevel == 3 || + (nodeLevel == 2 && pageStatus == 2)) && + pageStatus == 2) + ) + " > - : + + : +
+ + + + + + + + + + + + + + - + > + + + + + + + + + + + + + + + +
@@ -550,55 +865,59 @@ + +
+ - -
- - - - -
-

推送日志:

-
-
- {{ log.message }} -
-
- 暂无日志信息 -
+ +
+

推送日志:

+
+
+ {{ log.message }} +
+
+ 暂无日志信息 +
+
+
+ + + +

正在推送台账信息，请稍候...

+

预计需要30秒左右

+

已等待: {{ countdown }}秒

-
- - - -

正在推送台账信息，请稍候...

-

预计需要30秒左右

-

已等待: {{ countdown }}秒

-
- - +
- - - +