liuyanpeng hace 2 años
padre
commit
3ad6f4e884
Se han modificado 3 ficheros con 36 adiciones y 38 borrados
  1. 2 1
      src/main.js
  2. 33 36
      src/routes/main_routes.js
  3. 1 1
      src/window/tabGridView/TabGridEdit.vue

+ 2 - 1
src/main.js

@@ -41,7 +41,8 @@ import store from './store/index.js';
 
 import langZhCn from './locales/zh-CN.json';
 import langEnUs from './locales/en-US.json';
-
+import { Notify } from 'pc-component-v3/dist/pc-component-v3.js';
+window.Notify = Notify;
 
 const i18n = createI18n({
   locale: 'zh-CN',

+ 33 - 36
src/routes/main_routes.js

@@ -335,44 +335,41 @@ export default [
 
       { path: 'report-approve', component: ReportApprove },
 
+      // 执行列表
+      { path: '/lowcode-page/:lowcodeWindowNo', component: LowcodePage },
+      // 打印页面
+      { path: '/single/PrintPage', component: PrintPage },
+      // 卡片打印
+      { path: '/desktop/PrintCard', component: PrintCard },
 
 
+      //钉钉待办任务审批跳转
+      // eslint-disable-next-line
+      { path: '/window/window-read/:type/:windowNo/:tabIndex/:recordId', component: TabFormView },
+
+
+      { path: '/test', component: Test },
+      { path: '/webrt', component: WebRtcCapture },
+      { path: '/WebSocketCapture', component: WebSocketCapture },
+      { path: '/cropper', component: Cropper },
+      { path: '/camera', component: Camera },
+      { path: '/containerLayout', component: ContainerLayout },
+      { path: '/DynamicImport', component: DynamicImport },
+
+      { path: '/notFound', component: NotFound },
+      { path: '/privacy-statement', component: PrivacyStatement },
+      { path: '/studyVideo', component: StudyVideo },
+      { path: '/resetPassword', component: ResetPassword },
+
+      { path: '/retrievePassword', component: RetrievePassword },
+      { path: '/knowledgeTrain', component: KnowledgeTrain1 },
+      { path: '/knowledgeTrainAnswer', component: KnowledgeTrainAnswer },
+      { path: '/excelReport/:processReportNo', component: ExcelReport },
+      { path: '/dateExcelReport/:processReportNo', component: DateExcelReport },
+      { path: '/desktop/delegationReport', component: DelegationReport },
+      { path: '/desktop/dataArchive', component: DataArchive },//数据归档
+      { path: '/desktop/archivalRecord', component: ArchivalRecord },//数据归档记录下载
+      { path: '/desktop/excelImport', component: ExcelImport },
     ],
   },
-
-  // 执行列表
-  { path: '/lowcode-page/:lowcodeWindowNo', component: LowcodePage },
-  // 打印页面
-  { path: '/single/PrintPage', component: PrintPage },
-  // 卡片打印
-  { path: '/desktop/PrintCard', component: PrintCard },
-
-
-  //钉钉待办任务审批跳转
-  // eslint-disable-next-line
-  { path: '/window/window-read/:type/:windowNo/:tabIndex/:recordId', component: TabFormView },
-
-
-  { path: '/test', component: Test },
-  { path: '/webrt', component: WebRtcCapture },
-  { path: '/WebSocketCapture', component: WebSocketCapture },
-  { path: '/cropper', component: Cropper },
-  { path: '/camera', component: Camera },
-  { path: '/containerLayout', component: ContainerLayout },
-  { path: '/DynamicImport', component: DynamicImport },
-
-  { path: '/notFound', component: NotFound },
-  { path: '/privacy-statement', component: PrivacyStatement },
-  { path: '/studyVideo', component: StudyVideo },
-  { path: '/resetPassword', component: ResetPassword },
-
-  { path: '/retrievePassword', component: RetrievePassword },
-  { path: '/knowledgeTrain', component: KnowledgeTrain1 },
-  { path: '/knowledgeTrainAnswer', component: KnowledgeTrainAnswer },
-  { path: '/excelReport/:processReportNo', component: ExcelReport },
-  { path: '/dateExcelReport/:processReportNo', component: DateExcelReport },
-  { path: '/desktop/delegationReport', component: DelegationReport },
-  { path: '/desktop/dataArchive', component: DataArchive },//数据归档
-  { path: '/desktop/archivalRecord', component: ArchivalRecord },//数据归档
-  { path: '/desktop/excelImport', component: ExcelImport },//数据归档
 ];

+ 1 - 1
src/window/tabGridView/TabGridEdit.vue

@@ -760,7 +760,7 @@ export default {
         tabIndex: _self.tabIndex,
         filterParams: filterParams,
         simpleFilterCondition: simpleFilterCondition,
-        sortStr: _self.sortStr
+        sortStr: _self.sortStr,
       };
 
       _self.dataChanged = false;