Merge remote-tracking branch 'origin/master'

# Conflicts:
#	lib/数据更新脚本.txt

lib/数据更新脚本.txt

@@ -28,3 +28,71 @@ INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`,
 VALUES ('23f5e615-b16a-re3c-829d-dd85c2a00002', 3, '一般', 'reportResult', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
 INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`)
 VALUES ('23f5e615-b16a-re4c-829d-dd85c2a00002', 4, '差', 'reportResult', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
+
+
+
+-- 2024.7.11 专题建设
+-- ----------------------------
+-- Table structure for zz_mzpyxx
+-- ----------------------------
+DROP TABLE IF EXISTS `pf_dnjzjy`;
+CREATE TABLE `pf_dnjzjy`  (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
+  `dzzdm` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '面向对象（选择党组织）',
+  `jykssj` varchar(24) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '教育开始时间',
+  `jyjssj` varchar(24) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '教育结束时间',
+  `zt` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '主题',
+  `zygzbz` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '主要工作步骤',
+  `qddcx` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '取得的成效',
+  `create_time` datetime NULL  DEFAULT NULL COMMENT '创建时间',
+  `create_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
+  `update_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '修改人',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC COMMENT'党内集中教育';
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+-- 党建“双创”工作
+DROP TABLE IF EXISTS `pf_djscgz`;
+CREATE TABLE `pf_djscgz`  (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
+  `dzzdm` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '党组织（工作室）名称',
+  `pxqdsj` varchar(24) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '评选启动时间',
+  `pxjgqdsj` varchar(24) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '评选结果确定时间',
+  `pxjb` int NULL DEFAULT NULL COMMENT '评选级别 pxjbType',
+  `pxlb` int NULL DEFAULT NULL COMMENT '评选类别 pxlbType',
+  `zygzbz` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '主要工作步骤',
+  `create_time` datetime NULL  DEFAULT NULL COMMENT '创建时间',
+  `create_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
+  `update_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '修改人',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC COMMENT'党建“双创”工作';
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0001-0000-bdb74a278a72', 1, '国家级', 'pxjbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选级别', '2019-09-26 15:13:15', 'M', 'N');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0002-0000-bdb74a278a72', 2, '省级', 'pxjbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选级别', '2019-09-26 15:13:15', 'M', 'N');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0003-0000-bdb74a278a72', 3, '市级', 'pxjbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选级别', '2019-09-26 15:13:15', 'M', 'N');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0004-0000-bdb74a278a72', 4, '校级', 'pxjbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选级别', '2019-09-26 15:13:15', 'M', 'N');
+
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0011-0000-bdb74a278a72', 1, '示范高校', 'pxlbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选类别', '2019-09-26 15:13:15', 'M', 'N');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0022-0000-bdb74a278a72', 2, '标杆院系', 'pxlbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选类别', '2019-09-26 15:13:15', 'M', 'N');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0033-0000-bdb74a278a72', 3, '样板支部', 'pxlbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选类别', '2019-09-26 15:13:15', 'M', 'N');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('058a7fc0-7417-0044-0000-bdb74a278a72', 4, '“双带头人”教师党支部书记工作室', 'pxlbType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '评选类别', '2019-09-26 15:13:15', 'M', 'N');
+
+
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('1f783c90-a760-43db-8946-b24618f90175', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'c4516fca-2dd8-4373-9be8-1df510c8e5e1', NULL, 6, '专题建设', '专题建设', '', '', '', 1, 0, NULL);
+
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('bc66c398-074a-0000-82c1-126d465d1239', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'e6b08580-28bf-4051-813c-4e95032b6937', NULL, 2, 'home.pf_dnjzjyAdd', '新增党内集中教育', '', '', '', 0, 0, 1);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('bc66c398-074a-0001-82c1-126d465d1239', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'e6b08580-28bf-4051-813c-4e95032b6937', NULL, 3, 'home.pf_dnjzjyDetail', '查看党内集中教育详情', '', '', '', 0, 0, 1);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('bc66c398-074a-435c-82c1-126d465d1239', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'e6b08580-28bf-4051-813c-4e95032b6937', NULL, 1, 'home.pf_dnjzjyEdit', '编辑党内集中教育', '', '', '', 0, 0, 1);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('e6b08580-28bf-4051-813c-4e95032b6937', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '1f783c90-a760-43db-8946-b24618f90175', NULL, 1, 'home.pf_dnjzjyList', '党内集中教育', '', '', '', 1, 0, 0);
+
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('e6b08580-0003-4051-813c-4e95032b6937', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'e6b08580-0000-4051-813c-4e95032b6937', NULL, 2, 'home.pf_djscgzAdd', '新增党建“双创”工作', '', '', '', 0, 0, 1);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('e6b08580-0002-4051-813c-4e95032b6937', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'e6b08580-0000-4051-813c-4e95032b6937', NULL, 3, 'home.pf_djscgzDetail', '查看党建“双创”工作详情', '', '', '', 0, 0, 1);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('e6b08580-0001-4051-813c-4e95032b6937', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'e6b08580-0000-4051-813c-4e95032b6937', NULL, 1, 'home.pf_djscgzEdit', '编辑党建“双创”工作', '', '', '', 0, 0, 1);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('e6b08580-0000-4051-813c-4e95032b6937', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '1f783c90-a760-43db-8946-b24618f90175', NULL, 2, 'home.pf_djscgzList', '党建“双创”工作', '', '', '', 1, 0, 0);
+

