优化

assets/js/config.router.js

@@ -495,7 +495,7 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
                     label: 'Incident'
                 }
             }).state('app.incident.list', {
-                url: '/list/{model}/:tab/:state/:date',
+                url: '/list/{model}/:tab/:state/:date/:handUserId',
                 templateUrl: "assets/views/incident/list.html",
                 resolve: loadSequence('jquery-sparkline', 'spin', 'ladda', 'angular-ladda', 'ui.grid', 'moment', 'angularPrint', 'angularFileUpload', 'ui.select', 'multi.select.tree', 'angularBootstrapNavTree', 'incidentCtrl'),
                 title: 'incident.LIST',

assets/js/controllers/dashboard/newdash.js

@@ -1319,9 +1319,23 @@ appFormly.controller('newDashCtrl', ['$rootScope', '$auth', '$scope', '$parse',
             // if (optionfault && typeof optionfault === "object") {
             //     myChartfault.setOption(optionfault, true);
             // }
+            // 柱形图点击事件 2022年11月1日
+            $scope.handlePersonResolveArr = [];
+            myChartfault.on('click', function (params) {
+                // $scope.goTo('app.incident.list',{tab:'all',date:'today'});
+                var item = $scope.handlePersonResolveArr[params.dataIndex];
+                var date = new Date($scope.thisyertop5, $scope.thismonthtop5 - 1);
+                var startDate = moment(date).startOf('month').format("YYYY-MM-DD");
+                var endDate = moment(date).endOf('month').format("YYYY-MM-DD");
+                console.log(moment(date).startOf('month').format("YYYY-MM-DD"));
+                console.log(moment(date).endOf('month').format("YYYY-MM-DD"));
+                console.log($scope.handlePersonResolveArr[params.dataIndex],$scope.thisyertop5,$scope.thismonthtop5);
+                $scope.goTo('app.incident.list',{tab:'all',date:startDate + 'to' + endDate,handUserId:item.objectMap.userId});
+            });
             function getinternettop5(data) {
                 api_newreport.fetchDataList('handlePersonResolve', data).then(function(data) {
                     if (data.status == 200) {
+                        $scope.handlePersonResolveArr = angular.copy(data.data);
                         var xaxisdata = [];
                         if (data.data.length > 0) {
                             for (var i = 0; i < 5 && i < data.data.length; i++) {

assets/js/controllers/incident/incidentCtrl.js

@@ -54,11 +54,16 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         }
     })
     // -----------------分割线 end----------------
-    // 是否逾期seimin
+    // 是否逾期
     $scope.selectType = [
         { id: '2', name: '是' },
         { id: '0', name: '否' }
     ];
+    // 是否直接处理
+    $scope.directProcess = [
+        { id: '1', name: '是' },
+        { id: '0', name: '否' }
+    ];
     // /是否逾期
     $scope.langs = i18nService.getAllLangs();
     $scope.lang = 'zh-cn';
@@ -100,6 +105,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
 
     $scope.gridOptions = {};
     $scope.gridOptions.data = 'myData';
+    $scope.gridOptions.rowHeight = 54;
     $scope.gridOptions.enableColumnResizing = true;
     $scope.gridOptions.enableFiltering = false;
     $scope.gridOptions.enableGridMenu = true;
@@ -217,77 +223,86 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             },
             {
                 name: 'incidentsign',
-                displayName: '事件单号',
+                displayName: '单号|源',
                 width: 120,
                 cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents">{{row.entity.incidentsign}}</div>' +
+                    '<div class="ui-grid-cell-contents">{{row.entity.incidentsign||"无"}}<br>{{row.entity.source?row.entity.source.name:"无"}}</div>' +
                     '</div>'
             },
             {
                 name: 'requester.name',
                 displayName: '报修人',
-                width: '6%',
-                minWidth: '90',
-                enableSorting: false,
-                cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents" >{{row.entity.requester.name}}</div>' +
-                    '</div>'
-            },
-            {
-                name: 'requester.account',
-                displayName: '学工号',
-                width: '6%',
+                width: '7%',
                 minWidth: '90',
                 enableSorting: false,
                 cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents" >{{row.entity.requester.account}}</div>' +
+                    '<div class="ui-grid-cell-contents" >{{row.entity.requester?row.entity.requester.name:"无"}}<br>{{row.entity.requester?row.entity.requester.account:"无"}}</div>' +
                     '</div>'
             },
+            // {
+            //     name: 'requester.account',
+            //     displayName: '学工号',
+            //     width: '6%',
+            //     minWidth: '90',
+            //     enableSorting: false,
+            //     cellTemplate: '<div>' +
+            //         '<div class="ui-grid-cell-contents" >{{row.entity.requester.account}}</div>' +
+            //         '</div>'
+            // },
             {
                 name: 'contactsInformation',
-                displayName: '联系电话',
-                width: '105',
+                displayName: '联系人',
+                width: '12%',
                 cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents">{{row.entity.contactsInformation}}</div>' +
+                    '<div class="ui-grid-cell-contents">{{row.entity.contacts||"无"}}<br>{{row.entity.contactsInformation||"无"}}</div>' +
                     '</div>'
             },
             {
                 name: 'category',
-                displayName: '事件分类',
-                width: '10%',
+                displayName: '分类|区域点',
+                width: '20%',
                 enableSorting: false,
                 cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents">{{row.entity.category.category}}</div>' +
+                    '<div class="ui-grid-cell-contents">{{row.entity.allCategory||"无"}}<br>{{grid.appScope.areaplace(row.entity)}}</div>' +
                     '</div>'
             },
-            {
-                name: 'houseNumber',
-                displayName: '区域地点',
-                width: '14%',
-                enableFiltering: false,
-                cellTemplate: '<div><div class="ui-grid-cell-contents">{{grid.appScope.areaplace(row.entity)}}</div></div>'
-            },
+            // {{row.entity.category.category}}
+            // {
+            //     name: 'houseNumber',
+            //     displayName: '区域地点',
+            //     width: '14%',
+            //     enableFiltering: false,
+            //     cellTemplate: '<div><div class="ui-grid-cell-contents">{{grid.appScope.areaplace(row.entity)}}</div></div>'
+            // },
             {
                 name: 'acceptUser.name',
-                displayName: '受理人',
+                displayName: '受理|处理人',
                 width: '7%',
                 minWidth: '80',
                 enableSorting: false,
                 cellTemplate: '<div>' +
-                    '<div class="ui-grid-cell-contents" >{{row.entity.acceptUser.name}}</div>' +
+                    '<div class="ui-grid-cell-contents" >{{row.entity.acceptUser?row.entity.acceptUser.name:"无"}}<br>{{row.entity.handlingPersonnelUser?row.entity.handlingPersonnelUser.name:"无"}}</div>' +
                     '</div>'
             },
             {
                 name: 'acceptDate',
-                displayName: '登记时间',
+                displayName: '登记|接单时间',
                 width: '10%',
                 minWidth: '140',
                 enableFiltering: false,
-                cellTemplate: '<div><div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.acceptDate)}}</div></div>'
+                cellTemplate: '<div><div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.acceptDate)}}<br>{{row.entity.responseHandleTime||"无"}}</div></div>'
+            },
+            {
+                name: 'acceptDate1',
+                displayName: '解决时间',
+                width: '10%',
+                minWidth: '140',
+                enableFiltering: false,
+                cellTemplate: '<div><div class="ui-grid-cell-contents">{{row.entity.handleTime||"无"}}</div></div>'
             },
             {
                 name: 'groupORHandlerUser',
-                displayName: '处理人/组',
+                displayName: '时时处理',
                 width: '10%',
                 enableFiltering: false,
                 cellTemplate: '<div>' +
@@ -298,7 +313,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             {
                 name: 'state.name',
                 displayName: '状态',
-                width: '7%',
+                width: '5%',
                 minWidth: '70',
                 enableSorting: false,
                 cellTemplate: '<div>' +
@@ -308,13 +323,13 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             {
                 name: '操作',
                 enableSorting: false,
-                width: 500,
+                width: 300,
                 cellTemplate: '<incidentoperator style="background-color:{{row.entity.colourInfo.rgb}}" item="row.entity" colobject="col">',
                 enableFiltering: false
             },
         ];
         if($scope.wxIncidentWithCmdb==1){
-          let index = $scope.gridOptions.columnDefs.findIndex(v=>v.name == 'contactsInformation');
+          let index = $scope.gridOptions.columnDefs.findIndex(v=>v.name == 'category');
           $scope.gridOptions.columnDefs.splice(index,0,{
             name: 'assetId',
             displayName: '资产',
@@ -846,6 +861,27 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             }
         }
     })
+    //事件来源 liaomingming
+    $scope.source = [];
+    api_wechatfile.getDictionary({
+        "type": "list",
+        "key": "incident_source"
+    }).then(function (response) {
+        if (response) {
+            if (response.status = 200) {
+                $scope.source = response;
+                if (sessionStorage.searchincident && JSON.parse(sessionStorage.getItem("searchincident")).incident && JSON.parse(sessionStorage.getItem("searchincident")).incident.source) {
+                    angular.forEach($scope.source, function (item) {
+                        if (item.id == JSON.parse(sessionStorage.getItem("searchincident")).incident.source.id) {
+                            $scope.othcode = {
+                                "source": item
+                            };
+                        }
+                    })
+                }
+            }
+        }
+    })
     if (sessionStorage.searchincident && JSON.parse(sessionStorage.getItem("searchincident")).incident) {
         // angular.forEach($scope.state, function(item) {
         //         if (item.code == JSON.parse(sessionStorage.getItem("searchincident")).incident.statusId) {
@@ -906,12 +942,17 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
 
     }
     // 搜索
-    $scope.chiceIncident = function (item, stateid) {
+    $scope.chiceIncident = function (item, stateid, sourceid) {
         if (stateid && stateid.id) {
             item.statusId = stateid.id;
         } else {
             item.statusId = undefined;
         }
+        if (sourceid) {
+            item.source = sourceid;
+        } else {
+            item.source = undefined;
+        }
         console.log(item)
         
         var fildata = {};
@@ -954,10 +995,14 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         if(fildata.searchType === 'all'){
             if(fildata.incident&&fildata.incident.selectType){
                 fildata.incident.selectType = fildata.incident.selectType.id;
+            }else if(fildata.incident&&fildata.incident.directProcess){
+                fildata.incident.directProcess = fildata.incident.directProcess.id;
             }
         }else{
             if(fildata.incident&&fildata.incident.selectType){
                 delete fildata.incident.selectType;
+            }else if(fildata.incident&&fildata.incident.directProcess){
+                delete fildata.incident.directProcess;
             }
         }
         // /seimin
@@ -992,7 +1037,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     getRequester();
 
     //受理人，处理人
-    var getUser = function (fieldatas, it) {
+    function getUser(fieldatas, it) {
         api_user_data.fetchDataList('user', fieldatas).then(function (data) {
             // console.log(data);
             if (it == 1) {
@@ -1073,7 +1118,11 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         str += '  ' + (data.place ? (data.place.area ? data.place.area.area : '  ') : '  ');
         str += '  ' + (data.place ? (data.place.place ? data.place.place : '  ') : '  ');
         str += '  ' + (data.houseNumber ? data.houseNumber : '  ');
-        return str;
+        if(str.trim()){
+            return str;
+        }else{
+            return '无'
+        }
         //     } else {
         //         return data.area.area + ' ' + data.place.place;
         //     }
@@ -2570,7 +2619,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             $scope.isDisabledState = false;
         }
         $scope.searchstate = searchType;
-        $scope.chiceIncident($scope.searchkeys,$scope.othcode.state);
+        $scope.chiceIncident($scope.searchkeys,$scope.othcode.state,$scope.othcode.source);
         // console.log(defaultFilterData,'fanbu')
         // if(defaultFilterData.incident){
         //     var lsObject = defaultFilterData.incident;
@@ -2609,16 +2658,15 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         //     $scope.jry_refresh()
         // }, $rootScope.refreshTime);
     }
-    // 是否逾期下拉框选择seimin
+    // 是否逾期下拉框选择
     $scope.selectTypeChange = function(){
         console.log($scope.searchkeys.selectType,66666);
         if(window.sessionStorage.getItem('isGoyuqi') == 'yes'){
             $scope.searchkeys.selectType = {id:'2',name:'是'};
-            // window.sessionStorage.removeItem('isGoyuqi');//seimin
         }
         var ids = $scope.searchkeys.selectType.id
         if(defaultFilterData.incident){
-            defaultFilterData.incident.selectType = ids;//seimin
+            defaultFilterData.incident.selectType = ids;
         }else{
             defaultFilterData.incident = {
                 selectType:ids
@@ -2628,8 +2676,26 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         console.log(defaultFilterData,2222)
         $scope.onChange('all');
     }
+    // 是否直接解决下拉框选择
+    $scope.selectDirectProcess = function(){
+        console.log($scope.searchkeys.directProcess,66666);
+        if(window.sessionStorage.getItem('isZhiJie') == 'yes'){
+            $scope.searchkeys.directProcess = {id:'1',name:'是'};
+        }
+        var ids = $scope.searchkeys.directProcess.id
+        if(defaultFilterData.incident){
+            defaultFilterData.incident.directProcess = ids;
+        }else{
+            defaultFilterData.incident = {
+                directProcess:ids
+            };
+        }
+        defaultFilterData.searchType = 'all';
+        console.log(defaultFilterData,2222)
+        $scope.onChange('all');
+    }
     //获取列表数据
-    $scope.refreshData = function (style, filterData) {
+    $scope.refreshData = async function (style, filterData) {
         console.log(filterData,9090)
         if (filterData && filterData.incident && filterData.incident.area) {
             filterData.incident.place = {
@@ -2659,6 +2725,28 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     $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')};
                     sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                }else if($state.params.date.includes('to')){
+                    var startAndEndDate = $state.params.date.split('to');
+                    $scope.othcode = {};
+                    $scope.searchkeys.acceptDate = new Date(startAndEndDate[0]);
+                    $scope.searchkeys.acceptDateEnd = new Date(startAndEndDate[1]);
+                    filterData.incident = {acceptDate:startAndEndDate[0] + ' 00:00:00',acceptDateEnd: startAndEndDate[1] + ' 23:59:59'};
+                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                }
+                if($state.params.handUserId){
+                    delete $scope.searchkeys.handlingPersonnelUser;
+                    let response = await api_bpm_data.fetchData('user', $state.params.handUserId);
+                    if (response.status == 200) {
+                        $scope.handlingPersonnelUser = [response.data];
+                        $scope.searchkeys.handlingPersonnelUser = {id:response.data.id, name:response.data.name};
+                        filterData.incident.handlingPersonnelUser = {id:response.data.id, name:response.data.name};
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }else{
+                        $scope.handlingPersonnelUser = [];
+                        delete $scope.searchkeys.handlingPersonnelUser;
+                        delete filterData.incident.handlingPersonnelUser;
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }
                 }
                 if($state.params.state){
                     $scope.searchkeys.acceptDate = null;
@@ -2692,6 +2780,28 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     $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')};
                     sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                }else if($state.params.date.includes('to')){
+                    var startAndEndDate = $state.params.date.split('to');
+                    $scope.othcode = {};
+                    $scope.searchkeys.acceptDate = new Date(startAndEndDate[0]);
+                    $scope.searchkeys.acceptDateEnd = new Date(startAndEndDate[1]);
+                    filterData.incident = {acceptDate:startAndEndDate[0] + ' 00:00:00',acceptDateEnd: startAndEndDate[1] + ' 23:59:59'};
+                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                }
+                if($state.params.handUserId){
+                    delete $scope.searchkeys.handlingPersonnelUser;
+                    let response = await api_bpm_data.fetchData('user', $state.params.handUserId);
+                    if (response.status == 200) {
+                        $scope.handlingPersonnelUser = [response.data];
+                        $scope.searchkeys.handlingPersonnelUser = {id:response.data.id, name:response.data.name};
+                        filterData.incident.handlingPersonnelUser = {id:response.data.id, name:response.data.name};
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }else{
+                        $scope.handlingPersonnelUser = [];
+                        delete $scope.searchkeys.handlingPersonnelUser;
+                        delete filterData.incident.handlingPersonnelUser;
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }
                 }
                 if($state.params.state){
                     $scope.searchkeys.acceptDate = null;
@@ -2722,7 +2832,18 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     selectType : '2'
                 }
             }
-            window.sessionStorage.removeItem('isGoyuqi');//seimin
+            window.sessionStorage.removeItem('isGoyuqi');
+        }
+        if(window.sessionStorage.getItem('isZhiJie') == 'yes'){
+            $scope.searchkeys.directProcess = {id:'21',name:'是'};
+            if(filterData.incident&&filterData.incident.directProcess){
+                filterData.incident.directProcess = '1';
+            }else{
+                filterData.incident = {
+                    directProcess : '1'
+                }
+            }
+            window.sessionStorage.removeItem('isZhiJie');
         }
         $scope.myData = [];
         sessionStorage['searchincident'] = angular.copy(JSON.stringify(filterData));
@@ -2759,7 +2880,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             $scope.ldloading[style.replace('-', '_')] = false;
         });
     };
-    $scope.refreshData2 = function (style, filterData) {
+    $scope.refreshData2 = async function (style, filterData) {
         $scope.ldloading[style.replace('-', '_')] = true;
         if (angular.isUndefined(filterData)) {
             if (sessionStorage.searchincident) {
@@ -2782,6 +2903,28 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     $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')};
                     sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                }else if($state.params.date.includes('to')){
+                    var startAndEndDate = $state.params.date.split('to');
+                    $scope.othcode = {};
+                    $scope.searchkeys.acceptDate = new Date(startAndEndDate[0]);
+                    $scope.searchkeys.acceptDateEnd = new Date(startAndEndDate[1]);
+                    filterData.incident = {acceptDate:startAndEndDate[0] + ' 00:00:00',acceptDateEnd: startAndEndDate[1] + ' 23:59:59'};
+                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                }
+                if($state.params.handUserId){
+                    delete $scope.searchkeys.handlingPersonnelUser;
+                    let response = await api_bpm_data.fetchData('user', $state.params.handUserId);
+                    if (response.status == 200) {
+                        $scope.handlingPersonnelUser = [response.data];
+                        $scope.searchkeys.handlingPersonnelUser = {id:response.data.id, name:response.data.name};
+                        filterData.incident.handlingPersonnelUser = {id:response.data.id, name:response.data.name};
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }else{
+                        $scope.handlingPersonnelUser = [];
+                        delete $scope.searchkeys.handlingPersonnelUser;
+                        delete filterData.incident.handlingPersonnelUser;
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }
                 }
                 if($state.params.state){
                     $scope.searchkeys.acceptDate = null;
@@ -2854,9 +2997,20 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 $scope.searchkeys.selectType = {id:'0',name:'否'};
             }
         }
+        if(varLin.incident&&varLin.incident.directProcess){
+            if(varLin.incident.directProcess == '1'){
+                console.log(defaultFilterData)
+                $scope.searchkeys.directProcess = {id:'1',name:'是'};
+            }else if(varLin.incident.directProcess == '0'){
+                console.log(defaultFilterData)
+                $scope.searchkeys.directProcess = {id:'0',name:'否'};
+            }
+        }
     }
     if(window.sessionStorage.getItem('isGoyuqi') === 'yes'){
         $scope.selectTypeChange();
+    }else if(window.sessionStorage.getItem('isZhiJie') === 'yes'){
+        $scope.selectDirectProcess();
     }else{
         if(sessionStorage.getItem("searchincident")){
             var ss = JSON.parse(sessionStorage.getItem("searchincident"));
@@ -2878,7 +3032,7 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$http', '$scope', '$modal', '
     // console.log('$rootScope.user3='+JSON.stringify($scope.item));
     // console.log($scope.item)
     var loginUser = $rootScope.user;
-    console.log(loginUser.role)
+    // console.log(loginUser.role)
     $scope.chuli = false;
     $scope.qiangdan = false;
     $scope.dayin = false;
@@ -2958,7 +3112,7 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$http', '$scope', '$modal', '
 
     //修改页面显示判断
     $scope.jry_modify = function (item) {
-        console.log(item)
+        // console.log(item)
         // var jry_role = false;
         // for (var i = 0; i < $rootScope.user.role.length; i++) {
         //     if ($rootScope.user.role[i].rolecode == "call center") {
@@ -3122,17 +3276,17 @@ app.directive('incidentoperator', function () {
             colobject: '='
         },
         controller: 'IncidentOperCtrl',
-        template: '<div><div class="cl-effect-1 ui-grid-cell-contents pull-left" >' +
+        template: '<div><div class="cl-effect-1 ui-grid-cell-contents pull-left" style="text-align:left;" >' +
             // '<a ng-click="look()"   tooltip="查看" tooltip-placement="left"><i class="ti-eye"></i></a>'+
             '<a ng-click="toDetail(item)" class="bianjifont" >查看</a>' +
-            '<a ng-click="edit()"  ng-show="{{item.chaozuoPower&&chuli}}"  class="bianjifont">处理</a>' +
+            '<a ng-click="changeCenter()"  ng-show="jry_modify(item)"  class="luyinfont">编辑</a>' +
+            '<a ng-click="print()" ng-show="dayin" class="bianjifont" >打印</a>' +
+            '<a ng-click="delSj()" ng-show="{{delFlag&&item.state.value!== \'deleted\'}}" class="assign" >删除</a>' +
+            '<a ng-click="edit()"  ng-show="{{item.chaozuoPower&&chuli}}"  class="bianjifont">处理</a><br>' +
             '<a ng-click="handler()" ng-show="{{item.state.id != 1546 &&!item.handlerUser&&item.tiquPower&&qiangdan}}" class="bianjifont" >抢单</a>' +
             '<a ng-click="visit()"  ng-show="{{item.huifang&&huifang}}"  class="bianjifont">回访</a>' +
-            '<a ng-click="changeCenter()"  ng-show="jry_modify(item)"  class="luyinfont">编辑</a>' +
             '<a ng-click="toAssign()" ng-show="{{(item.state.id==1543||item.state.id==1544)&&assignFlag&&item.assignee}}" class="assign" >指派</a>' +
             '<a ng-click="toHandlerLog()" ng-show="{{item.state.id==1544}}" class="assign" >新增处理日志</a>' +
-            '<a ng-click="delSj()" ng-show="{{delFlag&&item.state.value!== \'deleted\'}}" class="assign" >删除</a>' +
-            '<a ng-click="print()" ng-show="dayin" class="bianjifont" >打印</a>' +
             // '<a ng-click="jry_evaluate()"  ng-show="jry_evaluateShow()" class="luyinfont" >评价</a>' +
             // '<a ng-click="record()"  ng-show="{{item.listen}}" class="luyinfont" >录音</a>' +
             // '<a ng-click="rotate()" ng-show="{{item.state.id==4}}" class="rotate" >转派</a>' +

assets/js/controllers/mainCtrl.js

@@ -2968,6 +2968,23 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         }
       })
     }
+    // 点击单项消息通知
+    $rootScope.wt_messages_onclick = function (task) {
+      var modalInstance = $modal.open({
+        templateUrl: '../../../assets/views/wt_messages_onclick.html',
+        controller: function ($scope, $modalInstance) {
+          $scope.task = angular.copy(task);
+          // 关闭
+          $scope.closeModel = function () {
+            modalInstance.close();
+          }
+        },
+        size: 'lg',
+        resolve: {
+
+        }
+      })
+    }
 
 
   }

assets/js/controllers/report/service_formCtrl.js

@@ -290,7 +290,7 @@ app.controller('service_formCtrl', ["$scope", "$rootScope", "$state", "$timeout"
         switch ($scope.tap) {
             case 'ZHTJ'://综合统计
                 postData.key = 'mdv2_service_repot_all';
-                postData.titles = ['人员', '建单数量', '直接处理数量', '处理工单数', '电话接听数', '微信/web报修处理数', '留言处理数', '柜台受理数'];
+                postData.titles = ['人员', '建单数量', '直接处理数量', '处理工单数', '电话建单数', '微信/报修建单', '留言建单', '柜台建单', '其他方式建单', '主动发现建单', '领导指派建单'];
                 break;
             case 'DHTJ'://电话统计
                 postData.key = 'mdv2_service_repot_phone';

assets/views/dashboard/newdash.html

@@ -381,7 +381,7 @@
                                         </tr>
                                     </thead>
                                     <tbody>
-                                        <tr ng-repeat="task in xiaoxilist">
+                                        <tr ng-repeat="task in xiaoxilist" ng-click="wt_messages_onclick(task)" style="cursor: pointer;">
                                             <td class="hidden-xs th-noline onlyaline" style="min-width:30px;max-width:40px">{{task.user.name}}</td>
                                             <td class="th-noline onlyaline" style="min-width:80px;max-width:100px">{{task.content}}</td>
                                             <td class="th-noline onlyaline" style="min-width:40px;max-width:50px">{{task.releaseTime}}</td>
@@ -508,8 +508,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div id="fault" class="pull-left" style="width: 100%;
-            height: 260px"></div>
+                        <div id="fault" class="pull-left" style="width: 100%;height: 260px"></div>
                     </div>
                 </div>
             </div>

assets/views/incident/list.html

@@ -238,6 +238,29 @@
                                 </ui-select-choices>
                              </ui-select>
                         </div>
+                        <div class="form-group incidentsearch  wt_width">
+                            <div class="control-label pull-left margin-top-5">事件来源:</div>
+                            <ui-select ng-disabled="isDisabledState" class="pull-right selectzise wt_width1 wt_width3" ng-model="othcode.source"
+                                theme="bootstrap">
+                                <ui-select-match placeholder="请选择事件来源">
+                                    {{$select.selected.name}}
+                                </ui-select-match>
+                                <ui-select-choices repeat="item in source | filter: $select.search">
+                                    <div ng-bind-html="item.name | highlight: $select.search"></div>
+                                </ui-select-choices>
+                            </ui-select>
+                        </div>
+                        <div class="form-group incidentsearch wt_width">
+                            <div class="control-label pull-left margin-top-5">是否直接解决:</div>
+                            <ui-select ng-change="selectDirectProcess()" ng-model="searchkeys.directProcess" class="pull-right selectzise wt_width1 wt_width3" theme="bootstrap">
+                                <ui-select-match placeholder="请选择">
+                                    <span ng-bind="$select.selected.name"></span>
+                                </ui-select-match>
+                                <ui-select-choices repeat="item in directProcess">
+                                    <span ng-bind="item.name"></span>
+                                </ui-select-choices>
+                             </ui-select>
+                        </div>
                         <!-- <div class='wt_width6' style="">
                             <span class="panel-title text-dark">至</span>
                         </div>
@@ -272,7 +295,7 @@
                                 <div class="btn btn-searchbutton steelbutton wt_btn1 wt_btnColor1" ng-click="replacement(parameters,searchkeys,othcode)" type="button">重置</div>
                             </div> -->
                             <div class=" wt_btns">
-                                <div class="btn btn_search" ng-click="chiceIncident(searchkeys,othcode.state)"
+                                <div class="btn btn_search" ng-click="chiceIncident(searchkeys,othcode.state,othcode.source)"
                                     type="button">搜索</div>
                             </div>
 
@@ -496,6 +519,19 @@
 
     .ui-grid-row:nth-child(even) .ui-grid-cell {
         background: #fafafa !important;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .ui-grid-row:nth-child(odd) .ui-grid-cell {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .ui-grid-row .ui-grid-cell:last-of-type {
+        justify-content: flex-start;
     }
 
     .searchBtnBox>.wt_btns {

assets/views/report/service_form.html

@@ -73,7 +73,23 @@
                     <div class="TB">
                         <div class="TB_head">
                             <div class="TB_head_L">
-                                <div class="TB_LDZH fl" tooltip='电话总数 + 微信/web总数 + 电话留言总数 + 柜台受理数' tooltip-placement="top">
+                                <div class="TB_LDZH fl" tooltip='电话转换数（打过来的电话不一定会建单） + 微信/web转换数 + 电话留言转换数（留言不一定会建单） + 柜台转换数' tooltip-placement="top">
+                                    <p>工单转换总数</p>
+                                    <span>{{zhtj_trans_total}}</span>
+                                </div>
+                                <div class="TB_ITEMS fl">
+                                    <div class="TB_ITEM" tooltip='工单事件来源选项是：柜台，电话，微信/web，留言。这四种类型的工单建单后，直接处理数量' tooltip-placement="top">
+                                        <p>直接处理数量</p>
+                                        <span>{{zhtj_p_total}}</span>
+                                    </div>
+                                    <div class="TB_ITEM" tooltip='工单事件来源选项是：柜台，电话，微信/web，留言。这四种类型的工单建单后，派代处理数量' tooltip-placement="top">
+                                        <p>派单数量</p>
+                                        <span>{{zhtj_unp_total}}</span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="TB_head_L">
+                                <div class="TB_LDZH fl" tooltip='电话总数 + 微信/web总数 + 电话留言总数 + 柜台建单' tooltip-placement="top">
                                     <p>请求总数</p>
                                     <span>{{zhtj_req_total}}</span>
                                 </div>
@@ -96,22 +112,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="TB_head_L">
-                                <div class="TB_LDZH fl" tooltip='电话转换数（打过来的电话不一定会建单） + 微信/web转换数 + 电话留言转换数（留言不一定会建单） + 柜台转换数' tooltip-placement="top">
-                                    <p>工单转换总数</p>
-                                    <span>{{zhtj_trans_total}}</span>
-                                </div>
-                                <div class="TB_ITEMS fl">
-                                    <div class="TB_ITEM" tooltip='工单事件来选选项是：柜台，电话，微信/web，留言。这四种类型的工单建单后，直接处理数量' tooltip-placement="top">
-                                        <p>直接处理数量</p>
-                                        <span>{{zhtj_p_total}}</span>
-                                    </div>
-                                    <div class="TB_ITEM" tooltip='工单事件来选选项是：柜台，电话，微信/web，留言。这四种类型的工单建单后，派代处理数量' tooltip-placement="top">
-                                        <p>派单数量</p>
-                                        <span>{{zhtj_unp_total}}</span>
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                         <div class="TB_cont">
                             <table class="jry_table jry_table_head" cellspacing="0" cellpadding="16"
@@ -121,10 +121,10 @@
                                         <th style="width:6%">
                                             序号
                                         </th>
-                                        <th style="width:11%" tooltip='未被删除的用户，服务台角色的建单人' tooltip-placement="top">
+                                        <th style="width:10%" tooltip='未被删除的用户，服务台角色的建单人' tooltip-placement="top">
                                             人员
                                         </th>
-                                        <th style="width:11%" ng-click="tableSort('total')" tooltip='建单总数' tooltip-placement="top">
+                                        <th style="width:8%" ng-click="tableSort('total')" tooltip='建单总数' tooltip-placement="top">
                                             <strong>
                                                 建单数量
                                                 <em class="sort-wrap">
@@ -133,7 +133,7 @@
                                                 </em>
                                             </strong>
                                         </th>
-                                        <th style="width:11%" ng-click="tableSort('p_total')" tooltip='直接处理工单数' tooltip-placement="top">
+                                        <th style="width:8%" ng-click="tableSort('p_total')" tooltip='直接处理工单数' tooltip-placement="top">
                                             <strong>
                                                 直接处理数量
                                                 <em class="sort-wrap">
@@ -142,7 +142,7 @@
                                                 </em>
                                             </strong>
                                         </th>
-                                        <th style="width:11%" ng-click="tableSort('unp_total')" tooltip='派代处理工单数' tooltip-placement="top">
+                                        <th style="width:10%" ng-click="tableSort('unp_total')" tooltip='派代处理工单数' tooltip-placement="top">
                                             <strong>
                                                 派单处理工单数
                                                 <em class="sort-wrap">
@@ -151,78 +151,114 @@
                                                 </em>
                                             </strong>
                                         </th>
-                                        <th style="width:11%" ng-click="tableSort('handle_phone')" tooltip='工单事件来选选项是：电话类型的工单数' tooltip-placement="top">
+                                        <th style="width:8%" ng-click="tableSort('handle_phone')" tooltip='工单事件来源选项是：电话类型的工单数' tooltip-placement="top">
                                             <strong>
-                                                电话接听数
+                                                电话建单数
                                                 <em class="sort-wrap">
                                                     <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'handle_phonetop'}"></i>
                                                     <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'handle_phonebottom'}"></i>
                                                 </em>
                                             </strong>
                                         </th>
-                                        <th style="width:17%" ng-click="tableSort('handle_wxweb')" tooltip='工单事件来选选项是：微信/web类型的工单数' tooltip-placement="top">
+                                        <th style="width:10%" ng-click="tableSort('handle_wxweb')" tooltip='工单事件来源选项是：微信/web类型的工单数' tooltip-placement="top">
                                             <strong>
-                                                微信/web报修处理数
+                                                微信/报修建单
                                                 <em class="sort-wrap">
                                                     <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'handle_wxwebtop'}"></i>
                                                     <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'handle_wxwebbottom'}"></i>
                                                 </em>
                                             </strong>
                                         </th>
-                                        <th style="width:11%" ng-click="tableSort('handle_msg')" tooltip='工单事件来选选项是：留言类型的工单数' tooltip-placement="top">
+                                        <th style="width:8%" ng-click="tableSort('handle_msg')" tooltip='工单事件来源选项是：留言类型的工单数' tooltip-placement="top">
                                             <strong>
-                                                留言处理数
+                                                留言建单
                                                 <em class="sort-wrap">
                                                     <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'handle_msgtop'}"></i>
                                                     <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'handle_msgbottom'}"></i>
                                                 </em>
                                             </strong>
                                         </th>
-                                        <th style="width:11%" ng-click="tableSort('handle_desk')" tooltip='工单事件来选选项是：柜台类型的工单数' tooltip-placement="top">
+                                        <th style="width:8%" ng-click="tableSort('handle_desk')" tooltip='工单事件来源选项是：柜台类型的工单数' tooltip-placement="top">
                                             <strong>
-                                                柜台受理数
+                                                柜台建单
                                                 <em class="sort-wrap">
                                                     <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'handle_desktop'}"></i>
                                                     <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'handle_deskbottom'}"></i>
                                                 </em>
                                             </strong>
                                         </th>
+                                        <th style="width:8%" ng-click="tableSort('handle_other')" tooltip='其他方式建单' tooltip-placement="top">
+                                            <strong>
+                                                其他方式建单
+                                                <em class="sort-wrap">
+                                                    <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'handle_othertop'}"></i>
+                                                    <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'handle_otherbottom'}"></i>
+                                                </em>
+                                            </strong>
+                                        </th>
+                                        <th style="width:8%" ng-click="tableSort('handle_discover')" tooltip='主动发现建单' tooltip-placement="top">
+                                            <strong>
+                                                主动发现建单
+                                                <em class="sort-wrap">
+                                                    <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'handle_discovertop'}"></i>
+                                                    <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'handle_discoverbottom'}"></i>
+                                                </em>
+                                            </strong>
+                                        </th>
+                                        <th style="width:8%" ng-click="tableSort('handle_leader')" tooltip='领导指派建单' tooltip-placement="top">
+                                            <strong>
+                                                领导指派建单
+                                                <em class="sort-wrap">
+                                                    <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'handle_leadertop'}"></i>
+                                                    <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'handle_leaderbottom'}"></i>
+                                                </em>
+                                            </strong>
+                                        </th>
                                     </tr>
                                 </thead>
                             </table>
                             <div class="jry_table_wrap" ng-nicescroll nice-scroll-end="topEndComplete()">
                                 <table class="jry_table jry_table_body" cellspacing="0" cellpadding="16"
                                     style="font-weight:normal !important;margin-bottom: 16px;table-layout:fixed">
-                                    <tbody class="tbody-hover">
+                                    <tbody class="tbody-hover service_form-hover">
                                         <tr
                                             ng-repeat="rowData in zhtj_list">
                                             <td style="width:6%">
                                                 {{$index+1}}
                                             </td>
-                                            <td style="width:11%">
+                                            <td style="width:10%">
                                                 {{rowData.userName}}
                                             </td>
-                                            <td style="width:11%">
+                                            <td style="width:8%">
                                                 {{rowData.total}}
                                             </td>
-                                            <td style="width:11%">
+                                            <td style="width:8%">
                                                 {{rowData.p_total}}
                                             </td>
-                                            <td style="width:11%">
+                                            <td style="width:10%">
                                                 {{rowData.unp_total}}
                                             </td>
-                                            <td style="width:11%">
+                                            <td style="width:8%">
                                                 {{rowData.handle_phone}}
                                             </td>
-                                            <td style="width:17%">
+                                            <td style="width:10%">
                                                 {{rowData.handle_wxweb}}
                                             </td>
-                                            <td style="width:11%">
+                                            <td style="width:8%">
                                                 {{rowData.handle_msg}}
                                             </td>
-                                            <td style="width:11%">
+                                            <td style="width:8%">
                                                 {{rowData.handle_desk}}
                                             </td>
+                                            <td style="width:8%">
+                                                {{rowData.handle_other}}
+                                            </td>
+                                            <td style="width:8%">
+                                                {{rowData.handle_discover}}
+                                            </td>
+                                            <td style="width:8%">
+                                                {{rowData.handle_leader}}
+                                            </td>
                                         </tr>
                                     </tbody>
                                 </table>
@@ -240,22 +276,6 @@
                     <div class="TB">
                         <div class="TB_head">
                             <div class="TB_head_L">
-                                <div class="TB_LDZH fl" tooltip='接听数 + 未接数' tooltip-placement="top">
-                                    <p>来电总数</p>
-                                    <span>{{dhtj_req_total}}</span>
-                                </div>
-                                <div class="TB_ITEMS fl">
-                                    <div class="TB_ITEM" tooltip='从服务台打电话过来（只算呼入，不算呼出）的接听数量' tooltip-placement="top">
-                                        <p>接听数量</p>
-                                        <span>{{dhtj_req_answer}}</span>
-                                    </div>
-                                    <div class="TB_ITEM" tooltip='从服务台打电话过来（只算呼入，不算呼出）的未接数量' tooltip-placement="top">
-                                        <p>未接数量</p>
-                                        <span>{{dhtj_req_miss}}</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="TB_head_L">
                                 <div class="TB_LDZH fl" tooltip='事件来源是：电话的。直接处理数 + 派单数' tooltip-placement="top">
                                     <p>电话建单总数</p>
                                     <span>{{dhtj_p_total}}</span>
@@ -271,6 +291,22 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="TB_head_L">
+                                <div class="TB_LDZH fl" tooltip='接听数 + 未接数' tooltip-placement="top">
+                                    <p>来电总数</p>
+                                    <span>{{dhtj_req_total}}</span>
+                                </div>
+                                <div class="TB_ITEMS fl">
+                                    <div class="TB_ITEM" tooltip='从服务台打电话过来（只算呼入，不算呼出）的接听数量' tooltip-placement="top">
+                                        <p>接听数量</p>
+                                        <span>{{dhtj_req_answer}}</span>
+                                    </div>
+                                    <div class="TB_ITEM" tooltip='从服务台打电话过来（只算呼入，不算呼出）的未接数量' tooltip-placement="top">
+                                        <p>未接数量</p>
+                                        <span>{{dhtj_req_miss}}</span>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                         <div class="TB_cont">
                             <table class="jry_table jry_table_head" cellspacing="0" cellpadding="16"
@@ -982,6 +1018,14 @@
         width: 100%;
     }
 
