首页优化

assets/js/controllers/dashboard/newdash.js

@@ -1088,21 +1088,14 @@ appFormly.controller('newDashCtrl', ['$rootScope', '$auth', '$scope', '$parse',
                 var filterData = {
                     "idx": 0,
                     "sum": 5,
-                    "wxincident": {
-                        "serviceState": {
-                            "id": 1650
+                    "incident": {
+                        "source": {value: "im"},
+                        "state": {
+                            "id": 1765
                         }
                     }
                 };
-                // 根据权限查询
-                if($rootScope.user.duty){
-                    // 当前的所属责任科室
-                    filterData.wxincident.duty = $rootScope.user.duty;
-                }else if($rootScope.user.branch){
-                    // 当前的所属院区
-                    filterData.wxincident.branch = $rootScope.user.branch.id;
-                }
-                api_bpm_data.fetchDataList("wxincident", filterData).then(function(data) {
+                api_bpm_data.fetchDataList("incident", filterData).then(function(data) {
                     if (data.status == 200) {
                         $scope.wxWebList = data.list;
                     }

assets/js/controllers/incident/incidentCtrl.js

@@ -2135,7 +2135,15 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     $scope.othcode = {};
                     $scope.searchkeys.acceptDate = new Date();
                     $scope.searchkeys.acceptDateEnd = new Date();
-                    filterData.incident = {acceptDate:moment().format('YYYY-MM-DD 00:00:00'),acceptDateEnd:moment().format('YYYY-MM-DD 23:59:59')};
+                    if(filterData.incident){
+                        filterData.incident.acceptDate = moment().format('YYYY-MM-DD 00:00:00');
+                        filterData.incident.acceptDateEnd = moment().format('YYYY-MM-DD 23:59:59');
+                    }else{
+                        filterData.incident = {
+                            acceptDate: moment().format('YYYY-MM-DD 00:00:00'),
+                            acceptDateEnd: moment().format('YYYY-MM-DD 23:59:59'),
+                        }
+                    }
                 }else{
                     $scope.searchkeys.acceptDate = undefined;
                     $scope.searchkeys.acceptDateEnd = undefined;
@@ -2143,7 +2151,13 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 if($state.params.state){
                     var obj = $scope.state.find(function(v){return $state.params.state == v.id});
                     $scope.othcode = {state:obj};
-                    filterData.incident = {statusId: $state.params.state};
+                    if(filterData.incident){
+                        filterData.incident.statusId = $state.params.state;
+                    }else{
+                        filterData.incident = {
+                            statusId: $state.params.state,
+                        }
+                    }
                 }
             }
         }

assets/views/dashboard/newdash.html

@@ -551,7 +551,7 @@
                             <div class="fenleitop  fontsizes-14">
                                 <div class="row bottomborder">
                                     <div class="col-xs-12 fontcolor-two padding-15">
-                                        <div class="fenleifont pull-left">微信WEB工单（未受理）</div>
+                                        <div class="fenleifont pull-left">微信WEB工单（待受理）</div>
                                         <a class="fenleifont pull-right  fontsizes-14" ng-click="goWxWeb()">更多>></a>
                                     </div>
                                 </div>
@@ -568,9 +568,9 @@
                                         <tbody>
                                             <tr ng-repeat="wxWeb in wxWebList track by wxWeb.id" class="pointfont">
                                                 <td class="hidden-xs th-noline onlyaline" style="min-width:10px;max-width:20px">{{$index+filterData.idx*5+1}}</td>
-                                                <td class="hidden-xs th-noline onlyaline" style="min-width:80px;max-width:90px" title="{{wxWeb.incidentDescription}}">{{wxWeb.incidentDescription}}</td>
-                                                <td class="th-noline onlyaline" style="min-width:60px;max-width:70px" title="{{wxWeb.departmentDTO ? wxWeb.departmentDTO.dept : ''}}">{{wxWeb.departmentDTO ? wxWeb.departmentDTO.dept : ''}}</td>
-                                                <td class="th-noline gobutton onlyaline" style="min-width:40px;max-width:50px">{{wxWeb.createTime|date:'yyyy-MM-dd HH:mm'}}</td>
+                                                <td class="hidden-xs th-noline onlyaline" style="min-width:80px;max-width:90px" title="{{wxWeb.description}}">{{wxWeb.description}}</td>
+                                                <td class="th-noline onlyaline" style="min-width:60px;max-width:70px" title="{{wxWeb.department ? wxWeb.department.dept : ''}}">{{wxWeb.department ? wxWeb.department.dept : ''}}</td>
+                                                <td class="th-noline gobutton onlyaline" style="min-width:40px;max-width:50px">{{wxWeb.startDate|date:'yyyy-MM-dd HH:mm'}}</td>
                                             </tr>
                                         </tbody>
                                     </table>

assets/views/partials/top-navbar.html

@@ -56,7 +56,7 @@
                 <div class="know-text-group_item fl">今日建单：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'',date:'today'})">{{managerIndexInfo.createOrders}}</strong></div>
                 <div class="know-text-group_item fl">所有待接单：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1543',date:''})">{{managerIndexInfo.waitOrders}}</strong></div>
                 <div class="know-text-group_item fl">所有处理中：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1544',date:''})">{{managerIndexInfo.doingOrders}}</strong></div>
-                <div class="know-text-group_item fl">已完成（已解决、已关闭）：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1545',date:'today'})">{{managerIndexInfo.doneOrders}}</strong></div>
+                <div class="know-text-group_item fl">已关闭：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1546',date:'today'})">{{managerIndexInfo.doneOrders}}</strong></div>
             </ng-container>
         </div>
         <ul class="nav navbar-right" ct-fullheight="window" data-ct-fullheight-exclusion="header"

assets/views/partials/top-navbar1.html

@@ -56,7 +56,7 @@
                 <div class="know-text-group_item fl">今日建单：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'',date:'today'})">{{managerIndexInfo.createOrders}}</strong></div>
                 <div class="know-text-group_item fl">所有待接单：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1543',date:''})">{{managerIndexInfo.waitOrders}}</strong></div>
                 <div class="know-text-group_item fl">所有处理中：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1544',date:''})">{{managerIndexInfo.doingOrders}}</strong></div>
-                <div class="know-text-group_item fl">已完成（已解决、已关闭）：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1545',date:'today'})">{{managerIndexInfo.doneOrders}}</strong></div>
+                <div class="know-text-group_item fl">已关闭：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1546',date:'today'})">{{managerIndexInfo.doneOrders}}</strong></div>
             </ng-container>
         </div>
         <ul class="nav navbar-right" ct-fullheight="window" data-ct-fullheight-exclusion="header"

assets/views/partials/top-navbar2.html

@@ -56,7 +56,7 @@
                 <div class="know-text-group_item fl">今日建单：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'',date:'today'})">{{managerIndexInfo.createOrders}}</strong></div>
                 <div class="know-text-group_item fl">所有待接单：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1543',date:''})">{{managerIndexInfo.waitOrders}}</strong></div>
                 <div class="know-text-group_item fl">所有处理中：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1544',date:''})">{{managerIndexInfo.doingOrders}}</strong></div>
