additional commit

abweb/common/js/constant.js

@@ -60,6 +60,12 @@ CONSTANT.URL = {
             SAVE_DASHBOARD_SETTING: 'saveDashboardSetting/',
             SAVE_DASHBOARD_SETTING: 'saveDashboardSetting/',
             PUSH_MESSAGE_TEMPLATE: 'pushMessageTemplate/',
             PUSH_MESSAGE_TEMPLATE: 'pushMessageTemplate/',
             OPERATION_SELECT: 'operationSelect/',
             OPERATION_SELECT: 'operationSelect/',
+            NEW_REPORT: 'newReport/',
+            WORKING_FLOW: 'workingFlow/',
+            WARNING_WITH_REPORT: 'warningWithReport/',
+            PUSH_MESSAGE_DETAIL: 'pushMessageDetail/',
+            PUSH_MESSAGE_LIST: 'pushMessageList/',
+            SEND_PUSH_MESSAGE: 'sendPushMessage/',
 
 
         },
         },
         HTML: {
         HTML: {

abweb/js/dashboardSetting/dashboard-setting.js

@@ -122,7 +122,7 @@ DashboardSetting.saveSetting = function () {
         const element = DashboardSetting.elementItems[key];
         const element = DashboardSetting.elementItems[key];
         param[key] = element.enabled ? 1 : 0;
         param[key] = element.enabled ? 1 : 0;
     }
     }
-    const url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + 'saveDashboardSetting/';
+    const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.API.SAVE_DASHBOARD_SETTING;
     COMMON.cmsAjax(url, param, false, function (json) {
     COMMON.cmsAjax(url, param, false, function (json) {
         DashboardSetting.closeModal();
         DashboardSetting.closeModal();
         if (DashboardSetting.changeSettingCallback && typeof DashboardSetting.changeSettingCallback === 'function') {
         if (DashboardSetting.changeSettingCallback && typeof DashboardSetting.changeSettingCallback === 'function') {

abweb/js/operationList/operationList.js

@@ -539,7 +539,7 @@ OL.saveOperationReadingLog = function (operationId, operationType, reportType) {
  * @returns url
  * @returns url
  */
  */
 OL.createUrlOfOperation = function (enableAddReport, reportType) {
 OL.createUrlOfOperation = function (enableAddReport, reportType) {
-    let baseUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.HTML.BASE;
+    let baseUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.HTML.BASE;
     if (reportType == CONSTANT.REPORT_TYPE.ROUTINE || enableAddReport == '1') {
     if (reportType == CONSTANT.REPORT_TYPE.ROUTINE || enableAddReport == '1') {
         return baseUrl + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST;
         return baseUrl + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST;
     } else {
     } else {

abweb/js/pickup/pickup.js

@@ -48,9 +48,9 @@ PICKUP.defaultPickupList = {
 }
 }
 
 
 PICKUP.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath);
 PICKUP.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath);
-PICKUP.getNewReportListApiUrl = PICKUP.baseApiUrl + 'newReport';
-PICKUP.getContinuousWorkListApiUrl = PICKUP.baseApiUrl + 'workingFlow';
-PICKUP.getReportWithWarningsListApiUrl = PICKUP.baseApiUrl + 'warningWithReport';
+PICKUP.getNewReportListApiUrl = PICKUP.baseApiUrl + CONSTANT.URL.CMS.API.NEW_REPORT;
+PICKUP.getContinuousWorkListApiUrl = PICKUP.baseApiUrl + CONSTANT.URL.CMS.API.WORKING_FLOW;
+PICKUP.getReportWithWarningsListApiUrl = PICKUP.baseApiUrl + CONSTANT.URL.CMS.API.WARNING_WITH_REPORT;
 
 
 /**
 /**
  * Call get new report list api get data 
  * Call get new report list api get data 

abweb/js/pushMessageDetail/push-message-detail.js

 var PushMessageDetail = {};
 var PushMessageDetail = {};
 
 
-PushMessageDetail.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + 'pushMessageDetail/';
+PushMessageDetail.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.API.PUSH_MESSAGE_DETAIL;
 
 
 PushMessageDetail.dummyMessageDetailJson = {
 PushMessageDetail.dummyMessageDetailJson = {
     pushMessageId: 1,
     pushMessageId: 1,

abweb/js/pushMessageList/push-message-list.js

@@ -3,7 +3,7 @@
  * @since cms:1.4.3.2&1.4.3.3 web:1.0
  * @since cms:1.4.3.2&1.4.3.3 web:1.0
  */
  */
 var PushMessageList = {};
 var PushMessageList = {};
-PushMessageList.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + 'pushMessageList/';
+PushMessageList.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + '';
 
 
 /**
 /**
  * Init when html onload
  * Init when html onload

abweb/js/sendMessage/send-message.js

@@ -5,7 +5,7 @@
  */
  */
 var SendMessage = {};
 var SendMessage = {};
 
 
-SendMessage.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + 'sendPushMessage/';
+SendMessage.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.API.SEND_PUSH_MESSAGE;
 
 
 /**
 /**
  * Get input content
  * Get input content