1
0

2 Коммиты 84e3821bd2 ... bc6cd29aeb

Автор SHA1 Сообщение Дата
  hongrunxia bc6cd29aeb Merge branch 'master' of http://39.97.59.228:8013/hrx/mky-vent-base 3 дней назад
  hongrunxia fc64e08457 [Mod 0000] 接口网关修改 3 дней назад

+ 1 - 0
package.json

@@ -60,6 +60,7 @@
     "html2canvas": "^1.4.1",
     "katex": "^0.16.25",
     "lodash-es": "^4.17.21",
+    "magic-string": "^1.1.0",
     "marked": "^17.0.1",
     "mky-svg": "^1.0.2",
     "nprogress": "^0.2.0",

Разница между файлами не показана из-за своего большого размера
+ 344 - 338
pnpm-lock.yaml


+ 1 - 1
src/views/vent/home/billboard/billboard.api.ts

@@ -5,7 +5,7 @@ import { defHttp } from '/@/utils/http/axios';
 const store = useUserStore();
 
 enum Api {
-  getSummary = '/ventanaly-company/company/index/getEachMinePlateInfo',
+  getSummary = '/company/index/getEachMinePlateInfo',
 }
 
 /**

+ 5 - 5
src/views/vent/monitorManager/warningMonitor/warning.api.ts

@@ -2,13 +2,13 @@ import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
   // list = '/safety/ventanalyAlarmLog/list',
-  list = '/ventanaly-company/company/index/getEachMineWarnLogList',//获取公司端列表
-  getEachMineWarnCountInfo = '/ventanaly-company/company/index/getEachMineWarnCountInfo',//获取公司端信息
+  list = '/company/index/getEachMineWarnLogList', //获取公司端列表
+  getEachMineWarnCountInfo = '/company/index/getEachMineWarnCountInfo', //获取公司端信息
   getWarnCountInfo = '/monitor/groupCompany/getWarnCountInfo', // 获取矿端信息
   getAlarmLogList = '/monitor/groupCompany/getAlarmLogList', //获取各矿预警统计信息
   getManageAutoLogList = '/monitor/groupCompany/getManageAutoLogList', //获取各矿工作面智能管控预警信息
-  exportXls = '/safety/ventanalyAlarmLog/exportXls',//导出
-  exportSensorDayAlarmReport = '/ventanaly-company/company/index/exportSensorDayAlarmReport'//导出各矿传感器预警历史日统计报表
+  exportXls = '/safety/ventanalyAlarmLog/exportXls', //导出
+  exportSensorDayAlarmReport = '/company/index/exportSensorDayAlarmReport', //导出各矿传感器预警历史日统计报表
 }
 /**
  * 列表接口
@@ -26,7 +26,7 @@ export const getAlarmLogList = (params) => defHttp.post({ url: Api.getAlarmLogLi
 export const getManageAutoLogList = (params) => defHttp.post({ url: Api.getManageAutoLogList, params });
 
 export const getExportUrl = (active) => {
-  console.log(active, '999')
+  console.log(active, '999');
   if (active == 'safety') {
     return Api.exportSensorDayAlarmReport;
   } else {

+ 7 - 7
src/views/vent/performance/fileDetail/fileDetail.api.ts

@@ -13,10 +13,10 @@ enum Api {
   commit = '/safety/actBusiness/commit',
   getNowUserAgencyData = '/safety/approvalBusiness/getNowUserAgencyData',
   getNowUserApprovedData = '/safety/approvalBusiness/getNowUserApprovedData',
-  sumVentReport='/ventanaly-company/company/reportData/sumVentReport',
-  zipdownload='/ventanaly-sharefile/fileServer/zipdownload',
-  queryVentMonReportJd='/ventanaly-company/company/reportData/queryVentMonReportJd',
-  updataFileParam='/ventanaly-sharefile/fileServer/updataFileParam'
+  sumVentReport = '/company/reportData/sumVentReport',
+  zipdownload = '/ventanaly-sharefile/fileServer/zipdownload',
+  queryVentMonReportJd = '/company/reportData/queryVentMonReportJd',
+  updataFileParam = '/ventanaly-sharefile/fileServer/updataFileParam',
 }
 
 /**
@@ -32,17 +32,17 @@ export const updataFileParam = (params, handleSuccess) => {
  * 下载文件目录
  * @param params
  */