-                <div class="know-text-group_item fl">已完成（已解决、已关闭）：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1545',date:'today'})">{{managerIndexInfo.doneOrders}}</strong></div>
+                <div class="know-text-group_item fl">已关闭：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1546',date:'today'})">{{managerIndexInfo.doneOrders}}</strong></div>
             </ng-container>
         </div>
         <ul class="nav navbar-right" ct-fullheight="window" data-ct-fullheight-exclusion="header"

assets/views/partials/top-navbar4.html

@@ -56,7 +56,7 @@
                 <div class="know-text-group_item fl">今日建单：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'',date:'today'})">{{managerIndexInfo.createOrders}}</strong></div>
                 <div class="know-text-group_item fl">所有待接单：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1543',date:''})">{{managerIndexInfo.waitOrders}}</strong></div>
                 <div class="know-text-group_item fl">所有处理中：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1544',date:''})">{{managerIndexInfo.doingOrders}}</strong></div>
-                <div class="know-text-group_item fl">已完成（已解决、已关闭）：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1545',date:'today'})">{{managerIndexInfo.doneOrders}}</strong></div>
+                <div class="know-text-group_item fl">已关闭：<strong class="know-text-group_strong ng-binding" ng-click="goTo('app.incident.list',{tab:'all',state:'1546',date:'today'})">{{managerIndexInfo.doneOrders}}</strong></div>
             </ng-container>
         </div>
         <ul class="nav navbar-right" ct-fullheight="window" data-ct-fullheight-exclusion="header"