Home Explore Help
Register Sign In
usoft
/
uas-office-integration
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'dev' of ssh://10.10.100.21/source/uas-office-integration into dev

 Conflicts:
	uas-office-web/uas-mobile/src/configs/api.config.js
RaoMeng 5 years ago
parent
a760b8074e 5ae8b44e84
commit
6a5d59d3cb
12 changed files with 84 additions and 93 deletions
Split View Show Diff Stats
  1. 1 0
      uas-office-web/uas-mobile/package.json
  2. BIN
      uas-office-web/uas-mobile/public/favicon.ico
  3. 2 2
      uas-office-web/uas-mobile/public/index.html
  4. BIN
      uas-office-web/uas-mobile/public/logo192.png
  5. BIN
      uas-office-web/uas-mobile/public/logo512.png
  6. 1 11
      uas-office-web/uas-mobile/public/manifest.json
  7. BIN
      uas-office-web/uas-mobile/public/uas.ico
  8. 72 72
      uas-office-web/uas-mobile/src/configs/api.config.js
  9. 2 2
      uas-office-web/uas-mobile/src/configs/router.config.js
  10. 2 2
      uas-office-web/uas-mobile/src/pages/private/subscribe/SubscribeAlready.jsx
  11. 2 2
      uas-office-web/uas-mobile/src/pages/private/subscribe/SubscribeList.jsx
  12. 2 2
      uas-office-web/uas-mobile/src/pages/private/subscribe/SubscribeNot.jsx

+ 1 - 0
uas-office-web/uas-mobile/package.json
View File 

@@ -2,6 +2,7 @@
 
   "name": "uas-mobile",
 
   "version": "0.1.0",
 
   "private": true,
 
