项目计划安排---页面修改

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/act/constructionManageAct.js

@@ -109,7 +109,7 @@
                 for (var i =0;i<split.length;i++){
                     if (split[i].htmlStatus=="2"){
                         // this.data.rows[i].setAttribute("style","color: red;");
-                        rows[i+1].style.backgroundColor = "#BDD2AE"
+                        rows[i+1].style.color = "green"
                     }
                 }
             },

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/act/netActPowerList2.js

@@ -94,41 +94,38 @@ $(document).ready(function() {
                columns: [
                    {
 		        field: 'projectNumber',
-		        title: '项目定义号',
-                width:160
+		        title: '项目定义号'
 
             }
                    ,{
                        field: 'projectName',
-                       title: '项目名称',
-                       width:120
+                       title: '项目名称'
 
                    }
                    ,{
                        field: 'projectMonthDate',
-                       title: '停电月份',
-                       width:110
+                       title: '停电月份'
 
                    }
                    ,{
                        field: 'projectPowerRange',
                        title: '停电范围',
-                       width:110
+                       width:300
 
                    }
                    ,{
                        field: 'projectPowerOut',
                        title: '是否带电',
-                       width:160,
+                       width:120,
                        formatter: getTime
                    },{
                        field: 'constructionUnit',
-                       title: '施工单位项目经理',
+                       title: '施工单位项目经理'
 
                    }
                    ,{
                        field: 'associatedBag',
-                       title: '关联包',
+                       title: '关联包'
                    }
                    ,{
                        field: 'powerPackage',

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/act/netWorkManageAct.js

@@ -96,7 +96,7 @@
                 for (var i =0;i<split.length;i++){
                     if (split[i].htmlStatus=="2"){
                         // this.data.rows[i].setAttribute("style","color: red;");
-                        rows[i+1].style.backgroundColor = "#BDD2AE"
+                        rows[i+1].style.color = "green"
                     }
                 }
             },
@@ -160,7 +160,6 @@ $('#table').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
 });
 //安排计划时间
 function add(ids){
-    jp.loading();
     jp.post("${ctx}/sg/managementCenter/projectPlanArrage/unNetWorkplanned",{'ids':ids},function(data){
         if(data.success){
             refresh();
@@ -263,7 +262,6 @@ function addPowerFlag() {
             var iframeWin = layero.find('iframe')[0]; //得到弹出的窗口对象，执行窗口内iframe页的方法：iframeWin.method();
             var power = iframeWin.contentWindow.saveSure();
             $("#idPower").val(power)
-            jp.loading();
             jp.post("${ctx}/sg/managementCenter/projectPlanArrage/sureNetWorkInspection",$('#inputFormIds').serialize(),function(data){
                 if(data.success){
                     jp.confirm('带电项目在停电开关集合，是否通过？', function () {

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/act/newDateList.js

@@ -124,36 +124,38 @@ $(document).ready(function() {
                columns: [
                    {
 		        field: 'projectNumber',
-		        title: '项目定义号',
-                width:160
+		        title: '项目定义号'
 
             }
                    ,{
                        field: 'projectName',
-                       title: '项目名称',
-                       width:120
+                       title: '项目名称'
 
                    }
                    ,{
                        field: 'projectPowerRange',
-                       title: '停电范围',
-                       width:110
+                       title: '停电范围'
 
                    }
                    ,{
                        field: 'projectMonthDate',
-                       title: '计划月份',
-                       width:160
+                       title: '计划月份'
                    }
                    ,{
                        field: 'constructionUnit',
-                       title: '施工单位项目经理',
-                       width:160
+                       title: '施工单位项目经理'
+                   }
+                   ,{
+                       field: 'associatedBag',
+                       title: '关联包'
+                   }
+                   ,{
+                       field: 'powerPackage',
+                       title: '停电包'
                    }
                    ,{
                        field: 'projectDate',
                        title: '安排计划时间',
-                       width:160,
                        formatter: getTime
                    }
 		     ]
@@ -162,7 +164,7 @@ $(document).ready(function() {
 
     function getTime(value, row, index) {
         return [
-            "<div class='input-group form_datetime' id="+row.id+"> <input type='text' id="+row.id+"input"+"   name='deliverySchedule' class='form-control required'  value="+row.projectDate+"/> <span class='input-group-addon'> <span class='glyphicon glyphicon-calendar'></span> </span></div>" ,
+            "<div class='input-group form_datetime' style='width: 100%' id="+row.id+"> <input type='text' id="+row.id+"input"+"   name='deliverySchedule' class='form-control required'  value="+row.projectDate+"/> <span class='input-group-addon'> <span class='glyphicon glyphicon-calendar'></span> </span></div>" ,
         ].join('');
 
     }

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/oaNotify/planOaNotityForm.js

@@ -79,7 +79,7 @@
                 ,{
                     field: 'projectPowerRange',
                     title: '停电范围',
-                    width:110
+                    width:200
 
                 }
                 ,{

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/projectPlanArrageForm.js

@@ -108,14 +108,14 @@
 
                 }, {
                     field: 'projectNumber',
-                    title: '项目定义号'
+                    title: '项目定义号',
 
                 }, {
                     field: 'projectName',
                     title: '项目名称'
                 }, {
                     field: 'projectPowerRange',
-                    title: '停电范围'
+                    title: '停电范围',
                 },{
                     field:'projectMonthDate',
                     title:'停电月份'

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/projectPlanArrageList.js

@@ -78,7 +78,7 @@ $(document).ready(function() {
                    ,{
                        field: 'projectPowerRange',
                        title: '停电范围',
-                       width:110
+                       width:360
 
                    }
                    ,{
@@ -100,6 +100,15 @@ $(document).ready(function() {
                        width:120,
                        sortName: 'endDate'
 
+                   },{
+                       field: 'associatedBag',
+                       title: '关联包',
+                       width:120
+                   }
+                   ,{
+                       field: 'powerPackage',
+                       title: '停电包',
+                       width:120
                    }
 		     ]
 		

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/projectPlanPowerList.js

@@ -94,32 +94,27 @@ $(document).ready(function() {
                columns: [
                    {
 		        field: 'projectNumber',
-		        title: '项目定义号',
-                width:160
+		        title: '项目定义号'
 
             }
                    ,{
                        field: 'projectName',
-                       title: '项目名称',
-                       width:120
+                       title: '项目名称'
 
                    }
                    ,{
                        field: 'projectMonthDate',
-                       title: '停电月份',
-                       width:110
+                       title: '停电月份'
 
                    }
                    ,{
                        field: 'projectPowerRange',
                        title: '停电范围',
-                       width:110
-
+                       width:160
                    }
                    ,{
                        field: 'projectPowerOut',
                        title: '是否带电',
-                       width:160,
                        formatter: getTime
                    },{
                        field: 'constructionUnit',