token时效时退出登陆,复制计划bug修改,巡检计划增加阴极保护

src/widgets/Header/Widget.ts

@@ -278,8 +278,9 @@ class Header extends BaseWidget {
         };
         this.sendAjax(data, url, type, function (result) {
             this.adminMessageList = [];
-            if (result.code !== 1) {
-                toast.show(result.message);
+            if (result.code === 401) {
+                alert("登陆失效,请重新登陆")
+                this.exitsystem();
             } else if (result.result.records.length === 0) {
                 return;
             } else {

src/widgets/PlanSearch/Widget.ts

@@ -619,6 +619,8 @@ class PlanSearch extends BaseWidget {
                         }else if(this.dataTable_all.aExtentData.currentTableData.deviceTypeId == 16){
                             //url = this.config.fajin;//阀井
                             type = 3;
+                        }else if(this.dataTable_all.aExtentData.currentTableData.deviceTypeId == 21){
+                            type = 4;
                         }
                         let sendPointData = {
                             typeId:type,
@@ -675,6 +677,7 @@ class PlanSearch extends BaseWidget {
                             let repairContent =  info.contentName;
                             infoBox += "<div><span class='sTitle'>创建时间：</span><span class='sInfo'>" + time + "</span></div>";
                             infoBox += "<div><span class='sTitle'>创建人:</span><span class='sInfo'>" + user + "</span></div>";
+                            infoBox += "<div><span class='sTitle'>检查时间:</span><span class='sInfo'>" + info.checkDate + "</span></div>";
                             if(type ==1){
                                 infoBox += "<div><span class='sTitle'>调压箱运行压力(单位:Kpa):</span><span class='sInfo'>" + info.runPressure + "</span></div>";
                                 infoBox += "<div><span class='sTitle'>调压箱截断压力(单位:Kpa):</span><span class='sInfo'>" + info.truncationPressure + "</span></div>";
@@ -684,9 +687,13 @@ class PlanSearch extends BaseWidget {
                             }else if(type == 3){
                                 infoBox += "<div><span class='sTitle'>阀门材质:</span><span class='sInfo'>" + info.material + "</span></div>";
                                 infoBox += "<div><span class='sTitle'>阀门规格:</span><span class='sInfo'>" + info.specification + "</span></div>";
+                            }else if(type == 4){
+                                infoBox += "<div><span class='sTitle'>检测桩编号:</span><span class='sInfo'>" + info.deviceId + "</span></div>";
+                                infoBox += "<div><span class='sTitle'>标准电位值:</span><span class='sInfo'>" + info.standardPotential + 'V'+"</span></div>";
+                                infoBox += "<div><span class='sTitle'>检测电位值:</span><span class='sInfo'>" + info.detectionPotential + 'V'+"</span></div>";
+                                infoBox += "<div><span class='sTitle'>检测人员:</span><span class='sInfo'>" + (info.createUserName?info.createUserName : '/') + "</span></div>";
                             }
-                            infoBox += "<div><span class='sTitle'>检查时间:</span><span class='sInfo'>" + info.checkDate + "</span></div>";
-                            infoBox += "<div><span class='sTitle'>备注:</span><div class='noteOverflow' title='"+info.note+"'>" + info.note + "</div></div>";
+                            infoBox += "<div><span class='sTitle'>备注:</span><div class='noteOverflow' title='"+info.note+"'>" + (info.note?info.note:'/') + "</div></div>";
                             if (info.contentName) {
                                infoBox += "<div><span class='sTitle'>维修内容：</span><div class='noteOverflow' title='"+repairContent+"'>" + repairContent + "</div></div>";
                             }

src/widgets/PlanSearchCopy/Widget.ts

@@ -187,7 +187,7 @@ class PlanSearchCopy extends BaseWidget {
     initEvent2(){
         this.getGroup(selectType.single);
         this.getPeriod();//巡检周期
-        this.initTimes();//初始化周期时间
+        //this.initTimes();//初始化周期时间
         this.domObj.find(".btn_return").off("click").on("click", function () {
             this.copyPlan = null;
             this.initEventVal();
@@ -333,6 +333,7 @@ class PlanSearchCopy extends BaseWidget {
             }
         }.bind(this));
         this.domObj.find(".periodid").empty().append(strperiod);
+        this.initTimes();
     }
     /**
      * @function 控制时间
@@ -380,26 +381,44 @@ class PlanSearchCopy extends BaseWidget {
                     if (new Date().getDate() > 15)//当前日期在下半月，只能安排下月初的半月计划
                     {
                         this.startDate.minDate = this.startDate.maxDate = new Date().next().month().toString("yyyy-MM-01");
-                        this.endDate.minDate = this.endDate.maxDate = new Date().next().month().toString("yyyy-MM-15");
+                        //this.endDate.minDate = this.endDate.maxDate = new Date().next().month().toString("yyyy-MM-15");
+                        this.endDate.minDate = new Date().next().month().toString("yyyy-MM-15");
                     }
                     else {
                         this.startDate.minDate = this.startDate.maxDate = new Date().toString("yyyy-MM-16");
-                        this.endDate.minDate = this.endDate.maxDate = new Date().moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                        //this.endDate.minDate = this.endDate.maxDate = new Date().moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                        this.endDate.minDate = new Date().moveToLastDayOfMonth().toString("yyyy-MM-dd");
                     }
                     this.endDate.format = this.startDate.format = 'YYYY-MM-DD';
                     break;
                 case "5"://一月一巡
                     this.domObj.find(".period_sign").attr("title", "从每月1日开始计算,结束日期月底，只允许安排一个周期计划");
                     this.startDate.minDate = this.startDate.maxDate = new Date().next().month().toString("yyyy-MM-01");
-                    this.endDate.minDate = this.endDate.maxDate = new Date().next().month().moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                    //this.endDate.minDate = this.endDate.maxDate = new Date().next().month().moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                    this.endDate.minDate = new Date().next().month().moveToLastDayOfMonth().toString("yyyy-MM-dd");
                     this.endDate.format = this.startDate.format = 'YYYY-MM-DD';
                     break;
                 case "6"://二月一巡
-                    new Date()
                     this.domObj.find(".period_sign").attr("title", "从每月1日开始计算,结束日期月底，只允许安排一个周期计划");
                     this.startDate.minDate = this.startDate.maxDate = new Date().next().month().toString("yyyy-MM-01");
-                    this.endDate.minDate = new Date(this.startDate.minDate).add(59).day().toString("yyyy-MM-dd");
-                    this.endDate.maxDate = new Date(this.startDate.minDate).add(65).day().toString("yyyy-MM-dd");
+                    this.endDate.minDate = new Date(this.startDate.minDate).next().month().moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                    //this.endDate.minDate = new Date(end).next().month().moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                    //this.endDate.minDate = new Date(this.startDate.minDate).add(59).day().toString("yyyy-MM-dd");
+                    //this.endDate.maxDate = new Date(this.startDate.minDate).add(65).day().toString("yyyy-MM-dd");
+                    this.endDate.format = this.startDate.format = 'YYYY-MM-DD';
+                    break;
+                case "7"://三月一巡
+                    this.domObj.find(".period_sign").attr("title", "从每月1日开始计算,结束日期月底，只允许安排一个周期计划");
+                    this.startDate.minDate = this.startDate.maxDate = new Date().next().month().toString("yyyy-MM-01");
+                    this.endDate.minDate = new Date(this.startDate.minDate).next().month().next().month().moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                    //this.endDate.maxDate = new Date(this.startDate.minDate).add(95).day().toString("yyyy-MM-dd");
+                    this.endDate.format = this.startDate.format = 'YYYY-MM-DD';
+                    break;
+                case "8"://半年一巡
+                    this.domObj.find(".period_sign").attr("title", "从每月1日开始计算,结束日期月底，只允许安排一个周期计划");
+                    this.startDate.minDate = this.startDate.maxDate = new Date().next().month().toString("yyyy-MM-01");
+                    this.endDate.minDate = new Date(this.startDate.minDate).next().month().next().month().next().month().next().month().next().month().moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                    //this.endDate.maxDate = new Date(this.startDate.minDate).add(185).day().toString("yyyy-MM-dd");
                     this.endDate.format = this.startDate.format = 'YYYY-MM-DD';
                     break;
             }
@@ -419,7 +438,7 @@ class PlanSearchCopy extends BaseWidget {
         isToday: false,
         okfun:function(obj){
             var period_id = this.domObj.find(".periodid option:selected").val() + "";
-            if(period_id == "3"){
+            if(period_id == "3"){//一周一巡
                 var startDate = this.domObj.find(".plan_begindate").val();
                 var start = new Date(startDate.replace(/-/g, "/"));
                 var end = new Date(obj.val.replace(/-/g, "/"));
@@ -431,6 +450,94 @@ class PlanSearchCopy extends BaseWidget {
                     this.toast.Show("当前日期不是当前周期的倍数，已自动选择当前周期结束时间");
                 }
             }
+            if(period_id == "4"){//半月一巡
+                if(new Date(obj.val).getDate() > 15){
+                   let day =  new Date(obj.val).moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                   this.domObj.find(".plan_enddate").val(day);
+                   this.toast.Show("已自动选择当前周期结束时间");
+                }else if(new Date(obj.val).getDate() < 15){
+                  let day = new Date(obj.val).setDate(15);
+                  day = Functions.DateFormat(new Date(day), "yyyy-MM-dd")
+                  this.domObj.find(".plan_enddate").val(day);
+                  this.toast.Show("已自动选择当前周期结束时间");
+                }else{
+                    this.domObj.find(".plan_enddate").val(new Date(obj.val).toString("yyyy-MM-dd"));
+                }
+            }
+            if(period_id == "5"){//一月一巡
+                let day =  new Date(obj.val).moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                this.domObj.find(".plan_enddate").val(day);
+                this.toast.Show("已自动选择当前周期结束时间");
+            }
+            if(period_id == "6"){//二月一巡
+                let beginMonth = new Date(this.domObj.find(".plan_begindate").val()).getMonth();//一月=0
+                let endMonth = new Date(obj.val).getMonth() + 1;//二月=1
+                let totalMonth = endMonth - beginMonth;
+                if(totalMonth % 2 == 0){//一月初到二月底为一个周期,如果选择的是二月的中的日期,则直接定位到二月底;三月=2,endMonth = 2+1;3/2有余数
+                    let tt = new Date(obj.val).moveToLastDayOfMonth()
+                    this.domObj.find(".plan_enddate").val(new Date(obj.val).moveToLastDayOfMonth().toString("yyyy-MM-dd"));
+                    this.toast.Show("已自动选择当前周期结束时间");
+                }else{//3月初到四月底为一个周期,如果选择的是3月,则直接定位到下一个月的月底
+                    let tt = new Date(obj.val).next().month().moveToLastDayOfMonth();
+                    this.domObj.find(".plan_enddate").val(new Date(obj.val).next().month().moveToLastDayOfMonth().toString("yyyy-MM-dd"));
+                    this.toast.Show("已自动选择当前周期结束时间");
+                }
+                //let day =  new Date(obj.val).moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                //this.domObj.find(".plan_enddate").val(day);
+            }
+            if(period_id == "7"){//三月一巡
+                let beginMonth = new Date(this.domObj.find(".plan_begindate").val()).getMonth();//一月=0
+                let endMonth = new Date(obj.val).getMonth() + 1;//三月=2
+                let totalMonth = endMonth - beginMonth;
+                if(totalMonth % 3 == 0){//
+                    let tt = new Date(obj.val).moveToLastDayOfMonth()
+                    this.domObj.find(".plan_enddate").val(tt.toString("yyyy-MM-dd"));
+                    this.toast.Show("已自动选择当前周期结束时间");
+                }else if(totalMonth % 3 == 1){//余数为1
+                    let tt = new Date(obj.val).next().month().next().month().moveToLastDayOfMonth();
+                    this.domObj.find(".plan_enddate").val(tt.toString("yyyy-MM-dd"));
+                    this.toast.Show("已自动选择当前周期结束时间");
+                }else if(totalMonth % 3 == 2){//余数为2
+                    let tt = new Date(obj.val).next().month().moveToLastDayOfMonth();
+                    this.domObj.find(".plan_enddate").val(tt.toString("yyyy-MM-dd"));
+                    this.toast.Show("已自动选择当前周期结束时间");
+                }
+                //let day =  new Date(obj.val).moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                //this.domObj.find(".plan_enddate").val(day);
+            }
+            if(period_id == "8"){//半年一巡
+                let beginMonth = new Date(this.domObj.find(".plan_begindate").val()).getMonth();//一月=0
+                let endMonth = new Date(obj.val).getMonth() + 1;//三6月=5
+                let totalMonth = endMonth - beginMonth;
+                if(totalMonth % 6 == 0){//
+                    let tt = new Date(obj.val).moveToLastDayOfMonth()
+                    this.domObj.find(".plan_enddate").val(tt.toString("yyyy-MM-dd"));
+                    this.toast.Show("已自动选择当前周期结束时间");
+                }else if(totalMonth % 3 == 1){//余数为1
+                    let tt = new Date(obj.val).next().month().next().month().next().month().next().month().next().month().moveToLastDayOfMonth();
+                    this.domObj.find(".plan_enddate").val(tt.toString("yyyy-MM-dd"));
+                    this.toast.Show("已自动选择当前周期结束时间");
+                }else if(totalMonth % 3 == 2){//余数为2
+                    let tt = new Date(obj.val).next().month().next().month().next().month().next().month().moveToLastDayOfMonth();
+                    this.domObj.find(".plan_enddate").val(tt.toString("yyyy-MM-dd"));
+                    this.toast.Show("已自动选择当前周期结束时间");
+                }else if(totalMonth % 3 == 3){
+                    let tt = new Date(obj.val).next().month().next().month().next().month().moveToLastDayOfMonth();
+                    this.domObj.find(".plan_enddate").val(tt.toString("yyyy-MM-dd"));
+                    this.toast.Show("已自动选择当前周期结束时间");
+                }else if(totalMonth % 3 == 4){
+                    let tt = new Date(obj.val).next().month().next().month().moveToLastDayOfMonth();
+                    this.domObj.find(".plan_enddate").val(tt.toString("yyyy-MM-dd"));
+                    this.toast.Show("已自动选择当前周期结束时间");
+                }else if(totalMonth % 3 == 5){
+                    let tt = new Date(obj.val).next().month().moveToLastDayOfMonth();
+                    this.domObj.find(".plan_enddate").val(tt.toString("yyyy-MM-dd"));
+                    this.toast.Show("已自动选择当前周期结束时间");
+                }
+
+                //let day =  new Date(obj.val).moveToLastDayOfMonth().toString("yyyy-MM-dd");
+                //this.domObj.find(".plan_enddate").val(day);
+            }
         }.bind(this)
     }
     startDate = {