-export const zipdownload = (params) => defHttp.post({ url: Api.zipdownload, params, responseType: 'blob' },{ joinParamsToUrl: true });
+export const zipdownload = (params) => defHttp.post({ url: Api.zipdownload, params, responseType: 'blob' }, { joinParamsToUrl: true });
 /**
  * 汇总集团通风报表
  * @param params
  */
-export const sumVentReport = () => defHttp.post({ url: Api.sumVentReport, });
+export const sumVentReport = () => defHttp.post({ url: Api.sumVentReport });
 /**
  * 汇总集团通风报表
  * @param params
  */
-export const queryVentMonReportJd = () => defHttp.get({ url: Api.queryVentMonReportJd, });
+export const queryVentMonReportJd = () => defHttp.get({ url: Api.queryVentMonReportJd });
 
 /**
  * 左侧树接口

+ 10 - 11
src/views/vent/reportManager/reportManager.api.ts

@@ -10,20 +10,20 @@ enum Api {
   hisdownload = '/safety/reportLog/download',
   getQuery = '/sys/dict/reportKind/query',
   getUpload = '/safety/reportInfo/upload',
-  reportAdd= '/ventanaly-company/company/reportData/add',
-  queryDepartTreeSync= '/sys/sysDepart/queryDepartTreeSync',
-  synReportFile='/safety/reportInfo/synReportFile',
-  listMap='/ventanaly-company/company/reportData/list',
-  reportEdit='/ventanaly-company/company/reportData/edit',
-  reportDel='/ventanaly-company/company/reportData/delete',
-  queryTreeList='/sys/sysDepart/queryTreeList'
+  reportAdd = '/company/reportData/add',
+  queryDepartTreeSync = '/sys/sysDepart/queryDepartTreeSync',
+  synReportFile = '/safety/reportInfo/synReportFile',
+  listMap = '/company/reportData/list',
+  reportEdit = '/company/reportData/edit',
+  reportDel = '/company/reportData/delete',
+  queryTreeList = '/sys/sysDepart/queryTreeList',
 }
 
 /**
  * 部门树列表
  * @param params
  */
-export const queryTreeList = () => defHttp.get({ url: Api.queryTreeList, });
+export const queryTreeList = () => defHttp.get({ url: Api.queryTreeList });
 /**
  * 报表数据映射列表
  * @param params
@@ -39,7 +39,7 @@ export const synReportFile = (params) => defHttp.post({ url: Api.synReportFile,
  * 报表数据映射-所属部门编号列表
  * @param params
  */
-export const queryDepartTreeSync = () => defHttp.get({ url: Api.queryDepartTreeSync});
+export const queryDepartTreeSync = () => defHttp.get({ url: Api.queryDepartTreeSync });
 
 /**
  * 报表数据映射-添加
@@ -78,7 +78,6 @@ export const hisList = (params) => defHttp.get({ url: Api.hisList, params });
  */
 export const save = (params) => defHttp.post({ url: Api.save, params });
 
-
 /**
  * 删除用户
  */
@@ -108,4 +107,4 @@ export const getQuery = () => defHttp.get({ url: Api.getQuery });
  * 报表或模板上传
  * @param params
  */
-export const getUpload = (params) => defHttp.post({ headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, url: Api.getUpload, params });
+export const getUpload = (params) => defHttp.post({ headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, url: Api.getUpload, params });

Некоторые файлы не были показаны из-за большого количества измененных файлов