+    .jry_table_body .tbody-hover.service_form-hover td {
+        cursor: pointer;
+    }
+
+    .jry_table_body .tbody-hover.service_form-hover td:hover {
+        text-decoration: underline;
+    }
+
     .jry_table th,
     .jry_table td {
         word-wrap: break-word;

assets/views/wt_messages_onclick.html

@@ -0,0 +1,219 @@
+<div class="message_title">
+    消息通知详情
+</div>
+<div class="message_type">
+    <div class='message-list'>
+        <div class="message_content">
+            <div style="overflow: hidden;border-bottom: 1px dashed #ccc;">
+                <div class="content_time">{{task.releaseTime}}</div>
+                <div class="content_time" style="text-align: right;">{{task.user.name}}</div>
+            </div>
+            <div class="content_text">{{task.content}}</div>
+        </div>
+    </div>
+</div>
+
+<div style="text-align: center;margin-top: 2%;margin-bottom: 2%;padding-right: 2%;position: relative;">
+    <button ng-click="closeModel()" class="sBtn">关闭</button>
+</div>
+<style>
+    .wt_page{
+        position: absolute;
+        right: 2%;
+        top: 0;
+    }
+    .sBtnD {
+        background: #ccc;
+    }
+
+    .sBtn {
+        display: inline-block;
+        color:#005395;
+        width: 80px;
+        height: 30px;
+        border: 1px solid #ccc;
+        line-height: 30px;
+        border-radius: 2px;
+        cursor: pointer;
+        background-color: #fff !important;
+    }
+    .sBtn:hover {
+        background-color: #005395 !important;
+        color: #fff
+    }
+    .wt_nav {
+        text-align: center;
+    }
+
+    .pagination>li>a:hover {
+        background-color: #005395 !important;
+        border-color: #005395 !important;
+        color: #fff !important;
+    }
+
+    .pagination>li>a:focus {
+        background-color: #005395 !important;
+        border-color: #005395 !important;
+        color: #fff !important;
+    }
+
+    .pagination>li>a {
+        color: #005395 !important;
+    }
+
+    .modal-content {
+        /* width: 540px; */
+        /* height: 600px; */
+        border-radius: 2px;
+        overflow: auto;
+    }
+
+    .message_title {
+        height: 6%;
+        border-bottom: 1px solid #EAEAEA;
+        font-size: 18px;
+        line-height: 39px;
+        text-align: center;
+        color: #005395;
+        /* position: fixed; */
+        width: 100%;
+        background: #fff;
+    }
+
+    .message_body {
+        /* position: fixed; */
+        width: 100%;
+        background: #fff;
+        /* margin-top: 19px; */
+        /* border-bottom: 1px solid #EAEAEA;
+        border-top: 1px solid #EAEAEA; */
+        border: 1px solid #EAEAEA;
+    }
+
+    .message-list {
+        /* position: fixed;
+        top: 102px;
+        left: 12px; */
+        height: 97%;
+        overflow-y: auto;
+        width: 100%;
+        border-left: 1px solid #EAEAEA;
+
+    }
+
+    .message_type {
+        margin: 0 auto;
+        /* margin-top: 60px; */
+        /* border: 1px solid #EAEAEA; */
+        border-top: 0px;
+        width: 100%;
+        height: 80%;
+        /* padding: 20px; */
+        padding: 20px 20px 0px 20px;
+    }
+
+    .message_yes {
+        float: left;
+        display: inline-block;
+        width: 50%;
+        height: 40px;
+        text-align: center;
+        color: #005395;
+        font-size: 16px;
+        line-height: 40px;
+        cursor: pointer;
+    }
+
+    .message_yes:hover {
+        background-color: #005395 !important;
+        border-color: #005395 !important;
+        color: #fff !important;
+    }
+
+    .message_no:hover {
+        background-color: #005395 !important;
+        border-color: #005395 !important;
+        color: #fff !important;
+    }
+
+    .message_no {
+        float: left;
+        display: inline-block;
+        line-height: 40px;
+        width: 50%;
+        height: 40px;
+        text-align: center;
+        color: #005395;
+        font-size: 16px;
+        border-left: 1px solid #EAEAEA;
+        cursor: pointer;
+    }
+
+    .message_content {
+        padding: 10px 10px 0px 10px;
+        /* border-top: 1px solid #EAEAEA; */
+        border-bottom: 1px solid #EAEAEA;
+        overflow: hidden;
+        height: 80px;
+        background: #eee;
+        margin-bottom: 5px;
+    }
+
+    .red {
+        float: left;
+        /* display: inline-block; */
+        margin-top: 13px;
+    }
+
+    .redbtn {
+        width: 70px;
+        height: 25px;
+        color: #fff;
+        border-radius: 2px;
+        background: #005395;
+        border: 0px;
+    }
+
+    .redbtn:hover {
+        background: #DBE8E6;
+        color: #005395;
+        border: 1px solid #005395;
+    }
+
+    .content_title {
+        float: left;
+        width: 50%;
+        font-size: 16px;
+        color: #005395;
+    }
+
+    .content_time {
+        float: left;
+        width: 50%;
+        font-size: 14px;
+        color: #999;
+
+    }
+
+    .content_text {
+        margin-top: 6px;
+        font-size: 14px;
+        color: #666;
+        display: inline-block;
+        width: 92%;
+        /* height: 86%; */
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        float: left;
+    }
+
+
+
+    .active {
+        border: 1px solid #7BC2B4;
+        background: #005395;
+        color: #fff;
+        border-bottom: 0px;
+    }
+</style>