Merge remote-tracking branch 'origin/master'

src/main/java/com/ghsc/partybuild/controller/PublicityController.java

@@ -133,10 +133,17 @@ public class PublicityController {
 
     @ResponseBody
     @RequestMapping("/savePublicityPosition")
-    public RequsetData<String> savePublicityPosition(@RequestBody PubPublicityposition model) {
+    public RequsetData<String> savePublicityPosition(@RequestBody Map<String, Object> reqMap) throws JsonProcessingException {
         RequsetData<String> res = new RequsetData<String>();
 
-        int count = publicityService.savePublicityPosition(model, userService.getLoginUser().getUserid(), userService.getUserInfobyId(userService.getLoginUser().getUserid()).getName());
+        ObjectMapper mapper = new ObjectMapper();
+
+        PubPublicityposition dataModel = mapper.readValue(mapper.writeValueAsString(reqMap.get("dataModel")).toString(), PubPublicityposition.class);
+
+        List<PubPublicitypositionPanel> panelList = JsonMapper.jsonToObject(reqMap.get("panelList").toString(), new TypeReference<List<PubPublicitypositionPanel>>() {
+        });
+
+        int count = publicityService.savePublicityPositionAndPanel(dataModel, panelList, userService.getLoginUser().getUserid(), userService.getUserInfobyId(userService.getLoginUser().getUserid()).getName());
         if (count > 0) {
             res.setSuccess(true);
             res.setMsg("保存成功！");
@@ -670,7 +677,7 @@ public class PublicityController {
     @GetMapping("/getUserLeaderList")
     public RequsetData<PageInfo<HashMap<String, Object>>> getUserLeaderList(@RequestParam("pageindex") int pageIndex, @RequestParam("pagesize") int pageSize,
                                                                             @RequestParam(required = false) String partyCode, @RequestParam(required = false) String userName, @RequestParam(required = false)
-                                                                                    Integer leaderType, @RequestParam(required = false) String beginTime,
+                                                                            Integer leaderType, @RequestParam(required = false) String beginTime,
                                                                             @RequestParam(required = false) String endTime, @RequestParam(required = false) Integer zzfbType, @RequestParam(required = false) String rybm) {
         beginTime = dateUtils.strFormat_short(beginTime);
         endTime = dateUtils.strFormat_short(endTime);
@@ -762,7 +769,7 @@ public class PublicityController {
     @RequestMapping(value = "/exportUserLeader", method = RequestMethod.GET)
     public void exportUserLeader(HttpServletResponse response,
                                  @RequestParam(required = false) String partyCode, @RequestParam(required = false) String userName, @RequestParam(required = false)
-                                         Integer leaderType, @RequestParam(required = false) String beginTime,
+                                 Integer leaderType, @RequestParam(required = false) String beginTime,
                                  @RequestParam(required = false) String endTime, @RequestParam(required = false) Integer zzfbType, @RequestParam(required = false) String rybm) throws Exception {
 
         beginTime = dateUtils.strFormat_short(beginTime);
@@ -1037,6 +1044,7 @@ public class PublicityController {
 
     /**
      * 保存缴费基数
+     *
      * @param reqMap
      * @return
      */
@@ -1074,6 +1082,7 @@ public class PublicityController {
 
     /**
      * 保存缴费基数(批量设置)
+     *
      * @param reqMap
      * @return
      */
@@ -1108,6 +1117,7 @@ public class PublicityController {
 
     /**
      * 获取并初始化党员缴费基数（学生党员默认为0.2，一般不会去设置，需系统自动初始化，逻辑为：用户登录时进行检测，若未配置，则由系统初始化）
+     *
      * @param usercode
      * @param year
      * @return
@@ -1391,7 +1401,7 @@ public class PublicityController {
     @RequestMapping(value = "/exportPartyOutlay", method = RequestMethod.GET)
     public void exportPartyOutlay(HttpServletResponse response,
                                   @RequestParam(required = false) String partyCode, @RequestParam(required = false) String userName, @RequestParam(required = false)
-                                          Integer leaderType, @RequestParam(required = false) String beginTime,
+                                  Integer leaderType, @RequestParam(required = false) String beginTime,
                                   @RequestParam(required = false) String endTime, @RequestParam(required = false) Integer zzfbType, @RequestParam(required = false) Integer paytype) throws Exception {
 
         beginTime = dateUtils.strFormat_short(beginTime);

src/main/resources/static/app/main/app.js

@@ -1522,7 +1522,7 @@
             controller: "publicityPositionEditCtrl",
             resolve: {
                 load: ['$ocLazyLoad', function ($ocLazyLoad) {
-
+                    $ocLazyLoad.load(['../main/publicity/position/panelEdit.js?' + window.sysVersion]);
                     return $ocLazyLoad.load(['../main/publicity/position/edit.js?' + window.sysVersion]);
                 }]
             }
@@ -1532,7 +1532,7 @@
             controller: "publicityPositionEditCtrl",
             resolve: {
                 load: ['$ocLazyLoad', function ($ocLazyLoad) {
-
+                    $ocLazyLoad.load(['../main/publicity/position/panelEdit.js?' + window.sysVersion]);
                     return $ocLazyLoad.load(['../main/publicity/position/edit.js?' + window.sysVersion]);
                 }]
             }
@@ -1542,7 +1542,7 @@
             controller: "publicityPositionEditCtrl",
             resolve: {
                 load: ['$ocLazyLoad', function ($ocLazyLoad) {
-
+                    $ocLazyLoad.load(['../main/publicity/position/panelEdit.js?' + window.sysVersion]);
                     return $ocLazyLoad.load(['../main/publicity/position/edit.js?' + window.sysVersion]);
                 }]
             }

src/main/resources/static/app/main/dsflow/appendStartTask.js

@@ -40,7 +40,7 @@
         });
         $scope.showDetail = function (e) {
             if (e.TaskNote != null && e.TaskNote.length >= 50) {
-                DModal.$scope.title = "通知描述:";
+                DModal.$scope.title = "任务描述:";
                 DModal.$scope.TaskNote = e.TaskNote;
                 DModal.$promise.then(DModal.show);
             }

src/main/resources/static/app/main/home/mainindex.html

@@ -611,8 +611,8 @@
                                     <img ng-if="it.payState==1" src="../../../content/images/fee_yet.svg"/>
                                     <img ng-if="it.payState!=1" src="../../../content/images/fee_not.svg"/>
                                     <p style="margin: 0;">{{it.MONTH}}月</p>
-                                    <!--<p style="margin: 0;" ng-if="it.ISHAV">已缴{{it.MONEY}}元</p>-->
-                                    <p style="cursor: pointer;border: 1px solid #E91E63;background-color: #E91E63;color: white;border-radius: 5px;" ng-if="it.isPay" ng-click="payDues(it.MONTH,it.userName,it.DETAILID,it.MONEY)">缴费<span style="font-size: 8px;">▶</span></p>
+                                    <!--<p style="margin: 0;" ng-if="it.ISHAV">已缴{{it.MONEY}}元</p>
+                                    <p style="cursor: pointer;border: 1px solid #E91E63;background-color: #E91E63;color: white;border-radius: 5px;" ng-if="it.isPay" ng-click="payDues(it.MONTH,it.userName,it.DETAILID,it.MONEY)">缴费<span style="font-size: 8px;">▶</span></p>-->
                                 </div>
                                 <div class="fee-line" ng-if="!$last"></div>
                             </li>

src/main/resources/static/app/main/home/mainindex.js

@@ -101,9 +101,9 @@
             $scope.loadFIle();
         }
 
-        //通知
+        //任务
         {
-            //加载通知信息
+            //加载任务信息
             $scope.loadMsgData = function (day, state) {
                 /* $scope.cdData = [];
                  $http
@@ -956,7 +956,7 @@
             }, 100);
         };
         $scope.mspageList = [
-            {id: 2, title: '通知公告', url: '../main/home/tabpage/mytask.html', number: 0}
+            {id: 2, title: '任务待办', url: '../main/home/tabpage/mytask.html', number: 0}
             // {id: 1, title: '会议', url: '../main/home/tabpage/meetingmsg.html', number: $scope.taskdataList.length}
         ];
 

src/main/resources/static/app/main/home/tabpage/mytask.html

@@ -7,5 +7,5 @@
 <ul class="list-group" ng-if="taskdataList.length==0" style="text-align: center; ">
     <br>
     <br>
-    <span>暂无通知</span>
+    <span>暂无数据</span>
 </ul>

src/main/resources/static/app/main/partyTwoExt/task/edit.html

@@ -2,11 +2,11 @@
 <div class="dj-card">
     <div class="dj-body"  activate-input activate-select>
         <form role="form" name="editForm" novalidate>
-            <div panel-title data-title="'通知信息'"></div>
+            <div panel-title data-title="'任务信息'"></div>
             <div ng-if="isDetail" class="dj-formtable">
                 <table class="dj-table">
                     <tr>
-                        <th>通知名称<span style="color: red;">*不超过15字</span></th>
+                        <th>任务名称<span style="color: red;">*不超过15字</span></th>
                         <td ng-class="{ 'focused error' : this.editForm.taskname.$invalid &&  this.editForm.$submitted}">
                             <input type="text" name="taskname" ng-model="dataModel.taskname"
                                    class="form-control" ng-required="true"/>
@@ -61,7 +61,7 @@
                         <td></td>
                     </tr>
                     <tr>
-                        <th>通知内容</th>
+                        <th>任务内容</th>
                         <td colspan="5">
                             <textarea maxlength="800" ng-model="dataModel.taskcontent" style="width: 100%;" rows="2" name="taskcontent"></textarea>
                         </td>
@@ -71,7 +71,7 @@
             <div ng-if="!isDetail" class="dj-formtable">
                 <table class="dj-table">
                     <tr>
-                        <th>通知名称</th>
+                        <th>任务名称</th>
                         <td>
                            {{dataModel.taskname}}
                         </td>
@@ -99,7 +99,7 @@
                         <td></td>
                     </tr>
                     <tr>
-                        <th>通知内容</th>
+                        <th>任务内容</th>
                         <td colspan="5">
                             <pre ng-bind-html="dataModel.taskcontent" style="white-space: pre-wrap;margin-top: 10px;"></pre>
                         </td>

src/main/resources/static/app/main/partyTwoExt/task/list.html

@@ -9,7 +9,7 @@
                             <form class="form-horizontal">
                                 <div class="row clearfix form-inline">
                                     <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 dj-label">
-                                        <label>通知名称</label>
+                                        <label>任务名称</label>
                                     </div>
                                     <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
                                         <div class="form-group">
@@ -69,10 +69,10 @@
                                     ng-click="export()">导出
                             </button>
                             <button class="btn btn-default1" role-permission-code="systask.btn.btnAdd"
-                                    ng-click="add()">下发通知
+                                    ng-click="add()">下发任务
                             </button>
                             <button class="btn btn-default1" role-permission-code="systask.btn.btnAdd"
-                                    ng-click="addpub()">下发材料收集通知
+                                    ng-click="addpub()">下发材料收集任务
                             </button>
                         </div>
                     </div>
@@ -84,7 +84,7 @@
                                 <thead>
                                 <tr>
                                     <th>序号</th>
-                                    <th WIDTH="30%">通知名称</th>
+                                    <th WIDTH="30%">任务名称</th>
                                     <th>接收人数</th>
                                     <th>下达时间</th>
                                     <th>截止时间</th>

src/main/resources/static/app/main/partyTwoExt/task/mytask.html

@@ -9,7 +9,7 @@
                             <form class="form-horizontal">
                                 <div class="row clearfix form-inline">
                                     <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 dj-label">
-                                        <label>通知名称</label>
+                                        <label>任务名称</label>
                                     </div>
                                     <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
                                         <div class="form-group">
@@ -97,7 +97,7 @@
                                 <thead>
                                 <tr>
                                     <th>序号</th>
-                                    <th WIDTH="30%">通知名称</th>
+                                    <th WIDTH="30%">任务名称</th>
                                     <th>下达时间</th>
                                     <th>截止时间</th>
                                     <th>发送部门</th>

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

@@ -133,16 +133,6 @@
                     </tr>-->
                 </table>
             </div>
-
-            <div class="form_foot">
-                <button type="button" class="btn btn-default" ng-click="pagechange();">取消</button>
-                <button type="submit"
-                        class="btn btn-primary"
-                        ng-click="submitData(this.editForm.$valid)">提交
-                </button>
-            </div>
-        </form>
-        <div ng-if="op==1" class="dj-formtable">
             <div class="table-responsive list-table-panel">
                 <div class="list-table-title">
                     <div class="table-title">
@@ -151,7 +141,7 @@
                     <div class="table-tool">
                         <button type="button" class="btn btn-primary dropdown-toggle"
                                 ng-click="addPanel()">
-                            更新阵地
+                            新增
                         </button>
                     </div>
                 </div>
@@ -172,31 +162,31 @@
                         <td scope="row" class="text-center">
                             {{selectparams.pagesize*(selectparams.pageindex-1)+$index+1}}
                         </td>
-                        <td>{{it.TITLE}}</td>
-                        <td class="text-center">{{it.PANELTIME | date:'yyyy-MM-dd'}}</td>
+                        <td>{{it.title}}</td>
+                        <td class="text-center">{{it.paneltime | date:'yyyy-MM-dd'}}</td>
                         <td class="text-center" style="width: 400px;">
                             <!--<img style="width: 320px;height:150px;cursor:pointer;"
                                  src="../../api/home/showImg/{{it.PANELIMG}}"
                                  data-toggle="modal" data-target="#showPanelImgOfPosition"
                                  ng-click="showImg(it.PANELIMG)"
                             />-->
-                            <img-component data-filerefid="it.PANELID" data-filetypeid="4"
+                            <img-component data-filerefid="it.panelid" data-filetypeid="4"
                                            data-ismulti="false" data-height="80"
                                            data-width="120" data-readonly="true"></img-component>
                         </td>
-                        <td class="text-center">{{it.CREATEUSERNAME}}</td>
+                        <td class="text-center">{{it.createusername}}</td>
                         <td class="text-center">
                             <button
                                     role-permission-code="publicityPositionList.btnUpdate"
                                     class="btn td-btn bg-light-green waves-effect"
-                                    ng-click="editPanel(it.PUBLICITYPOSITIONID,it.PANELID)"
+                                    ng-click="editPanel(it)"
                                     title="编辑">
                                 编辑
                             </button>
                             <button
                                     role-permission-code="publicityPositionList.btnDelete"
                                     class="btn td-btn bg-light-green waves-effect"
-                                    ng-click="deletePanel(it.PANELID)"
+                                    ng-click="deletePanel(it.panelid)"
                                     title="删除">
                                 删除
                             </button>
@@ -209,9 +199,15 @@
                     </tbody>
                 </table>
             </div>
-            <pagination data-pageindex="selectparams.pageindex" data-pagesize="selectparams.pagesize"
-                        data-ptotal="pageInfo.ptotal"></pagination>
-        </div>
+            <div class="form_foot">
+                <button type="button" class="btn btn-default" ng-click="pagechange();">取消</button>
+                <button type="submit"
+                        class="btn btn-primary"
+                        ng-click="submitData(this.editForm.$valid)">提交
+                </button>
+            </div>
+        </form>
+
     </div>
 </div>
 
@@ -272,7 +268,6 @@
                     </tr>
                 </table>
             </div>
-
             <div class="dj-formtable">
                 <div class="table-responsive list-table-panel">
                     <div class="list-table-title">
@@ -297,24 +292,24 @@
                             <td scope="row" class="text-center">
                                 {{selectparams.pagesize*(selectparams.pageindex-1)+$index+1}}
                             </td>
-                            <td>{{it.TITLE}}</td>
-                            <td class="text-center">{{it.PANELTIME | date:'yyyy-MM-dd'}}</td>
+                            <td>{{it.title}}</td>
+                            <td class="text-center">{{it.paneltime | date:'yyyy-MM-dd'}}</td>
                             <td class="text-center" style="width: 400px;">
                                 <!--<img style="width: 320px;height:150px;cursor:pointer;"
                                      src="../../api/home/showImg/{{it.PANELIMG}}"
                                      data-toggle="modal" data-target="#showPanelImgOfPosition"
                                      ng-click="showImg(it.PANELIMG)"
                                 />-->
-                                <img-component data-filerefid="it.PANELID" data-filetypeid="4"
+                                <img-component data-filerefid="it.panelid" data-filetypeid="4"
                                                data-ismulti="false" data-height="150"
                                                data-width="180" data-readonly="true"></img-component>
                             </td>
-                            <td class="text-center">{{it.CREATEUSERNAME}}</td>
+                            <td class="text-center">{{it.createusername}}</td>
                             <td class="text-center">
                                 <button
                                         role-permission-code="publicityPositionList.btnUpdate"
                                         class="btn td-btn bg-light-green waves-effect"
-                                        ng-click="showPanel(it.PUBLICITYPOSITIONID,it.PANELID)"
+                                        ng-click="showPanel(it)"
                                         title="查看">
                                     查看
                                 </button>
@@ -327,10 +322,7 @@
                         </tbody>
                     </table>
                 </div>
-                <pagination data-pageindex="selectparams.pageindex" data-pagesize="selectparams.pagesize"
-                            data-ptotal="pageInfo.ptotal"></pagination>
             </div>
-
             <div class="form_foot">
                 <button type="button" class="btn btn-default" ng-click="pagechange();">取消</button>
             </div>

src/main/resources/static/app/main/publicity/position/edit.js

@@ -1,5 +1,5 @@
 (function ($app) {
-    $app.module('gtPartyApp').controller('publicityPositionEditCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $partySelect, $stateParams, $bsRouterState,$timeout) {
+    $app.module('gtPartyApp').controller('publicityPositionEditCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $partySelect, $stateParams, $bsRouterState, $timeout,$uuid) {
         $stateParams = $bsRouterState.$params($scope);
 
         $scope.maxDate = moment(new Date()).format("YYYY-MM-DD");
@@ -35,8 +35,8 @@
         }, true);
         //end
 
-        $scope.$on('tabChildReloadData',function (event,data) {
-            if(data.name=='publicityPositionEditCtrl'){
+        $scope.$on('tabChildReloadData', function (event, data) {
+            if (data.name == 'publicityPositionEditCtrl') {
                 $scope.getPanelList($scope.dataModel.publicitypositionid);
             }
         });
@@ -68,7 +68,7 @@
                 $http({
                     method: "post",
                     url: "../../api/publicity/savePublicityPosition",
-                    data: $scope.dataModel
+                    data: {dataModel: $scope.dataModel, panelList: JSON.stringify($scope.panelList)}
                 }).then(function (result) {
                     $loading.hide();
                     $scope.showMsg('成功', result.data.msg);
@@ -140,7 +140,7 @@
 
         $scope.selectparams = {
             pageindex: 1,
-            pagesize: 10,
+            pagesize: 100,
             publicityPositionId: ''
         };
         $scope.pageInfo = {ptotal: 0};
@@ -158,8 +158,18 @@
                 ({
                     method: 'get', url: '../../api/publicity/getPublicityPanelRecordList', params: $scope.selectparams
                 }).then(function (result) {
-                    $scope.panelList = result.data.item.list;
-                    $scope.pageInfo.ptotal = result.data.item.total;
+                    $scope.panelList = [];
+
+                    result.data.item.list.forEach(e => {
+                        $scope.panelList.push({
+                            panelid: e.PANELID,
+                            title: e.TITLE,
+                            paneltime: e.PANELTIME,
+                            panelimg: e.PANELIMG,
+                            remark: e.REMARK,
+                            createusername: e.CREATEUSERNAME
+                        });
+                    });
                 });
             }
         };
@@ -201,42 +211,55 @@
 
         //新增
         $scope.addPanel = function () {
-            $bsRouterState.$closeTabName("home.publicityPositionPanelAdd");
-            $timeout(function () {
-                $bsRouterState.go('home.publicityPositionPanelAdd', {positionId:$scope.dataModel.publicitypositionid});
-            }, 100);
+            $scope.panelModal(1, {panelid:$uuid.getUUID()});
         };
 
         //修改
-        $scope.editPanel = function (positionId, panelId) {
-            $bsRouterState.$closeTabName("home.publicityPositionPanelAdd");
-            $timeout(function () {
-                $bsRouterState.go('home.publicityPositionPanelAdd', {positionId: positionId, panelId: panelId});
-            }, 100);
+        $scope.editPanel = function (item) {
+            $scope.panelModal(1, item);
+        };
+
+        $scope.panelModal = function (op, item) {
+            panelEditCtrl.$inject = ['$scope', '$http', '$alert', '$loading'];
+            panelEditModal = $modal({
+                resolve: {
+                    load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    }]
+                },
+                scope: $scope,
+                controller: panelEditCtrl,
+                templateUrl: '../main/publicity/position/panelEdit.html',
+                show: false,
+                animation: 'am-fade-and-slide-top'
+            });
+
+            panelEditModal.params = {
+                op: op,
+                dataModel: item
+            };
+            panelEditModal.editPanelBack = $scope.editPanelBack;
+            panelEditModal.$promise.then(panelEditModal.show);
+        };
+
+        $scope.editPanelBack = function (item) {
+            if (item != null) {
+                let panel = $scope.panelList.filter(e => e.panelid === item.panelid)[0];
+                if (panel == null) {
+                    $scope.panelList.push(item);
+                } else {
+                    panel = item;
+                }
+            }
         };
 
         //删除
         $scope.deletePanel = function (id) {
-            if (confirm("是否确定删除？")) {
-                $http({
-                    url: "../../api/publicity/deletePanel",
-                    method: 'GET',
-                    params: {id: id}
-                }).then(function (result) {
-                    $scope.showMsg("消息", result.data.msg);
-                    if (result.data.success) {
-                        $scope.getPanelList($scope.dataModel.publicitypositionid);
-                    }
-                });
-            }
+            $scope.panelList = $scope.panelList.filter(e => e.panelid != id);
         };
 
         //查看
-        $scope.showPanel = function (positionId, panelId) {
-            $bsRouterState.$closeTabName("home.publicityPositionPanelShow");
-            $timeout(function () {
-                $bsRouterState.go('home.publicityPositionPanelShow', {positionId: positionId, panelId: panelId, op: 0});
-            }, 100);
+        $scope.showPanel = function (item) {
+            $scope.panelModal(2, item);
         };
 
     });

src/main/resources/static/app/main/publicity/position/panel/panelEdit.html

@@ -1,226 +0,0 @@
-<titlemenu></titlemenu>
-<div class="dj-card">
-    <div class="dj-body" activate-input activate-select>
-        <form role="form" name="editForm" novalidate>
-            <div panel-title data-title="'阵地信息'"></div>
-            <div class="dj-formtable">
-                <table class="dj-table">
-                    <tr>
-                        <th>阵地名称</th>
-                        <!--<td ng-class="{ 'has-error' : this.editForm.positionName.$invalid &&  this.editForm.$submitted}">
-                            <div ng-if="op!=0" class="input-group input-group-search"
-                                 title="选择阵地"
-                                 data-dataoptions="selectPosition" bsselectdata-pro>
-                                <input name="positionName" type="text" ng-model="positionModel.positionname"
-                                       class="form-control" ng-required="true"
-                                       ng-disabled="true"/>
-                                <span class="input-group-addon"><i class="material-icons">search</i></span>
-                            </div>
-                            <span ng-if="op==0">{{positionModel.positionname}}</span>
-                            <span ng-show="this.editForm.positionName.$invalid &&  this.editForm.$submitted"
-                                  class="error">必填.</span>
-                        </td>-->
-                        <td>
-                            {{positionModel.positionname}}
-                        </td>
-                        <th>所属党组织</th>
-                        <td>
-                            {{positionModel.partyname}}
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>阵地类别</th>
-                        <td>
-                            {{positionModel.positiontypename}}
-                        </td>
-                        <th>等级</th>
-                        <td>
-                            {{positionModel.positionlevelname}}
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>编号</th>
-                        <td>
-                            {{positionModel.positioncode}}
-                        </td>
-                        <th>位置</th>
-                        <td>
-                            {{positionModel.address}}
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>尺寸</th>
-                        <td>
-                            {{positionModel.sizes}}
-                        </td>
-                        <th>建设时间</th>
-                        <td>
-                            {{positionModel.buildtime | date:'yyyy-MM-dd'}}
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>责任人</th>
-                        <td>
-                            {{positionModel.headusername}}
-                        </td>
-                        <th>状态</th>
-                        <td>
-                            {{positionModel.positionstatename}}
-                        </td>
-                    </tr>
-                </table>
-            </div>
-
-            <div panel-title data-title="'图版信息'"></div>
-            <div ng-if="op!=0" class="dj-formtable">
-                <table class="dj-table">
-                    <tr>
-                        <th>宣传标语</th>
-                        <td ng-class="{ 'has-error' : this.editForm.title.$invalid &&  this.editForm.$submitted}">
-                            <input type="text" name="title" ng-model="dataModel.title"
-                                   maxlength="200"
-                                   class="form-control" ng-required="true"/>
-                            <span ng-show="this.editForm.title.$invalid &&  this.editForm.$submitted"
-                                  class="error">必填.</span>
-                        </td>
-                        <th>宣传备注</th>
-                        <td ng-class="{ 'has-error' : this.editForm.remark.$invalid &&  this.editForm.$submitted}">
-                            <input type="text" name="remark" ng-model="dataModel.remark"
-                                   maxlength="200"
-                                   class="form-control" ng-required="true"/>
-                            <span ng-show="this.editForm.remark.$invalid &&  this.editForm.$submitted"
-                                  class="error">必填.</span>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>更新时间</th>
-                        <td ng-class="{ 'has-error' : this.editForm.paneltime.$invalid &&  this.editForm.$submitted}">
-                            <input name="paneltime" class="form-control"
-                                   autocomplete="off"
-                                   autoclose="true"
-                                   data-date-format="yyyy-MM-dd" data-date-type="date"
-                                   ng-model="dataModel.paneltime"
-                                   ng-required="true"
-                                   data-max-date="{{maxDate}}"
-                                   placeholder="" bs-datepicker/>
-                            <span ng-show="this.editForm.paneltime.$invalid &&  this.editForm.$submitted"
-                                  class="error">必填.</span>
-                        </td>
-                        <!--<th>更新周期</th>
-                        <td ng-class="{ 'has-error' : this.editForm.panelcycle.$invalid &&  this.editForm.$submitted}">
-                            <select class="form-control show-tick"
-                                    ng-model="dataModel.panelcycle"
-                                    ng-options="type.dickey as type.dicvalue for type in panelCycleList"
-                                    class="form-control"
-                                    name="panelcycle" ng-required="true">
-                                <option value="" selected>&#45;&#45;请选择&#45;&#45;</option>
-                            </select>
-                            <span ng-show="this.editForm.panelcycle.$invalid &&  this.editForm.$submitted"
-                                  class="error">必填.</span>
-                        </td>-->
-                    </tr>
-                    <tr>
-                        <th>上传图片</th>
-                        <td colspan="3">
-                            <img-component data-filerefid="imgConfig.filerefid" data-filetypeid="imgConfig.filetypeid"
-                                           data-ismulti="imgConfig.ismulti" data-height="imgConfig.height"
-                                           data-width="imgConfig.width" data-readonly="imgConfig.readonly"
-                                           data-img-list="imgConfig.imgList"></img-component>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-            <div ng-if="op==0" class="dj-formtable">
-                <table class="dj-table">
-                    <tr>
-                        <th>宣传标语</th>
-                        <td>
-                            {{dataModel.title}}
-                        </td>
-                        <th>宣传备注</th>
-                        <td>
-                            {{dataModel.remark}}
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>更新时间</th>
-                        <td>
-                            {{dataModel.paneltime|date:'yyyy-MM-dd'}}
-                        </td>
-                        <!--<th>更新周期</th>
-                        <td>
-                            {{(panelCycleList|filter:{dickey:dataModel.panelcycle})[0].dicvalue }}
-                        </td>-->
-                    </tr>
-                    <tr>
-                        <th>上传图片</th>
-                        <td>
-                            <img-component data-filerefid="imgConfig.filerefid" data-filetypeid="imgConfig.filetypeid"
-                                           data-ismulti="imgConfig.ismulti" data-height="imgConfig.height"
-                                           data-width="imgConfig.width" data-readonly="true"
-                                           data-img-list="imgConfig.imgList"></img-component>
-                        </td>
-                        <td colspan="2" style="width: 50%;"></td>
-                    </tr>
-                </table>
-            </div>
-
-           <!-- <div ng-if="panelList.length>0" class="dj-paneltitle" style="display: flex;justify-content:space-between; cursor: pointer;" ng-click="isShowClick()">
-                <div>
-                    <div class="title-line"></div>
-                    <span class="title-text">展板更新记录</span>
-                </div>
-                <span class="moreSpan" style='padding-right:1em;cursor:pointer;'>{{isShow?"收起":"展开"}}<i class="material-icons"
-                                                                                               style="position: relative;top:7px;">{{isShow ? 'expand_less' : 'expand_more'}}</i></span>
-            </div>
-            <div ng-show="panelList.length>0 && isShow" class="dj-formtable">
-                <div class="table-responsive list-table-panel">
-                    <table class="table table-bordered table-striped table-hover js-basic-example dataTable text-nowrap">
-                        <thead>
-                        <tr>
-                            <th>序号</th>
-                            <th>宣传标语</th>
-                            <th>更新日期</th>
-                            <th>缩略图</th>
-                            <th>上传人</th>
-                            <th>审核状态</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr ng-repeat="it in panelList">
-                            <td scope="row" class="text-center">
-                                {{$index+1}}
-                            </td>
-                            <td>{{it.TITLE}}</td>
-                            <td class="text-center">{{it.PANELTIME | date:'yyyy-MM-dd'}}</td>
-                            <td class="text-center" style="width: 200px;">
-                                &lt;!&ndash;<img style="width: 320px;height:150px;cursor:pointer;"
-                                     src="../../api/home/showImg/{{it.PANELIMG}}"
-                                     data-toggle="modal" data-target="#showPanelImgOfPosition"
-                                     ng-click="showImg(it.PANELIMG)"
-                                />&ndash;&gt;
-                                <img-component data-filerefid="it.PANELID" data-filetypeid="imgConfig.filetypeid"
-                                               data-ismulti="imgConfig.ismulti" data-height="imgConfig.height"
-                                               data-width="100" data-readonly="true"></img-component>
-                            </td>
-                            <td class="text-center">{{it.CREATEUSERNAME}}</td>
-                            <td class="text-center">{{it.PANELSTATENAME}}</td>
-                        </tr>
-                        <tr ng-if="panelList.length<=0">
-                            <td colspan="8" style="text-align:center">暂无数据</td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>-->
-            <div class="form_foot">
-                <button type="button" class="btn btn-default" ng-click="pagechange();">取消</button>
-                <button type="submit"
-                        class="btn btn-primary"
-                        ng-click="submitData(this.editForm.$valid)"
-                        ng-if="op!=0">提交
-                </button>
-            </div>
-        </form>
-    </div>
-</div>

src/main/resources/static/app/main/publicity/position/panel/panelEdit.js

@@ -1,171 +0,0 @@
-(function ($app) {
-    $app.module('gtPartyApp').controller('publicityPositionPanelEditCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $partySelect, $stateParams, $bsRouterState, $partySelect, AuthUser,
-                                                                                     $uuid, $bsfiles) {
-        $stateParams = $bsRouterState.$params($scope);
-
-        $scope.maxDate = moment(new Date()).format("YYYY-MM-DD");
-        $scope.op = $stateParams.op;
-        //定义数据集合
-        $scope.positionModel = {
-            id: $stateParams.positionId == undefined ? "" : $stateParams.positionId,
-            positionname: ''
-        };
-        $scope.dataModel = {
-            id: $stateParams.panelId == undefined ? "" : $stateParams.panelId
-        };
-        $scope.panelCycleList = [];
-
-        //定义阵地选择控件
-        $scope.selectPosition = {
-            url: '../../api/publicity/getPublicityList',
-            title: '选择阵地',
-            isMulti: false,
-            selectData: {positionName: '阵地名称'},
-            columns: {POSITIONNAME: '阵地名称', PARTYNAME: '所在党组织', "POSITIONCODE": "编号", "POSITIONTYPENAME": "阵地类别"},
-            selectLabelKey: 'POSITIONNAME',
-            selectValuekey: 'PUBLICITYPOSITIONID',
-            selectedValueData: '',
-            selectedLabeData: '',
-            selectedJData: [],
-            selectParams: {
-                partyCode: AuthUser.getUser().DataDzzdm
-            }
-        };
-
-        $scope.$watch('selectPosition.selectedValueData', function (newVal) {
-            if (newVal != '' && newVal != undefined) {
-                $scope.getPositionInfo(newVal);
-                $scope.getPanelList(newVal);
-            }
-        });
-
-        $scope.imgConfig = {
-            filerefid: $scope.dataModel.panelid,
-            filetypeid: 4,
-            readonly: false,
-            ismulti: true,
-            height: 150,
-            width: 180,
-            imgList: []
-        };
-
-        $scope.loadData = function () {
-            $http.get("../../api/publicity/getPublicityPositionPanelById", {
-                params: {
-                    'id': $scope.dataModel.id,
-                    'positionId': $scope.positionModel.id
-                }
-            }).then(function (result) {
-                $scope.dataModel = result.data.item;
-                $scope.imgConfig.filerefid = $scope.dataModel.panelid;
-                $scope.getPositionInfo($scope.positionModel.id);
-                $scope.getPanelList($scope.dataModel.publicitypositionid);
-            }, function () {
-                $scope.showMsg('错误', '服务器错误');
-            });
-        };
-
-        $scope.getPositionInfo = function (positionId) {
-            if (positionId != "" && positionId != null) {
-                $http.get("../../api/publicity/getPublicityPositionInfoById", {
-                    params: {
-                        'id': positionId
-                    }
-                }).then(function (result) {
-                    if (result.data.success) {
-                        $scope.dataModel.publicitypositionid = result.data.item.publicitypositionid;
-                        $scope.positionModel = result.data.item;
-                    } else {
-                        $scope.showMsg('错误', result.data.msg);
-                    }
-                }, function () {
-                    $scope.showMsg('错误', '服务器错误');
-                });
-            }
-        };
-
-        //保存
-        $scope.submitData = function (isflag) {
-            if (isflag) {
-                // if ($scope.dataModel.panelimg == null || $scope.dataModel.panelimg == "") {
-                //     $scope.showMsg('错误', '请上传图片');
-                //     return false;
-                // }
-
-                if ($scope.imgConfig.imgList.length > 0) {
-                    $scope.dataModel.panelimg = $scope.imgConfig.imgList[0].fileid;
-                }
-
-                if (confirm("确认提交？")) {
-                    $loading.show();
-                    $http({
-                        method: "post",
-                        url: "../../api/publicity/savePublicityPositionPanel",
-                        data: $scope.dataModel
-                    }).then(function (result) {
-                        $loading.hide();
-                        $scope.showMsg('成功', result.data.msg);
-                        //重新刷新列表
-                        $scope.pagechange();
-
-                        /*$scope.$emit("tabReloadData", {name: 'publicityPositionPanelListCtrl', data: 1});*/
-                        $scope.$emit("tabReloadData", {name: 'publicityPositionEditCtrl', data: 1});
-
-                    }, function (resp) {
-                        $scope.showMsg('错误', '服务器错误');
-                    });
-                }
-            }
-        };
-
-        $scope.getPanelCycleList = function () {
-            $http({
-                method: 'get',
-                url: '../../api/dictionary/getDictionaryListByDicTypeKey',
-                params: {
-                    dicTypeKey: 'panelCycle'
-                }
-            }).then(function (result) {
-                $scope.panelCycleList = result.data;
-            }, function (resp) {
-
-            });
-        };
-
-
-        //展板记录
-        $scope.isShow = false;
-        $scope.getPanelList = function (publicityPositionId) {
-            if (publicityPositionId != null && publicityPositionId != '') {
-                $http
-                ({
-                    method: 'get', url: '../../api/publicity/getPublicityPanelRecordList', params: {
-                        pageindex: 1,
-                        pagesize: 100,
-                        publicityPositionId: publicityPositionId
-                    }
-                }).then(function (result) {
-                    $scope.panelList = result.data.item.list.filter(it=>it.PANELID!=$scope.dataModel.panelid);
-                });
-            }
-        };
-        $scope.isShowClick = function () {
-            $scope.isShow = !$scope.isShow;
-        };
-
-
-        //加载数据
-        $scope.loadData();
-        $scope.getPanelCycleList();
-
-        $scope.pagechange = function () {
-            var inTab = $bsRouterState.$getRouteType() == 'tab';
-            if (inTab) {
-                $bsRouterState.$closeTab($scope);
-            } else {
-                window.history.back();
-            }
-        };
-
-    });
-})(angular);

src/main/resources/static/app/main/publicity/position/panel/panelList.html

@@ -1,292 +0,0 @@
-<style>
-    .tool-box {
-        display: flex;
-        flex-wrap: wrap;
-        padding: 10px 0;
-    }
-
-    .tool-box > .tool-item {
-        flex-direction: column;
-        flex: 0 0 50%;
-        margin: 10px 0;
-        text-decoration: none;
-        cursor: pointer;
-    }
-
-    .tool-box > .tool-item > .tool-item-content {
-        border: 1px solid #ddd;
-        margin: 0px 10px;
-    }
-
-    .tool-box > .tool-item > .tool-item-content > .tool-img {
-        display: flex;
-        justify-content: center;
-    }
-
-    .tool-box > .tool-item > .tool-item-content > .tool-title {
-        color: black;
-        text-align: center;
-        margin-top: 10px;
-        margin-bottom: 5px;
-    }
-
-    .totalitem {
-        background-color: #F7F7F7;
-        text-align: center !important;
-        cursor: pointer;
-        padding: 5px 0px;
-        border: 1px solid #ddd;
-        width: 100px;
-    }
-
-    .totalselect {
-        background-color: #C50101;
-        color: white !important;
-    }
-</style>
-<titlemenu></titlemenu>
-<div class="dj-list">
-    <div class="dj-list-body">
-        <div party-tree data-selectdzzdm="selectparams.selectdzzdm" data-selectdzzmc="selectparams.selectdzzmc"
-             data-isshowxz="selectparams.isshowxz" data-zzfbtype="selectparams.zzfbType"
-             data-defaultselected="selectparams.defaultselected" data-isunfold="selectparams.isunfold"></div>
-        <div class="dj-list-content">
-            <div class="card">
-                <div activate-input activate-select class="header search-header">
-                    <div fold-partytree data-isunfold="selectparams.isunfold"></div>
-                    <div class="search-param-panel">
-                        <div class="search-input">
-                            <form class="form-horizontal">
-                                <div class="row clearfix form-inline">
-                                    <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>当前选中组织</label>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2">
-                                        <div class="form-group">
-                                            <div class="form-line">
-                                                <div class="input-group input-group-search">
-                                                    <input name="selectdzzmc" type="text" style="min-width: 90px"
-                                                           ng-model="selectparams.selectdzzmc" class="form-control"
-                                                           ng-disabled="true"/>
-                                                    <span class="input-group-addon"
-                                                          ng-click="setisunfold()">选择</span>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>阵地名称</label>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2">
-                                        <div class="form-group">
-                                            <div class="form-line">
-                                                <input name="name" class="form-control" type="text"
-                                                       ng-model="selectparams.positionName"
-                                                       placeholder=""/>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>责任人</label>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2">
-                                        <div class="form-group">
-                                            <div class="form-line">
-                                                <input name="name" class="form-control" type="text"
-                                                       ng-model="selectparams.headUserName"
-                                                       placeholder=""/>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="row clearfix form-inline">
-                                    <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>位置</label>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2">
-                                        <div class="form-group">
-                                            <div class="form-line">
-                                                <input name="name" class="form-control" type="text"
-                                                       ng-model="selectparams.address"
-                                                       placeholder=""/>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>建设开始时间</label>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2">
-                                        <div class="form-group">
-                                            <div class="form-line">
-                                                <input name="beginTime" class="form-control"
-                                                       autocomplete="off"
-                                                       autoclose="true"
-                                                       data-date-format="yyyyMMdd" data-date-type="date"
-                                                       ng-model="selectparams.beginTime"
-                                                       placeholder="" bs-datepicker/>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>建设结束时间</label>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2">
-                                        <div class="form-group">
-                                            <div class="form-line">
-                                                <input name="endTime" class="form-control"
-                                                       autocomplete="off"
-                                                       autoclose="true"
-                                                       data-date-format="yyyyMMdd" data-date-type="date"
-                                                       ng-model="selectparams.endTime"
-                                                       placeholder="" bs-datepicker/>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="row clearfix form-inline">
-                                    <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>阵地类别</label>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2">
-                                        <div class="form-group">
-                                            <div class="form-line">
-                                                <select class="form-control show-tick"
-                                                        ng-model="selectparams.positionType"
-                                                        ng-options="type.dickey as type.dicvalue for type in positionTypeList"
-                                                        class="form-control"
-                                                        name="positionType">
-                                                    <option value="">--全部--</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>等级</label>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2">
-                                        <div class="form-group">
-                                            <div class="form-line">
-                                                <select class="form-control show-tick"
-                                                        ng-model="selectparams.positionLevel"
-                                                        ng-options="type.dickey as type.dicvalue for type in positionLevelList"
-                                                        class="form-control"
-                                                        name="positionLevel">
-                                                    <option value="">--全部--</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>状态</label>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2">
-                                        <div class="form-group">
-                                            <div class="form-line">
-                                                <select class="form-control show-tick"
-                                                        ng-model="selectparams.positionState"
-                                                        ng-options="type.dickey as type.dicvalue for type in positionStateList"
-                                                        class="form-control"
-                                                        name="positionState">
-                                                    <option value="">--全部--</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="row clearfix form-inline">
-                                    <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>更新开始时间</label>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2">
-                                        <div class="form-group">
-                                            <div class="form-line">
-                                                <input name="beginTime" class="form-control"
-                                                       autocomplete="off"
-                                                       autoclose="true"
-                                                       data-date-format="yyyyMMdd" data-date-type="date"
-                                                       ng-model="selectparams.updateTime_bt"
-                                                       placeholder="" bs-datepicker/>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>更新结束时间</label>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2">
-                                        <div class="form-group">
-                                            <div class="form-line">
-                                                <input name="endTime" class="form-control"
-                                                       autocomplete="off"
-                                                       autoclose="true"
-                                                       data-date-format="yyyyMMdd" data-date-type="date"
-                                                       ng-model="selectparams.updateTime_et"
-                                                       placeholder="" bs-datepicker/>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="row clearfix form-inline" style="padding-left: 120px;padding-top: 20px;">
-                                    <div class="col-lg-2 col-md-2" ng-repeat="it in dataTotal">
-                                        <label class="totalitem" ng-class="it.checked?'totalselect':''"
-                                               ng-click="selectTotal(it)">{{it.name}}：{{it.count}}</label>
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
-                        <div class="search-btn" style="margin-right: 20px;">
-                            <div>
-                                <button role-permission-code="publicityPositionList.btnSearch"
-                                        class="btn btn-default1"
-                                        ng-click="search()">查询
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="search-btn" style="margin-right: 20px;">
-                        <!--<div selected-partyname data-selectdzzmc="selectparams.selectdzzmc"></div>-->
-                        <div style="float: right">
-                            <button class="btn btn-default1"
-                                    ng-click="addData()">新增
-                            </button>
-                            <button class="btn btn-default1"
-                                    ng-click="showPanelRecord()">更新记录
-                            </button>
-                        </div>
-                    </div>
-                </div>
-                <div class="body">
-                    <div class="table-responsive list-table-panel">
-                        <div class="tool-box">
-                            <a class="tool-item" ng-repeat="it in dataList">
-                                <div class="tool-item-content">
-                                    <div class="tool-title">{{it.TITLE}}</div>
-                                    <div class="tool-img" ng-if="it.PANELID!=null"
-                                         ng-click="showData(it.PUBLICITYPOSITIONID,it.PANELID)">
-                                        <img src="../../api/home/showImg/{{it.PANELIMG}}"
-                                             style="height: 132px;width: 90%;">
-                                    </div>
-                                    <div class="tool-title" ng-if="it.PANELID!=null">
-                                        {{it.PARTYNAME}}
-                                        <button
-                                                class="btn td-btn bg-light-green waves-effect"
-                                                ng-click="editData(it.PUBLICITYPOSITIONID,it.PANELID)"
-                                                title="修改">
-                                            修改
-                                        </button>
-                                    </div>
-                                    <div class="tool-img" ng-if="it.PANELID==null">
-                                        <img src="images/notimg.png" style="height: 132px">
-                                    </div>
-                                    <div class="tool-title" ng-if="it.PANELID==null" style="color: red">宣传版内容为空（待更新）
-                                    </div>
-                                </div>
-                            </a>
-                        </div>
-                    </div>
-                    <pagination data-pageindex="selectparams.pageindex" data-pagesize="selectparams.pagesize"
-                                data-ptotal="pageInfo.ptotal"></pagination>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

src/main/resources/static/app/main/publicity/position/panel/panelList.js

@@ -1,226 +0,0 @@
-(function ($app) {
-    $app.module('gtPartyApp').controller('publicityPositionPanelListCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $bsRouterState, AuthUser, $timeout) {
-        $state.params = $bsRouterState.$params($scope);
-
-        //定义数据集合
-        $scope.loginUserId = AuthUser.getUser().Id;
-        $scope.dataList = []; //列表数据
-        $scope.dataTotal = [{name: '过期', type: 1, count: 0, checked: $state.params.isExpired == 1 ? true : false}, {
-            name: '待审',
-            type: 2,
-            count: 0,
-            checked: $state.params.panelState == 0 ? true : false
-        }];
-        $scope.positionTypeList = [];
-        $scope.positionLevelList = [];
-        $scope.positionStateList = [];
-
-        $scope.selectparams = {
-            isunfold: false,//组织结构树展开收缩
-            'pageindex': 1,
-            'pagesize': 10,
-            isshowxz: 0,
-            selectdzzdm: "",
-            selectdzzmc: "",
-            defaultselected: $state.params.dzzdm,
-            parentcode: AuthUser.getUser().ParentDpCode,
-            parentname: AuthUser.getUser().ParentDpName,
-            szdzzdm: AuthUser.getUser().DPCode,
-            szdzzmc: AuthUser.getUser().DPName,
-            zzfbType: null,
-            partyCode: '',//党组织代码
-            userid: AuthUser.getUser().Id,
-            positionName: '',
-            positionType: null,
-            positionLevel: null,
-            positionName: '',
-            beginTime: '',
-            endTime: '',
-            positionState: null,
-            headUserName: '',
-            panelState: $state.params.panelState == undefined ? null : $state.params.panelState,
-            isExpired: $state.params.isExpired == undefined ? null : $state.params.isExpired,
-            updateTime_bt: $state.params.updateTime_bt == undefined ? null : $state.params.updateTime_bt,
-            updateTime_et: $state.params.updateTime_et == undefined ? null : $state.params.updateTime_et
-        };
-        $scope.pageInfo = {ptotal: 0};
-        //监视页数变化
-        $scope.$watch("selectparams.pageindex", function (newVal, oldVal) {
-            if ($scope.pageInfo.ptotal > 0) {
-                $scope.loadData();
-            }
-        });
-
-        $scope.$watch("selectparams.selectdzzdm", function (newVal, oldVal) {
-            if (newVal != "") {
-
-                if ($scope.selectparams.defaultselected != "" && $scope.selectparams.defaultselected != null &&
-                    $scope.selectparams.defaultselected != $scope.selectparams.selectdzzdm)
-                    return;
-
-                $scope.selectparams.partyCode = $scope.selectparams.selectdzzdm;
-                if ($scope.selectparams.selectdzzdm != AuthUser.getUser().DPCode) {
-                    $scope.selectparams.userid = "";
-                } else {
-                    $scope.selectparams.userid = AuthUser.getUser().Id;
-                }
-                $scope.loadData();
-            }
-        });
-
-        $scope.$watch("selectparams.zzfbType", function (newVal, oldVal) {
-            if (newVal != oldVal) {
-                $scope.loadData();
-            }
-        });
-
-        $scope.$on('tabChildReloadData', function (event, data) {
-            if (data.name == 'publicityPositionPanelListCtrl') {
-                $scope.loadData();
-            }
-        });
-
-
-        //查询
-        $scope.search = function () {
-            $scope.loadData();
-        };
-
-        //加载列表数据
-        $scope.loadData = function () {
-            $scope.selectparams.defaultselected = "";
-            $http
-            ({
-                method: 'get', url: '../../api/publicity/getPublicityPanelList', params: $scope.selectparams
-            }).then(function (result) {
-                $scope.dataList = result.data.item.list;
-                $scope.pageInfo.ptotal = result.data.item.total;
-
-                $scope.loadTotal();
-            });
-        };
-
-        $scope.loadTotal = function () {
-            $http
-            ({
-                method: 'get', url: '../../api/publicity/getPublicityPanelTotal', params: $scope.selectparams
-            }).then(function (result) {
-                $scope.dataTotal[0].count = result.data.expired;
-                $scope.dataTotal[1].count = result.data.notApprove;
-            });
-        };
-
-        //查询
-        $scope.selectTotal = function (item) {
-            item.checked = !item.checked;
-
-            angular.forEach($scope.dataTotal, function (val) {
-                switch (val.type) {
-                    case 1:
-                        $scope.selectparams.isExpired = val.checked ? 1 : null;
-                        break;
-                    case 2:
-                        $scope.selectparams.panelState = val.checked ? 0 : null;
-                        break;
-                }
-            });
-
-            if ($scope.selectparams.pageindex != 1) {
-                $scope.selectparams.pageindex = 1;
-            } else {
-                $scope.loadData();
-            }
-        };
-
-        //新增
-        $scope.addData = function () {
-            $bsRouterState.$closeTabName("home.publicityPositionPanelAdd");
-            $timeout(function () {
-                $bsRouterState.go('home.publicityPositionPanelAdd', {});
-            }, 100);
-        };
-
-        //修改
-        $scope.editData = function (positionId, panelId) {
-            $bsRouterState.$closeTabName("home.publicityPositionPanelAdd");
-            $timeout(function () {
-                $bsRouterState.go('home.publicityPositionPanelAdd', {positionId: positionId, panelId: panelId});
-            }, 100);
-        };
-
-        //查看
-        $scope.showData = function (positionId, panelId) {
-            $bsRouterState.$closeTabName("home.publicityPositionPanelShow");
-            $timeout(function () {
-                $bsRouterState.go('home.publicityPositionPanelShow', {positionId: positionId, panelId: panelId, op: 0});
-            }, 100);
-        };
-
-        $scope.showPanelRecord = function () {
-            $bsRouterState.$closeTabName("home.publicityPositionPanelRecord");
-            $timeout(function () {
-                $bsRouterState.go('home.publicityPositionPanelRecord', {});
-            }, 100);
-        };
-
-        $scope.getPositionTypeList = function () {
-            $http({
-                method: 'get',
-                url: '../../api/dictionary/getDictionaryListByDicTypeKey',
-                params: {
-                    dicTypeKey: 'positionType'
-                }
-            }).then(function (result) {
-                $scope.positionTypeList = result.data;
-            }, function (resp) {
-
-            });
-        };
-        $scope.getPositionLevelList = function () {
-            $http({
-                method: 'get',
-                url: '../../api/dictionary/getDictionaryListByDicTypeKey',
-                params: {
-                    dicTypeKey: 'psiLevel'
-                }
-            }).then(function (result) {
-                $scope.positionLevelList = result.data;
-            }, function (resp) {
-
-            });
-        };
-        $scope.getPositionStateList = function () {
-            $http({
-                method: 'get',
-                url: '../../api/dictionary/getDictionaryListByDicTypeKey',
-                params: {
-                    dicTypeKey: 'positionState'
-                }
-            }).then(function (result) {
-                $scope.positionStateList = result.data;
-            }, function (resp) {
-
-            });
-        };
-        $scope.setisunfold = function () {
-            $scope.selectparams.isunfold = !$scope.selectparams.isunfold;
-            $scope.$emit('menudatas.toggle', !$scope.selectparams.isunfold);
-        };
-        $scope.getPositionTypeList();
-        $scope.getPositionLevelList();
-        $scope.getPositionStateList();
-
-        $scope.showMsg = function (title, content) {
-            $alert({
-                title: title + '：',
-                content: content,
-                placement: 'top',
-                type: 'info',
-                show: true,
-                duration: 3
-            });
-
-        };
-
-    });
-})(angular);

src/main/resources/static/app/main/publicity/position/panel/panelRecordList.html

@@ -1,72 +0,0 @@
-<titlemenu></titlemenu>
-<div class="dj-card">
-    <div activate-input activate-select class="dj-body">
-        <div class="table-responsive list-table-panel">
-            <div class="list-table-title">
-                <div class="table-title" style="text-align: center;width: 100%;font-weight: bold;">
-                    阵地更新记录
-                </div>
-            </div>
-            <table class="table table-bordered table-striped table-hover js-basic-example dataTable text-nowrap">
-                <thead>
-                <tr>
-                    <th>序号</th>
-                    <th>展板</th>
-                    <th>标题</th>
-                    <th>缩略图</th>
-                    <th>上传人</th>
-                    <th>上传支部</th>
-                    <th>更新时间</th>
-                    <th>审核状态</th>
-                    <th>操作</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr ng-repeat="it in dataList">
-                    <td scope="row" class="text-center">{{selectparams.pagesize*(selectparams.pageindex-1)+$index+1}}
-                    </td>
-                    <td>{{it.POSITIONNAME}}</td>
-                    <td>{{it.TITLE}}</td>
-                    <td class="text-center" style="width: 200px;">
-                        <!--<img style="width: 220px;height:100px;"
-                             src="../../api/home/showImg/{{it.PANELIMG}}"
-                             data-toggle="modal" data-target="#showPanelImgOfApprove" ng-click="showImg(it.PANELIMG)"
-                        />-->
-                        <img-component data-filerefid="it.PANELID" data-filetypeid="4"
-                                       data-ismulti="false" data-height="150"
-                                       data-width="100" data-readonly="true"></img-component>
-                    </td>
-                    <td>{{it.CREATEUSERNAME}}</td>
-                    <td>{{it.PARTYNAME}}</td>
-                    <td>{{it.PANELTIME | date:'yyyy-MM-dd'}}</td>
-                    <td>{{it.PANELSTATENAME}}</td>
-                    <td class="text-center">
-                        <button ng-if="it.PANELSTATE==0"
-                                role-permission-code="publicityPositionList.btnUpdate"
-                                class="btn td-btn bg-light-green waves-effect"
-                                ng-click="approveData(it.PANELID,true)"
-                                title="通过">
-                            通过
-                        </button>
-                        <button ng-if="it.PANELSTATE==0"
-                                role-permission-code="publicityPositionList.btnDelete"
-                                class="btn td-btn bg-light-green waves-effect"
-                                ng-click="approveData(it.PANELID,false)"
-                                title="不通过">
-                            不通过
-                        </button>
-                    </td>
-                </tr>
-                <tr ng-if="dataList.length<=0">
-                    <td colspan="9" style="text-align:center">暂无数据</td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-        <pagination data-pageindex="selectparams.pageindex" data-pagesize="selectparams.pagesize"
-                    data-ptotal="pageInfo.ptotal"></pagination>
-        <div class="form_foot" style="margin-top: 10px;">
-            <button type="button" class="btn btn-default" ng-click="pagechange();">返回</button>
-        </div>
-    </div>
-</div>

src/main/resources/static/app/main/publicity/position/panel/panelRecordList.js

@@ -1,84 +0,0 @@
-(function ($app) {
-    $app.module('gtPartyApp').controller('publicityPositionPanelRecordListCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $bsRouterState, AuthUser, $timeout) {
-        $state.params = $bsRouterState.$params($scope);
-
-        //定义数据集合
-        $scope.loginUserId = AuthUser.getUser().Id;
-        $scope.dataList = []; //列表数据
-
-        $scope.selectparams = {
-            'pageindex': 1,
-            'pagesize': 10,
-            isshowxz: 0,
-            selectdzzdm: "",
-            selectdzzmc: "",
-            defaultselected: $state.params.dzzdm,
-            parentcode: AuthUser.getUser().ParentDpCode,
-            parentname: AuthUser.getUser().ParentDpName,
-            szdzzdm: AuthUser.getUser().DPCode,
-            szdzzmc: AuthUser.getUser().DPName,
-            partyCode: AuthUser.getUser().DataDzzdm,//党组织代码
-            userid: AuthUser.getUser().Id
-        };
-        $scope.pageInfo = {ptotal: 0};
-        //监视页数变化
-        $scope.$watch("selectparams.pageindex", function (newVal, oldVal) {
-            if ($scope.pageInfo.ptotal > 0) {
-                $scope.loadData();
-            }
-        });
-
-        $scope.showFileId = "";
-        $scope.img = {rotate: 0};
-
-        //加载列表数据
-        $scope.loadData = function () {
-            $scope.selectparams.defaultselected = "";
-            $http
-            ({
-                method: 'get', url: '../../api/publicity/getPublicityPanelRecordList', params: $scope.selectparams
-            }).then(function (result) {
-                $scope.dataList = result.data.item.list;
-                $scope.pageInfo.ptotal = result.data.item.total;
-            });
-        };
-
-        $scope.approveData = function (panelId, isPass) {
-            if (confirm(isPass ? "确定审核通过？" : "确定审核不通过？")) {
-                $http({
-                    method: 'post',
-                    url: '../../api/publicity/approvePanel',
-                    data: {
-                        panelId: panelId,
-                        isPass: isPass
-                    }
-                }).then(function (result) {
-                    $scope.showMsg('成功', result.data.msg);
-                    $scope.loadData();
-                }, function () {
-                    $scope.showMsg('错误', '服务器错误');
-                });
-            }
-        };
-
-        $scope.showImg = function (fileId) {
-            $scope.showFileId = fileId;
-            $scope.img.rotate = 0;
-        };
-
-        $scope.loadData();
-
-        $scope.showMsg = function (title, content) {
-            $alert({
-                title: title + '：',
-                content: content,
-                placement: 'top',
-                type: 'info',
-                show: true,
-                duration: 3
-            });
-
-        };
-
-    });
-})(angular);

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

