diff --git a/public/static/config.js b/public/static/config.js index 09cd1bb..855b965 100644 --- a/public/static/config.js +++ b/public/static/config.js @@ -1,6 +1,11 @@ window.g = { AXIOS_TIMEOUT: 10000, - ApiUrl: 'http://192.168.99.100:7080', // 配置服务器地址 + ApiUrl: 'http://192.168.99.72:7080', // 配置服务器地址 ApiWebRtcServerUrl: '127.0.0.1:8000', // 配置监控视频服务器地址 - sDevID:'D003' // 桌面式RFID读写器 + sDevID:'D003', // 桌面式RFID读写器, + ZMINConfig:{ // 标签打印机 + ip:'127.0.0.1', + port:'1808', + filePath:'/home/it0/zmin/新标签01.lsf' + } } \ No newline at end of file diff --git a/src/api/home/alarm/index.js b/src/api/home/alarm/index.js index e4511ad..03ac4bf 100644 --- a/src/api/home/alarm/index.js +++ b/src/api/home/alarm/index.js @@ -2,9 +2,20 @@ import request from '@/utils/request' export function info(params) { return request({ - url: 'api/alarm/info', + // url: 'api/alarm/info', + url: 'api/alarm/ypGetAlarm', params, method: 'get' }) } -export default { info } + +// getDataForIP +export function FetchDataForIP(params) { + return request({ + url: 'api/alarm/getDataForIP', + params, + method: 'get' + }) +} + +export default { info, FetchDataForIP } diff --git a/src/main.js b/src/main.js index 22d0fe4..9ced88d 100644 --- a/src/main.js +++ b/src/main.js @@ -34,6 +34,33 @@ import './assets/icons' // icon import './router/index' // permission control import 'echarts-gl' +// 定义补零工具函数 +const padZero = (num) => { + // 先转为数字，防止传入字符串，再补零 + return Number(num).toString().padStart(2, '0') +} + +// 注册全局时间格式化过滤器 +Vue.filter('formatTs', (tsStr) => { + // 容错处理：如果TS为空或格式异常，返回原字符串 + if (!tsStr || typeof tsStr !== 'string') return tsStr + + // 拆分日期和时间部分（按空格分割） + const [datePart, timePart] = tsStr.split(' ') + if (!datePart || !timePart) return tsStr + + // 处理日期部分：yyyy/MM/dd + const [year, month, day] = datePart.split('/') + const formattedDate = `${year}/${padZero(month)}/${padZero(day)}` + + // 处理时间部分：HH:mm:ss + const [hour, minute, second] = timePart.split(':') + const formattedTime = `${padZero(hour)}:${padZero(minute)}:${padZero(second)}` + + // 拼接最终结果 + return `${formattedDate} ${formattedTime}` +}) + // 全局注册过滤 - 时间 import { parseTime } from '@/utils/index.js' Vue.filter('parseTime', function(time, cFormat) { diff --git a/src/views/archivesManage/caseManage/caseList/index-oldPrint.vue b/src/views/archivesManage/caseManage/caseList/index-oldPrint.vue new file mode 100644 index 0000000..4c95613 --- /dev/null +++ b/src/views/archivesManage/caseManage/caseList/index-oldPrint.vue @@ -0,0 +1,523 @@ +