parth5/parth5/src/app/views/tapp/tab-main/tab-main.module.ts

@@ -3,36 +3,7 @@ import {CommonModule} from '@angular/common';
 import {FormsModule} from '@angular/forms';
 import {IonicModule} from '@ionic/angular';
 import {TabMainPageRoutingModule} from './tab-main-routing.module';
-import {PartysearchComponent} from "../../../comm/modal/partysearch/partysearch.component";
-import {PartytreeComponent} from "../../../comm/modal/partytree/partytree.component";
-import {SearchComponent} from "../../../comm/modal/search/search.component";
-import {routes} from "./tab-main.route";
-import {EmptyComponent} from "../../../comm/modal/empty/empty.component";
-import {Routes} from "@angular/router";
-import {PartyselectComponent} from "../../../comm/modal/partyselect/partyselect.component";
-import {ImglistComponent} from "../../../comm/modal/imglist/imglist.component";
-import {PhotoshowComponent} from "../../../comm/modal/photoshow/photoshow.component";
-import {PhotoSwipeComponent} from "../../../comm/modal/photo-swipe/photo-swipe.component";
-import {MyfilterPipe} from "../../../comm/pipes/myfilter.pipe";
-import {SelectuserComponent} from "../../pages/partyuser/party-dues/selectuser/selectuser.component";
-import {BimageComponent} from "../../../comm/modal/bimage/bimage.component";
-import {UserselectPage} from "../../../comm/modal/userselect/userselect.page";
-
-const pubComponents = [
-  PartysearchComponent,
-  PartytreeComponent,
-  SearchComponent,
-  EmptyComponent,
-  PartyselectComponent,
-  ImglistComponent,
-  PhotoshowComponent,
-  PhotoSwipeComponent,
-  MyfilterPipe,
-  SelectuserComponent,
-  BimageComponent,
-  UserselectPage
-];
-
+import {TabMainPage} from "./tab-main.page";
 /*function getRoutesComponent(routes: Routes) {
   let components = [];
   routes.forEach(r => {
@@ -50,7 +21,7 @@ const pubComponents = [
     IonicModule,
     TabMainPageRoutingModule
   ],
-  declarations: [...routes.map(e => e.component), ...pubComponents]
+  declarations: [TabMainPage]
 })
 export class TabMainPageModule {
 }

parth5/parth5/src/app/views/tapp/tab-study/tab-study.module.ts

@@ -1,29 +1,18 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {FormsModule} from '@angular/forms';
-
 import {IonicModule} from '@ionic/angular';
-
 import {TabStudyPageRoutingModule} from './tab-study-routing.module';
-
-import {routes} from "./tab-study.route";
-import {PinchZoomModule} from "ngx-pinch-zoom";
-import {PdfViewerModule} from "ng2-pdf-viewer";
-import {ShowpdfComponent} from "../../../comm/modal/showpdf/showpdf.component";
-
-
-const pubComponents = [];
+import {TabStudyPage} from "./tab-study.page";
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    PinchZoomModule,
-    PdfViewerModule,
     TabStudyPageRoutingModule,
   ],
-  declarations: [...routes.map(e => e.component), ...pubComponents,ShowpdfComponent]
+  declarations: [TabStudyPage]
 })
 export class TabStudyPageModule {
 }

parth5/parth5/src/app/views/tapp/tab-user/tab-user.module.ts

@@ -1,16 +1,9 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-
-import { IonicModule } from '@ionic/angular';
-
-import { TabUserPageRoutingModule } from './tab-user-routing.module';
-
-import { routes } from "./tab-user.route";
-
-const pubComponents = [
-
-];
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
+import {IonicModule} from '@ionic/angular';
+import {TabUserPageRoutingModule} from './tab-user-routing.module';
+import {TabUserPage} from "./tab-user.page";
 
 @NgModule({
   imports: [
@@ -19,6 +12,7 @@ const pubComponents = [
     IonicModule,
     TabUserPageRoutingModule
   ],
-  declarations: [...routes.map(e => e.component), ...pubComponents]
+  declarations: [TabUserPage]
 })
-export class TabUserPageModule {}
+export class TabUserPageModule {
+}

parth5/parth5/src/app/views/tapp/tabs/tabs.module.ts

@@ -10,6 +10,98 @@ import {TabsPage} from './tabs.page';
 import {DragDropModule} from "@angular/cdk/drag-drop";
 import {RouterModule} from "@angular/router";
 import {QuillModule} from "ngx-quill";
+import {ShowpdfComponent} from "../../../comm/modal/showpdf/showpdf.component";
+import {PdfViewerModule} from "ng2-pdf-viewer";
+import {PinchZoomModule} from "ngx-pinch-zoom";
+import {PositionComponent} from "../../pages/propagandawork/position/position.component";
+import {EditComponent as PositionEditComponent} from "../../pages/propagandawork/position/edit/edit.component";
+import {DetailComponent as PositionDetailComponent} from "../../pages/propagandawork/position/detail/detail.component";
+import {EditComponent as PanelEditComponent} from "../../pages/propagandawork/position/panel/edit/edit.component";
+import {
+  DetailComponent as PanelDetailComponent
+} from "../../pages/propagandawork/position/panel/detail/detail.component";
+import {PartyDuesComponent} from "../../pages/partyuser/party-dues/party-dues.component";
+import {EditComponent as DuesEditComponent} from "../../pages/partyuser/party-dues/edit/edit.component";
+import {DetailComponent as DuesDetailComponent} from "../../pages/partyuser/party-dues/detail/detail.component";
+import {PartyInfoComponent} from "../../pages/party/party-info/party-info.component";
+import {DetailComponent as PartyDetailComponent} from "../../pages/party/party-info/detail/detail.component";
+import {EvaluateComponent} from "../../pages/party/party-info/detail/evaluate/evaluate.component";
+import {LeaderuserComponent} from "../../pages/party/party-info/detail/leaderuser/leaderuser.component";
+import {ManageuserComponent} from "../../pages/party/party-info/detail/manageuser/manageuser.component";
+import {RewardComponent} from "../../pages/party/party-info/detail/reward/reward.component";
+import {PartyUserComponent} from "../../pages/partyuser/party-user/party-user.component";
+import {DetailComponent as UserDetailComponent} from "../../pages/partyuser/party-user/detail/detail.component";
+import {DemocracyComponent} from "../../pages/partyuser/party-user/detail/democracy/democracy.component";
+import {PartyhelpComponent} from "../../pages/partyuser/party-user/detail/partyhelp/partyhelp.component";
+import {PunishComponent} from "../../pages/partyuser/party-user/detail/punish/punish.component";
+import {TrainComponent} from "../../pages/partyuser/party-user/detail/train/train.component";
+import {
+  RewardComponent as PartyUserRewardComponent
+} from "../../pages/partyuser/party-user/detail/reward/reward.component";
+import {ShykComponent} from "../../pages/partylife/shyk/shyk.component";
+import {EditComponent as ShykEditComponent} from "../../pages/partylife/shyk/edit/edit.component";
+import {DetailComponent as ShykDetailComponent} from "../../pages/partylife/shyk/detail/detail.component";
+import {RecordComponent} from "../../pages/partylife/shyk/record/record.component";
+import {PartysearchComponent} from "../../../comm/modal/partysearch/partysearch.component";
+import {PartytreeComponent} from "../../../comm/modal/partytree/partytree.component";
+import {SearchComponent} from "../../../comm/modal/search/search.component";
+import {EmptyComponent} from "../../../comm/modal/empty/empty.component";
+import {PartyselectComponent} from "../../../comm/modal/partyselect/partyselect.component";
+import {ImglistComponent} from "../../../comm/modal/imglist/imglist.component";
+import {PhotoshowComponent} from "../../../comm/modal/photoshow/photoshow.component";
+import {PhotoSwipeComponent} from "../../../comm/modal/photo-swipe/photo-swipe.component";
+import {MyfilterPipe} from "../../../comm/pipes/myfilter.pipe";
+import {SelectuserComponent} from "../../pages/partyuser/party-dues/selectuser/selectuser.component";
+import {BimageComponent} from "../../../comm/modal/bimage/bimage.component";
+import {UserselectPage} from "../../../comm/modal/userselect/userselect.page";
+import {routes as MainRoutes} from "../tab-main/tab-main.route";
+import {routes as StudyRoutes} from "../tab-study/tab-study.route";
+import {routes as UserRoutes} from "../tab-user/tab-user.route";
+
+const pageComponents = [
+  PositionComponent,
+  PositionEditComponent,
+  PositionDetailComponent,
+  PanelEditComponent,
+  PanelDetailComponent,
+  PartyDuesComponent,
+  DuesEditComponent,
+  DuesDetailComponent,
+  PartyInfoComponent,
+  PartyDetailComponent,
+  EvaluateComponent,
+  LeaderuserComponent,
+  ManageuserComponent,
+  RewardComponent,
+  PartyUserComponent,
+  UserDetailComponent,
+  DemocracyComponent,
+  PartyhelpComponent,
+  PunishComponent,
+  TrainComponent,
+  ShykComponent,
+  ShykEditComponent,
+  ShykDetailComponent,
+  RecordComponent,
+  PartyUserRewardComponent
+];
+
+const pubComponents = [
+  PartysearchComponent,
+  PartytreeComponent,
+  SearchComponent,
+  EmptyComponent,
+  PartyselectComponent,
+  ImglistComponent,
+  PhotoshowComponent,
+  PhotoSwipeComponent,
+  MyfilterPipe,
+  SelectuserComponent,
+  BimageComponent,
+  UserselectPage,
+  ShowpdfComponent
+];
+
 
 @NgModule({
   imports: [
@@ -19,9 +111,11 @@ import {QuillModule} from "ngx-quill";
     DragDropModule,
     RouterModule,
     QuillModule,
+    PdfViewerModule,
+    PinchZoomModule,
     TabsPageRoutingModule
   ],
-  declarations: [TabsPage]
+  declarations: [TabsPage,...pageComponents, ...pubComponents]
 })
 export class TabsPageModule {
 }

src/main/resources/static/app/main/partylife/djscgz/list.html

@@ -176,7 +176,10 @@
                                     <td>{{it.pxjbtypename}}</td>
                                     <td>{{it.pxlbtypename}}</td>
                                     <td style="min-width: 150px !important;word-wrap: break-word;word-break: break-all;white-space: normal;">{{it.zygzbz}}</td>
-                                    <td>{{it.createusername}}</td>
+                                    <td>{{it.createusername}}
+                                        <img ng-src="../../api/home/showDbImg/127687" onerror="this.src='images/man.jpg'" width="48" height="48"
+                                             alt="User" style="width: 100px;height: 120px;"/>
+                                    </td>
                                     <td>{{it.createTime | date:'yyyy-MM-dd'}}</td>
                                 </tr>
                                 <tr ng-if="dataList.length<=0">

src/main/resources/static/app/main/publicity/position/list.html

@@ -200,8 +200,8 @@
                                     </td>
                                     <td style="width: 120px;">
                                         <img-component data-filerefid="it.PANELID" data-filetypeid="4"
-                                                       data-ismulti="false" data-height="80"
-                                                       data-width="120" data-readonly="true"></img-component>
+                                                       data-ismulti="true" data-height="40"
+                                                       data-width="60" data-readonly="false"></img-component>
                                         <img ng-if="it.PANELID==null || it.PANELID==''" src="images/nopic.png" width="120" height="80"/>
                                     </td>
                                     <td>{{it.POSITIONNAME}}</td>