+  "homepage": ".",
 
   "dependencies": {
 
     "@ant-design/icons": "^4.2.2",
 
     "@antv/data-set": "^0.11.1",

BIN
uas-office-web/uas-mobile/public/favicon.ico
View File


+ 2 - 2
uas-office-web/uas-mobile/public/index.html
View File 

@@ -2,14 +2,14 @@
 
 <html lang="en">
 
 <head>
 
     <meta charset="utf-8"/>
 
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico"/>
 
+    <link rel="icon" href="%PUBLIC_URL%/uas.ico"/>
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no"/>
 
     <meta name="theme-color" content="#000000"/>
 
     <meta
 
             name="description"
 
             content="Web site created using create-react-app"
 
     />
 
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png"/>
 
+    <!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png"/> -->
 
     <!--
 
       manifest.json provides metadata used when your web app is installed on a
 
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

BIN
uas-office-web/uas-mobile/public/logo192.png
View File


BIN
uas-office-web/uas-mobile/public/logo512.png
View File


+ 1 - 11
uas-office-web/uas-mobile/public/manifest.json
View File 

@@ -3,19 +3,9 @@
 
   "name": "Create React App Sample",
 
   "icons": [
 
     {
 
-      "src": "favicon.ico",
 
+      "src": "uas.ico",
 
       "sizes": "64x64 32x32 24x24 16x16",
 
       "type": "image/x-icon"
 
-    },
 
-    {
 
-      "src": "logo192.png",
 
-      "type": "image/png",
 
-      "sizes": "192x192"
 
-    },
 
-    {
 
-      "src": "logo512.png",
 
-      "type": "image/png",
 
-      "sizes": "512x512"
 
     }
 
   ],
 
   "start_url": ".",

BIN
uas-office-web/uas-mobile/public/uas.ico
View File


+ 72 - 72
uas-office-web/uas-mobile/src/configs/api.config.js
View File 

@@ -1,72 +1,72 @@
 
-/**

- * Created by RaoMeng on 2020/10/21

- * Desc: 项目接口

- */

-

-export const _host = window.location.origin

-  // && 'http://10.1.7.104:8090/ERP'//吴炳

-  // && 'http://10.1.7.44:8081/erp'//吴雨骁

-  // && 'http://usoft.f3322.net:10007/uas'

-

-export const _baseURL = _host + (process.env.REACT_APP_ROUTER_BASE_NAME || '')

-

-export const API = {

-  /*******************************通用*************************************/

-  //登录ERP

-  COMMON_LOGIN: _baseURL + '/common/login.action',

-  //应用红点数

-  APPCOMMON_COUNT: _baseURL + '/mobile/appcommon/count/',

-

-  /*******************************应用*************************************/

-  //应用菜单列表

-  APPCOMMON_GETSERVICE: _baseURL + '/mobile/appweb/services/getServices.action',

-  //保存常用应用

-  APPCOMMON_SAVESERVICES: _baseURL +

-    '/mobile/appweb/services/saveServices.action',

-  //获取应用状态列表

-  SERVICES_GETORDERTAB: _baseURL + '/mobile/appweb/services/getOrderTab.action',

-  //获取应用列表

-  SETVICES_GETORDERLIST: _baseURL +

-    '/mobile/appweb/services/getOrderList.action',

-

-  /*******************************报表*************************************/

-  //获取报表菜单

-  REPORT_QUERYREPORTLIST: _baseURL +

-    '/mobile/appweb/report/queryReportList.action',

-  //获取报表列表

-  REPORT_GETREPORTLIST: _baseURL + '/mobile/appweb/report/getReportList.action',

-

-  /*******************************待办*************************************/

-  //待办事项目列表

-  APPCOMMON_TASKTODO: _baseURL + '/mobile/appcommon/list/taskToDo.action',

-

-  /*******************************日程*************************************/

-  //日程主界面

-  APPCOMMON_DAILYTASKTOTAL: _baseURL +

-    '/mobile/appweb/schedule/getCurrentScheduleList.action',

-  //日程具体日期

-  APPCOMMON_DAILYTASK: _baseURL + '/mobile/appweb/schedule/getSchedule.action',

-  //日程月份状态

-  APPCOMMON_MONTHLYTASKSTATUS: _baseURL +

-    '/mobile/appweb/schedule/getScheduleList.action',

-

-  /*******************************订阅*************************************/

-  //获取可订阅列表

-  SUBSCRIBE_GETSUBSCRIBELIST: _baseURL +

-    '/mobile/appweb/subscribe/getSubscribeList.action',

-  //获取已订阅类别

-  SUBSCRIBE_GETMYSUBSCRIBEDLIST: _baseURL +

-    '/mobile/appweb/subscribe/getMySubscribedList.action',

-  //获取订阅推送列表

-  SUBSCRIBE_SUBSCRIBETOPUSH: _baseURL +

-    '/mobile/appweb/subscribe/subscribeToPush.action',

-  //申请订阅

-  SUBSCRIBE_APPLYSUBSCRIBE: _baseURL +

-    '/mobile/appweb/subscribe/applySubscribe.action',

-  //退订

-  SUBSCRIBE_CANCELSUBSCRIBE: _baseURL +

-    '/mobile/appweb/subscribe/cancelSubscribe.action',

-  //加到首页

-  SUBSCRIBE_ADDSUBSCRIBETOMAIN: _baseURL +

-    '/mobile/appweb/subscribe/addSubscribeToMain.action',

-}

+/**
 
+ * Created by RaoMeng on 2020/10/21
 
+ * Desc: 项目接口
 
+ */
 
+
 
+export const _host = window.location.origin
 
+  // && 'http://10.1.7.104:8090/ERP'//吴炳
 
+  // && 'http://usoft.f3322.net:10007/uas'
 
+  // && 'http://10.1.7.44:8081/erp'//吴雨骁
 
+
 
+export const _baseURL = _host + (process.env.REACT_APP_ROUTER_BASE_NAME || '')
 
+
 
+export const API = {
 
+  /*******************************通用*************************************/
 
+  //登录ERP
 
+  COMMON_LOGIN: _baseURL + '/common/login.action',
 
+  //应用红点数
 
+  APPCOMMON_COUNT: _baseURL + '/mobile/appcommon/count/',
 
+
 
+  /*******************************应用*************************************/
 
+  //应用菜单列表
 
+  APPCOMMON_GETSERVICE: _baseURL + '/mobile/appweb/services/getServices.action',
 
+  //保存常用应用
 
+  APPCOMMON_SAVESERVICES: _baseURL +
 
+    '/mobile/appweb/services/saveServices.action',
 
+  //获取应用状态列表
 
+  SERVICES_GETORDERTAB: _baseURL + '/mobile/appweb/services/getOrderTab.action',
 
+  //获取应用列表
 
+  SETVICES_GETORDERLIST: _baseURL +
 
+    '/mobile/appweb/services/getOrderList.action',
 
+
 
+  /*******************************报表*************************************/
 
+  //获取报表菜单
 
+  REPORT_QUERYREPORTLIST: _baseURL +
 
+    '/mobile/appweb/report/queryReportList.action',
 
+  //获取报表列表
 
+  REPORT_GETREPORTLIST: _baseURL + '/mobile/appweb/report/getReportList.action',
 
+
 
+  /*******************************待办*************************************/
 
+  //待办事项目列表
 
+  APPCOMMON_TASKTODO: _baseURL + '/mobile/appcommon/list/taskToDo.action',
 
+
 
+  /*******************************日程*************************************/
 
+  //日程主界面
 
+  APPCOMMON_DAILYTASKTOTAL: _baseURL +
 
+    '/mobile/appweb/schedule/getCurrentScheduleList.action',
 
+  //日程具体日期
 
+  APPCOMMON_DAILYTASK: _baseURL + '/mobile/appweb/schedule/getSchedule.action',
 
+  //日程月份状态
 
+  APPCOMMON_MONTHLYTASKSTATUS: _baseURL +
 
+    '/mobile/appweb/schedule/getScheduleList.action',
 
+
 
+  /*******************************订阅*************************************/
 
+  //获取可订阅列表
 
+  SUBSCRIBE_GETSUBSCRIBELIST: _baseURL +
 
+    '/mobile/appweb/subscribe/getSubscribeList.action',
 
+  //获取已订阅类别
 
+  SUBSCRIBE_GETMYSUBSCRIBEDLIST: _baseURL +
 
+    '/mobile/appweb/subscribe/getMySubscribedList.action',
 
+  //获取订阅推送列表
 
+  SUBSCRIBE_SUBSCRIBETOPUSH: _baseURL +
 
+    '/mobile/appweb/subscribe/subscribeToPush.action',
 
+  //申请订阅
 
+  SUBSCRIBE_APPLYSUBSCRIBE: _baseURL +
 
+    '/mobile/appweb/subscribe/applySubscribe.action',
 
+  //退订
 
+  SUBSCRIBE_CANCELSUBSCRIBE: _baseURL +
 
+    '/mobile/appweb/subscribe/cancelSubscribe.action',
 
+  //加到首页
 
+  SUBSCRIBE_ADDSUBSCRIBETOMAIN: _baseURL +
 
+    '/mobile/appweb/subscribe/addSubscribeToMain.action',
 
+}

+ 2 - 2
uas-office-web/uas-mobile/src/configs/router.config.js
View File 

@@ -1,6 +1,6 @@
 
 import React from 'react'

 import {

-  BrowserRouter as Router,

+  HashRouter as Router,

   Route,

   Redirect,

   Switch,

@@ -78,7 +78,7 @@ class Routes extends React.Component {
 
 

   render () {

     return <Router

-      basename={(process.env.REACT_APP_ROUTER_BASE_NAME || '') + '/uas'}

+      basename={(process.env.REACT_APP_ROUTER_BASE_NAME || '') + '/uasMobile'}

       getUserConfirmation={getConfirmation}>

       <div style={{ width: '100%', height: '100%' }}>

         <Switch>

+ 2 - 2
uas-office-web/uas-mobile/src/pages/private/subscribe/SubscribeAlready.jsx
View File 

@@ -11,7 +11,7 @@ import { requestMySubscribe } from '../../../utils/private/subscribe.util'
 
 import { isObjEmpty } from '../../../utils/common/common.util'

 import RefreshLayout

   from '../../../components/common/refreshLayout/RefreshLayout'

-import { _host, API } from '../../../configs/api.config'

+import { _baseURL, _host, API } from '../../../configs/api.config'

 import { SUBSCRIBE_ITEM_ALREADY } from '../../../configs/constans.config'

 import { Toast } from 'antd-mobile'

 import { fetchPostObj } from '../../../utils/common/fetchRequest'

@@ -84,7 +84,7 @@ class SubscribeAlready extends Component {
 
   }

 

   onSubItemClick = (subObj) => {

-    window.open(_host + '/common/charts/mobilePreview.action?id=' + subObj.id)

+    window.open(_baseURL + '/common/charts/mobilePreview.action?id=' + subObj.id)

   }

 

   /**

+ 2 - 2
uas-office-web/uas-mobile/src/pages/private/subscribe/SubscribeList.jsx
View File 

@@ -12,7 +12,7 @@ import { isObjEmpty } from '../../../utils/common/common.util'
 
 import SubscribeGroup

   from '../../../components/private/subscribe/SubscribeGroup'

 import { fetchPostObj } from '../../../utils/common/fetchRequest'

-import { _host, API } from '../../../configs/api.config'

+import { _baseURL, _host, API } from '../../../configs/api.config'

 import { message } from 'antd'

 import { saveListState } from '../../../redux/actions/listState'

 import { LIST_PAGE_SIZE } from '../../../configs/constans.config'

@@ -180,7 +180,7 @@ class SubscribeList extends Component {
 
         listData: mSubscribeList,

       })

       window.open(

-        _host + '/common/charts/mobileCharts.action?numId=' + subObj.NUM_ID_

+        _baseURL + '/common/charts/mobileCharts.action?numId=' + subObj.NUM_ID_

         + '&mainId=' + subObj.INSTANCE_ID_

         + '&insId=' + subObj.ID_

         + '&title=' + subObj.TITLE_,

+ 2 - 2
uas-office-web/uas-mobile/src/pages/private/subscribe/SubscribeNot.jsx
View File 

@@ -14,7 +14,7 @@ import { isObjEmpty } from '../../../utils/common/common.util'
 
 import { requestSubscribeConfig } from '../../../utils/private/subscribe.util'

 import RefreshLayout

   from '../../../components/common/refreshLayout/RefreshLayout'

-import { _host, API } from '../../../configs/api.config'

+import { _baseURL, _host, API } from '../../../configs/api.config'

 import { Toast } from 'antd-mobile'

 import { fetchPostObj } from '../../../utils/common/fetchRequest'

 import { message } from 'antd'

@@ -113,7 +113,7 @@ class SubscribeNot extends Component {
 
   }

 

   onSubItemClick = (subObj) => {

-    window.open(_host + '/common/charts/mobilePreview.action?id=' + subObj.id)

+    window.open(_baseURL + '/common/charts/mobilePreview.action?id=' + subObj.id)

   }

 

   onSubSelect = (subObj) => {