@@ -0,0 +1,126 @@
+<div class="modal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" style="width: 1300px;height: 500px;">
+        <div ng-if="panelEditParams.op==1" class="card">
+            <div class="header">
+                <button type="button" class="close" ng-click="$hide()">&times;</button>
+                <h4 class="modal-title">阵地更新记录</h4>
+            </div>
+            <div class="body">
+                <form role="form" name="editPanelForm" novalidate>
+                    <div class="dj-formtable">
+                        <table class="dj-table">
+                            <tr>
+                                <th>宣传标语</th>
+                                <td ng-class="{ 'has-error' : this.editPanelForm.title.$invalid &&  this.editPanelForm.$submitted}">
+                                    <input type="text" name="title" ng-model="dataModel.title"
+                                           maxlength="200"
+                                           class="form-control" ng-required="true"/>
+                                    <span ng-show="this.editPanelForm.title.$invalid &&  this.editPanelForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <th>宣传备注</th>
+                                <td ng-class="{ 'has-error' : this.editPanelForm.remark.$invalid &&  this.editPanelForm.$submitted}">
+                                    <input type="text" name="remark" ng-model="dataModel.remark"
+                                           maxlength="200"
+                                           class="form-control" ng-required="true"/>
+                                    <span ng-show="this.editPanelForm.remark.$invalid &&  this.editPanelForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <th>更新时间</th>
+                                <td ng-class="{ 'has-error' : this.editPanelForm.paneltime.$invalid &&  this.editPanelForm.$submitted}">
+                                    <input name="paneltime" class="form-control"
+                                           autocomplete="off"
+                                           autoclose="true"
+                                           data-date-format="yyyy-MM-dd" data-date-type="date"
+                                           ng-model="dataModel.paneltime"
+                                           ng-required="true"
+                                           data-max-date="{{maxDate}}"
+                                           placeholder="" bs-datepicker/>
+                                    <span ng-show="this.editPanelForm.paneltime.$invalid &&  this.editPanelForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <!--<th>更新周期</th>
+                                <td ng-class="{ 'has-error' : this.editPanelForm.panelcycle.$invalid &&  this.editPanelForm.$submitted}">
+                                    <select class="form-control show-tick"
+                                            ng-model="dataModel.panelcycle"
+                                            ng-options="type.dickey as type.dicvalue for type in panelCycleList"
+                                            class="form-control"
+                                            name="panelcycle" ng-required="true">
+                                        <option value="" selected>&#45;&#45;请选择&#45;&#45;</option>
+                                    </select>
+                                    <span ng-show="this.editPanelForm.panelcycle.$invalid &&  this.editPanelForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>-->
+                            </tr>
+                            <tr>
+                                <th>上传图片</th>
+                                <td colspan="3">
+                                    <img-component data-filerefid="imgConfig.filerefid"
+                                                   data-filetypeid="imgConfig.filetypeid"
+                                                   data-ismulti="imgConfig.ismulti" data-height="imgConfig.height"
+                                                   data-width="imgConfig.width" data-readonly="imgConfig.readonly"
+                                                   data-img-list="imgConfig.imgList"></img-component>
+                                    <span style="color: red;">备注:以上可上传照片，此项为选传项，仅作资料留存，不作为必传项点，也不得作为检查、考核项点。</span>
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                    <div class="form_foot">
+                        <button type="button" class="btn btn-default" ng-click="$hide();">取消</button>
+                        <button type="button"
+                                class="btn btn-primary"
+                                ng-click="savePanel(this.editPanelForm.$valid)">保存
+                        </button>
+                    </div>
+                </form>
+            </div>
+        </div>
+        <div ng-if="panelEditParams.op==2" class="card">
+            <div class="header">
+                <button type="button" class="close" ng-click="$hide()">&times;</button>
+                <h4 class="modal-title">展板信息</h4>
+            </div>
+            <div class="body">
+                <form role="form" name="editPanelForm" novalidate>
+                    <div panel-title data-title="'图版信息'"></div>
+                    <div class="dj-formtable">
+                        <table class="dj-table">
+                            <tr>
+                                <th>宣传标语</th>
+                                <td>
+                                    {{dataModel.title}}
+                                </td>
+                                <th>宣传备注</th>
+                                <td>
+                                    {{dataModel.remark}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <th>更新时间</th>
+                                <td>
+                                    {{dataModel.paneltime | date:'yyyy-MM-dd'}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <th>图片</th>
+                                <td>
+                                    <img-component data-filerefid="imgConfig.filerefid"
+                                                   data-filetypeid="imgConfig.filetypeid"
+                                                   data-ismulti="imgConfig.ismulti" data-height="imgConfig.height"
+                                                   data-width="imgConfig.width" data-readonly="true"
+                                                   data-img-list="imgConfig.imgList"></img-component>
+                                </td>
+                                <td colspan="2" style="width: 50%;"></td>
+                            </tr>
+                        </table>
+                    </div>
+                    <div class="form_foot">
+                        <button type="button" class="btn btn-default" ng-click="$hide();">关闭</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>

src/main/resources/static/app/main/publicity/position/panelEdit.js

@@ -0,0 +1,37 @@
+var panelEditCtrl = function ($scope, $http, $alert, $loading) {
+    $scope.editPanelBack = panelEditModal.editPanelBack;
+    $scope.panelEditParams = panelEditModal.params;
+    $scope.dataModel = panelEditModal.params.dataModel;
+
+    $scope.imgConfig = {
+        filerefid: $scope.dataModel.panelid,
+        filetypeid: 4,
+        readonly: false,
+        ismulti: true,
+        height: 150,
+        width: 180,
+        imgList: []
+    };
+
+    $scope.savePanel = function (isflag) {
+        if (!isflag) {
+            $scope.showMsg('提示', '请填写相关信息');
+            return false;
+        }
+
+        if ($scope.imgConfig.imgList.length > 0) {
+            $scope.dataModel.panelimg = $scope.imgConfig.imgList[0].fileid;
+        }
+
+        if (isflag) {
+            $scope.editPanelBack($scope.dataModel);
+
+            $scope.$hide();
+        }
+    };
+
+
+};
+
+//定义模态框
+var panelEditModal;

src/main/resources/static/app/main/taskpubmgr/taskpub/edit.html

@@ -2,11 +2,11 @@
 <div class="dj-card">
     <div class="dj-body" activate-input activate-select>
         <form role="form" name="editForm" novalidate>
-            <div panel-title data-title="'通知信息'"></div>
+            <div panel-title data-title="'任务信息'"></div>
             <div ng-if="isDetail" class="dj-formtable">
                 <table class="dj-table">
                     <tr>
-                        <th>通知名称<span style="color: red;">*不超过15字</span></th>
+                        <th>任务名称<span style="color: red;">*不超过15字</span></th>
                         <td ng-class="{ 'focused error' : this.editForm.taskname.$invalid &&  this.editForm.$submitted}">
                             <input type="text" name="taskname" ng-model="dataModel.taskname"
                                    class="form-control" ng-required="true"/>
@@ -61,7 +61,7 @@
                         <td></td>
                     </tr>
                     <tr>
-                        <th>通知内容</th>
+                        <th>任务内容</th>
                         <td colspan="5">
                             <textarea maxlength="800" ng-model="dataModel.taskcontent" style="width: 100%;" rows="2"
                                       name="taskcontent"></textarea>
@@ -72,7 +72,7 @@
             <div ng-if="!isDetail" class="dj-formtable">
                 <table class="dj-table">
                     <tr>
-                        <th>通知名称</th>
+                        <th>任务名称</th>
                         <td>
                             {{dataModel.taskname}}
                         </td>
@@ -100,7 +100,7 @@
                         <td></td>
                     </tr>
                     <tr>
-                        <th>通知内容</th>
+                        <th>任务内容</th>
                         <td colspan="5">
                             <pre ng-bind-html="dataModel.taskcontent"
                                  style="white-space: pre-wrap;margin-top: 10px;"></pre>

src/main/resources/static/app/main/taskpubmgr/taskpub/view.html

@@ -2,11 +2,11 @@
 <div class="dj-card">
     <div class="dj-body" activate-input activate-select>
         <form role="form" name="editForm2" novalidate>
-            <div panel-title data-title="'通知信息'"></div>
+            <div panel-title data-title="'任务信息'"></div>
             <div class="dj-formtable">
                 <table class="dj-table">
                     <tr>
-                        <th>通知名称</th>
+                        <th>任务名称</th>
                         <td>
                             {{dataModel.taskname}}
                         </td>