tony001 发布系统代码 [TrainSys，Mob]

74427977 · ibizdev · 1d5e8b13 · 74427977 · 74427977 · 74427977
--- a/app_Mob/CHANGELOG.md
+++ b/app_Mob/CHANGELOG.md
+# 版本变更日志
+
+这个项目的所有关键变化都将记录在此文件中.
+
+此日志格式基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/),
+并且此项目遵循 [Semantic Versioning](https://semver.org/lang/zh-CN/).
+
+## [Unreleased]
+
+## [0.0.1] - 2023-11-01
+
+### Added
+
+- 初始化0.0.1
--- a/app_Mob/package.json
+++ b/app_Mob/package.json
@@ -11,14 +11,14 @@
  },
  "dependencies": {
    "@ibiz-template-package/vs-tree-ex": "^0.1.1",
-    "@ibiz-template/core": "0.2.0",
-    "@ibiz-template/mob-theme": "^0.2.5",
-    "@ibiz-template/mob-vue3-components": "0.0.1-alpha.16",
-    "@ibiz-template/model-helper": "0.2.0",
-    "@ibiz-template/runtime": "0.2.0",
+    "@ibiz-template/core": "0.2.6",
+    "@ibiz-template/mob-theme": "^0.2.6",
+    "@ibiz-template/mob-vue3-components": "0.0.1-alpha.17",
+    "@ibiz-template/model-helper": "0.2.9",
+    "@ibiz-template/runtime": "0.2.9",
    "@ibiz-template/theme": "0.2.0",
-    "@ibiz-template/vue3-util": "0.2.0",
-    "@ibiz/model-core": "^0.0.19",
+    "@ibiz-template/vue3-util": "0.2.9",
+    "@ibiz/model-core": "^0.0.20",
    "async-validator": "^4.2.5",
    "dayjs": "^1.11.10",
    "echarts": "^5.4.3",

--- a/app_Mob/public/environments/environment.js
+++ b/app_Mob/public/environments/environment.js
@@ -2,7 +2,7 @@ window.Environment = {
  // 是否为开发模式
  dev: false,
  // 日志输出级别, 支持: TRACE、DEBUG、INFO、WARN、ERROR、SILENT
-  logLevel: 'ERROR',
+  logLevel: 'TRACE',
  BaseUrl: '/api',
  isMob: true,
  pluginBaseUrl: 'http://unpkg.zhr.icu:8088',
@@ -29,7 +29,7 @@ window.Environment = {
  // 应用标题
  AppTitle: '应用首页',
  hub: false,
-  enableMqtt: true,
+  enableMqtt: false,
  mqttUrl: '/portal/mqtt/mqtt',
  // isLocalModel: true,
 };
--- a/app_Mob/public/extras/js/mqtt/2.18.9/mqtt.min.js
+++ b/app_Mob/public/extras/js/mqtt/2.18.9/mqtt.min.js
--- a/app_Mob/src/components/home-view/home-view.scss
+++ b/app_Mob/src/components/home-view/home-view.scss
+@include b(home-view) {
+    &.ibiz-view-appindexview {
+        .ibiz-view-content {
+            overflow-y: auto;
+        }
+    }
+}
\ No newline at end of file
--- a/app_Mob/src/components/home-view/home-view.tsx
+++ b/app_Mob/src/components/home-view/home-view.tsx
 import { defineComponent, PropType } from 'vue';
 import { IModal, Modal, ViewMode } from '@ibiz-template/runtime';
+import './home-view.scss';
+import { useNamespace } from '@ibiz-template/vue3-util';

 export const HomeView = defineComponent({
  name: 'HomeView',
@@ -10,6 +12,7 @@ export const HomeView = defineComponent({
    },
  },
  setup(props) {
+    const ns = useNamespace('home-view');
    const viewModal = new Modal({
      mode: ViewMode.ROUTE,
      viewUsage: 1,
@@ -18,9 +21,14 @@ export const HomeView = defineComponent({
        props.modal.dismiss();
      },
    });
-    return { viewModal };
+    return { viewModal, ns };
  },
  render() {
-    return <iBizRouterView modal={this.viewModal}></iBizRouterView>;
+    return (
+      <iBizRouterView
+        class={this.ns.b()}
+        modal={this.viewModal}
+      ></iBizRouterView>
+    );
  },
 });
--- a/app_Mob/src/guard/auth-guard/auth-guard.ts
+++ b/app_Mob/src/guard/auth-guard/auth-guard.ts
@@ -95,6 +95,8 @@ async function initModel(permission: boolean = true): Promise<void> {
      ibiz.appData?.dynamodeltag || '',
      ibiz.env.appId,
    );
+    const app = await helper.getAppModel();
+    ibiz.env.isMob = app.mobileApp === true;
    if (ibiz.env.isEnableMultiLan) {
      const lang = ibiz.i18n.getLang();
      const m = await helper.getPSAppLang(lang.replace('-', '_').toUpperCase());

--- a/app_Mob/src/router/index.ts
+++ b/app_Mob/src/router/index.ts
@@ -2,13 +2,13 @@ import { Router, createRouter, createWebHashHistory } from 'vue-router';
 import {
  AppRedirectView,
  View404,
+  LoginView,
  useViewStack,
 } from '@ibiz-template/mob-vue3-components';
 import { Modal, ViewMode } from '@ibiz-template/runtime';
 import { isNilOrEmpty } from 'qx-util';
 import { AuthGuard } from '../guard';
 import { RouterShell, HomeView } from '@/components';
-import { LoginView } from '@/components/login-view/login-view';

 const getPropsCallback = (depth: number) => {
  if (depth === 1) {

--- a/app_Mob/vite.config.ts
+++ b/app_Mob/vite.config.ts
@@ -27,6 +27,32 @@ export default defineConfig({
      '@': path.resolve(__dirname, 'src'),
    },
  },
+  optimizeDeps: {
+    entries: [
+      '@ibiz-template-package/vs-tree-ex',
+      '@ibiz-template/core',
+      '@ibiz-template/mob-theme',
+      '@ibiz-template/mob-vue3-components',
+      '@ibiz-template/model-helper',
+      '@ibiz-template/runtime',
+      '@ibiz-template/theme',
+      '@ibiz-template/vue3-util',
+      '@ibiz/model-core',
+      'async-validator',
+      'dayjs',
+      'echarts',
+      'ionicons',
+      'lodash-es',
+      'pinia',
+      'qs',
+      'qx-util',
+      'ramda',
+      'vant',
+      'vue',
+      'vue-i18n',
+      'vue-router',
+    ],
+  },
  build: {
    rollupOptions: {
      external: [
@@ -43,6 +69,7 @@ export default defineConfig({
        'lodash-es',
        'qx-util',
        'pinia',
+        'mqtt/dist/mqtt.min',
        'cherry-markdown',
        '@ibiz-template-package/vs-tree-ex',
        '@ibiz-template/core',
@@ -66,14 +93,57 @@ export default defineConfig({
        rewrite(path) {
          return path.replace('/api/ls__lsmob/remotemodel', '/ls__lsmob/model');
        },
-        target: 'http://172.16.103.189:20003',
+        target: 'http://localhost:20003',
        changeOrigin: true,
      },
      '/api/ls__lsmob': {
        rewrite(path) {
          return path.replace('/api/ls__lsmob', '/api');
        },
-        target: 'http://node:8081',
+        target: 'http://localhost:8081',
+        changeOrigin: true,
+      },
+      '/api/pms__sclpmsmob': {
+        // rewrite(path) {
+        //   return path.replace('/api/pms__sclpmsmob', '/api');
+        // },
+        target: 'http://172.16.103.158:30164/',
+        changeOrigin: true,
+      },
+      '/api/demosys__mobvue3/portal/mqtt/mqtt': {
+        rewrite(path) {
+          return path.replace('/api', '');
+        },
+        target: 'ws://172.16.103.169:30350',
+        changeOrigin: true,
+      },
+      '/api/demosys__mobvue3': {
+        rewrite(path) {
+          return path.replace('/api', '/api');
+        },
+        target: 'http://172.16.103.169:30350',
+        changeOrigin: true,
+      },
+      '/api/cxfhmgmt__cxfhappmob': {
+        rewrite(path) {
+          return path.replace('/api', '');
+        },
+        target: 'http://172.16.103.158:30086',
+        changeOrigin: true,
+      },
+      '/api/qdehr__qdehrapp/portal/mqtt/mqtt': {
+        rewrite(path) {
+          return path.replace('/api', '');
+        },
+        ws: true,
+        target: 'ws://172.16.240.140:46020',
+        changeOrigin: true,
+      },
+      '/api/qdehr__qdehrapp': {
+        rewrite(path) {
+          return path.replace('/api', '');
+        },
+        target: 'http://172.16.240.140:46020',
        changeOrigin: true,
      },
    },

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1432,16 +1432,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ]
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -11189,16 +11189,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ]
  }, {
@@ -11227,22 +11227,22 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
      }
    } ]
  }, {
@@ -11259,10 +11259,10 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -11271,34 +11271,28 @@
        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
      },
      "position" : "POPUP"
-    }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
    }, {
      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
@@ -11306,19 +11300,11 @@
        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg9"
+      }
    }, {
      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
@@ -11326,10 +11312,10 @@
        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
      }
    }, {
      "name" : "关闭模式-本次删除-上方-警告",
@@ -11337,6 +11323,20 @@
        "modelref" : true,
        "id" : "ViewMsg13"
      }
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "消息类型-错误信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    } ]
  }, {
    "codeName" : "VMGroup5",
@@ -11364,16 +11364,16 @@
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    } ]
  } ],