liangluogis 3 months ago
parent
commit
9874142ce9

BIN
mianzhu——1.rar


+ 1 - 1
src/login/index.html

@@ -10,7 +10,7 @@
 </head>
 
 <body>
-    <div id='mainContainer'>
+    <div id='mainContainer' style="display: none;">
         <canvas id='myCanvas'></canvas>
         <div class="logoContainer">
             <p>

+ 23 - 1
src/login/js/login.js

@@ -11,6 +11,7 @@ SYS_ADDR = location.href.trim().toLowerCase().replace(/login\/+$/, ""),
 /* CONFIGURE END */
 
 window.onload = function () {
+    tokenLogin()
     var userInput = $(".username");
     var passwordInput = $('.password');
     var btnLogin = $('.login');
@@ -38,6 +39,25 @@ window.onload = function () {
         }
     }.bind(this))
 
+    function tokenLogin(){
+        if(window.location.href.indexOf("token")>-1){
+            const tempObj={token:"",appName:""};
+            const tempData=window.location.href.replace(/%20/g, '+').replace(/%3D/g, '=').split('?');
+            const list=tempData[1].split("&");
+            for(let key in tempObj){
+                let tempStr=key+"=";
+                list.forEach(item=>{
+                    if(item.indexOf(tempStr)>-1){
+                        tempObj[key]=item.split(tempStr)[1]
+                    }
+                })
+            }
+            debugger
+        }else{
+            document.getElementById("mainContainer").setAttribute("style","");
+        }
+    }
+
     function enterKeyDown() {
         if (event.keyCode == 13) {
             loginCallBack.bind(this)();
@@ -161,7 +181,9 @@ window.onload = function () {
             type: "GET",
             dataType: "json",
             success: (result) => {
-                document.title = result.result.projectName;
+                if(result&&result.code==200){
+                    document.title = result.result.projectName;
+                }
             },
             error: (data) => {
                 console.log(data.message);

+ 1 - 1
src/widgets/CompanyManagement/Widget.ts

@@ -85,7 +85,7 @@ class CompanyManagement extends BaseWidget {
             var html = this.template.split('$$')[1];
             var Obj = this.popup.show("修改单位", html);
             Obj.domObj.find(".addInput").attr("style", "display:none");
-            Obj.domObj.find(".FullName").attr("readonly", "readonly");
+            Obj.domObj.find(".FullName");
             this.initPopeVue("update");
             //添加验证
             (<any>$('#widget-CompanyManagementAddInfo')).bootstrapValidator();

+ 1 - 1
src/widgets/HiddenTroubleTransAudit/Widget.ts

@@ -355,7 +355,7 @@ class HiddenTroubleTransAudit extends BaseWidget {
         }
         let data = {
             "current": 1,
-            "size": this.config.pagemaxsize,
+            "size": 1000,
             "departmentId": companyid
         }
         this.ajaxSend.sendAjax(this, data, this.config.getUserList, this.ajaxSend.type.get, function (results) {

+ 24 - 39
src/widgets/MaintenanceSearchAdmin/Widget.html

@@ -15,7 +15,7 @@
         </div>
         <div class="form-group">
             <label class=" control-label">地址</label>
-            <input type="text" autocomplete="off" class="form-control siteName" name="siteName" placeholder="地址">
+            <input type="text" autocomplete="off" class="form-control  siteName" name="siteName" placeholder="地址">
         </div>
         <div class="form-group">
             <label class=" control-label">一级抢修分类</label>
@@ -39,9 +39,27 @@
             </select>
             <!-- <input type="text" autocomplete="off" class="form-control type" name="type" placeholder="类型"> -->
         </div>
+        <div class="form-group  form-inline peopleList_btn groupleft">
+            <label class="thspan">一级审核人员</label>
+            <select class="input-sm form-control noborder peopleList minwidth" data-max-options="10"  data-live-search="true"  id="peopleList"></select>
+        </div>
+        <div class="form-group  form-inline peopleList_btn groupleft">
+            <label class="thspan">二级审核人员</label>
+            <select class="input-sm form-control noborder peopleList2 minwidth" data-max-options="10"  data-live-search="true"  id="peopleList2"></select>
+        </div>
+        <div class="form-group">
+            <label class=" control-label">驳回情况</label>
+            <select class="input-sm form-control isReturn minwidth">
+                <option value="" selected>全部</option>
+                <option value="0"></option>
+                <option value="1"></option>
+            </select>
+        </div>
         <div class="form-group">
             <label class=" control-label">上报时间</label>
-            <input type="text" readonly="readonly" class="form-control plan_begindate minwidth" id="plan_begindate" placeholder="年-月-日">
+            <input type="text" readonly="readonly" class="form-control plan_begindate minwidth" id="plan_begindate" placeholder="年-月-日"/>
+            ~
+            <input type="text" readonly="readonly" class="form-control plan_enddate minwidth" id="plan_enddate" placeholder="年-月-日"/>
         </div>
         <div class="form-group">
             <button id="btn_add" type="button" class="btn btn-sm btn-default btn-success btn_search">
@@ -53,11 +71,6 @@
                 <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>删除
             </button>
         </div>
-        <!-- <div class="form-group">
-            <button id="btn_edit" type="button" class="btn btn-sm btn-default btn-success btn_edit">
-                <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>修改接收人
-            </button>
-        </div> -->
         <div class="form-group groupright">
             <div class="btn_exportExcel">
                 <img src="./widgets/KeyEquipment/images/export.png" />
@@ -66,45 +79,17 @@
         </div>
     </div>
     <div class="planpath_content halfpaneltable">
-        <table class="table table-bordered  table-striped MaintenanceSearchinfodata" cellspacing="0"
-            id='MaintenanceSearchinfodata'>
+        <table class="table table-bordered  table-striped MaintenanceSearchAdmininfodata" cellspacing="0"
+            id='MaintenanceSearchAdmininfodata'>
         </table>
     </div>
 </div>
 $$
 <div class='widget-MaintenanceSearchAdmin-pop'>
-    <div class="form-group form-inline userSelect">
-        <div class='item'>
-            <label class=" control-label">部门</label>
-            <select class="input-sm form-control  deptId" data-live-search="true"
-                name='deptId' showname='deptName' data-style="btn-primary">
-            </select>
-        </div>
-        <div class='item'>
-            <label class=" control-label">主要人员</label>
-            <select class="input-sm form-control  userId" data-live-search="true"
-                name='userId' showname='userIdName' data-style="btn-primary">
-            </select>
-        </div>
-    </div>
-    <div class="form-group form-inline userSelect">
-        <div class='item'>
-            <label class=" control-label">部门</label>
-            <select class="input-sm form-control  assistantDepartment" data-live-search="true"
-                name='assistantDepartment' showname='deptName' data-style="btn-primary">
-            </select>
-        </div>
-        <div class='item'>
-            <label class=" control-label">协助人员</label>
-            <select class="input-sm form-control  synergyUserIds" data-live-search="true"
-                name='synergyUserIds' showname='synergyUserNames' multiple data-style="btn-primary">
-            </select>
-        </div>
-    </div>
 </div>
 $$
-<div id="widget-MaintenanceSearchAdmin-delete" >
+<div id="widget-MaintenanceSearchAdminAdmin-delete" >
     <div style="text-align: center;font-size:14px">
            是否删除数据?
     </div>
-</div>
+</div>

+ 102 - 325
src/widgets/MaintenanceSearchAdmin/Widget.ts

@@ -47,13 +47,7 @@ class MaintenanceSearchAdmin extends BaseWidget {
     allList = null;
     fristSearch = true;
     maintenancePageInfo=null;
-    initTag = [];
-    actionType = {
-        /**填写本环节内容*/
-        write: 0,
-        /**查看本环节内容*/
-        look: 1
-    }
+
     /**
      * @function 初始化启动
      */
@@ -73,6 +67,7 @@ class MaintenanceSearchAdmin extends BaseWidget {
         this.ready();
         this.getSearchInfo();
         this.getAllmaintenanceData();
+        this.getAuditUserInfo();
         // this.drawWebGL();
     }
 
@@ -92,7 +87,32 @@ class MaintenanceSearchAdmin extends BaseWidget {
     planBegindate = {
         format: 'YYYY-MM-DD', //日期格式
         isinitVal: false,
-
+        okfun: function (obj) {
+            // var period_id = this.domObj.find(".periodid option:selected").val();
+            // if (period_id == "3") {
+            //     this.endDate.minDate = obj.val;
+            // }
+            var dt = new Date(obj.val.replace(/-/g, "/"));
+            this.planEnddate.minDate = Functions.DateFormat(dt, "yyyy-MM-dd");
+            this.domObj.find(".plan_enddate").val(this.planEnddate.minDate);
+        }.bind(this)
+    }
+    planEnddate = {
+        format: 'YYYY-MM-DD', //日期格式
+        isinitVal: false,
+        okfun: function (obj) {
+            // var period_id = this.domObj.find(".periodid option:selected").val();
+            // var dt = new Date(obj.val.replace(/-/g, "/"));
+            // if (period_id == "1") {
+            //     this.endDate.minDate = obj.val;
+            // } else if (period_id == "2") {
+            //     // this.endDate.minDate = Functions.DateFormat(new Date(dt.getTime() + 24 * 3600000), "yyyy-MM-dd");
+            //     this.endDate.minDate = obj.val;
+            // }
+            // if (parseInt(this.domObj.find(".plan_enddate").val().replace(/-/g, "")) < parseInt(this.endDate.minDate.replace(/-/g, ""))) {
+            //     this.domObj.find(".plan_enddate").val(this.endDate.minDate);
+            // }
+        }.bind(this)
     }
     /**
      * 选中图层渲染创建、销毁、清理
@@ -115,13 +135,16 @@ class MaintenanceSearchAdmin extends BaseWidget {
     /**
     * 获取查询条件
     */
-     getSearchInfo() {
+    getSearchInfo() {
         let workOrderState = this.domObj.find(".workOrderType option:selected").val();
         let siteName = this.domObj.find(".siteName").val();
         let type = this.domObj.find(".type").val();
         let MainType = this.domObj.find(".typeMain").val();
         let startTime = this.domObj.find(".plan_begindate").val();
         let endTime = this.domObj.find(".plan_enddate").val();
+        let oneAuditPerson=this.domObj.find(".peopleList option:selected").val();//一级审核人
+        let twoAuditPerson=this.domObj.find(".peopleList2 option:selected").val();//二级审核人
+        let isReturn=this.domObj.find(".isReturn option:selected").val();//是否驳回
         this.searchInfo = {
             workOrderState: workOrderState ? workOrderState : "",
             address: siteName ? siteName : "",
@@ -129,8 +152,11 @@ class MaintenanceSearchAdmin extends BaseWidget {
             typeMain:MainType ? MainType : "",
             startTime: startTime ? startTime +" 00:00:00" :"",
             endTime: endTime ? endTime +" 23:59:59" :"",
-            "orders[0].asc":false,
-            "orders[0].column":"create_time"
+            oneAuditPerson: oneAuditPerson ? oneAuditPerson : "",
+            twoAuditPerson:twoAuditPerson ? twoAuditPerson : "",
+            rejectedFlag:isReturn,
+            // "orders[0].asc":false,
+            // "orders[0].column":"create_time"
         }
     }
 
@@ -152,323 +178,38 @@ class MaintenanceSearchAdmin extends BaseWidget {
                 let title = "删除";
                 var Obj = this.popup.Show(title, this.template.split('$$')[2]);
                 Obj.submitObj.off("click").on("click", function () {
-                    // let id = this.dataTable.aExtentData.currentTableData.id;
-                    // let url = this.config.rushReport + "/" + id
-                    // this.ajaxSend.sendAjaxDelete(this, id, url, this.ajaxSend.type.delete, function (results) {
-                    //     if (this.ajaxSend.checkResults(this, results)) {
-                    //         this.toast.show('删除成功');
-                    //         this.getpipeRecordList();
-                    //         this.popup.close();
-                    //     }
-                    // }.bind(this));
                     this.deleteScheduler();
                     this.popup.close();
                 }.bind(this));
             }
         });
+        this.domObj.find(".btn_exportExcel").off().click(e => {
+            // this.domObj.find(".buttons-excel").trigger("click");
+            this.exportExcel();
+        });
         this.domObj.find(".typeMain").off().on("change",e=>{
             this.setSubType();
         })
-        //修改
-        this.domObj.find(".btn_edit").off().click(e => {
-            //if (!this.dataTable.aExtentData.currentTableData) {
-
-                //this.toast.show("请选择一行数据进行修改");
-                //return;
-            //}else{
-                // if(this.dataTable.aExtentData.currentTableData.workOrderState != 4){
-                //     this.toast.show("请选择已完成的工单进行修改");
-                //     return;
-                // }
-                if (!this.dataTable.aExtentData.checkCurrentData) {
-                    this.toast.show("请选择数据");
-                    return
-                }
-                if (this.dataTable.aExtentData.checkCurrentData.length == 0) {
-                    this.toast.show("请选择数据");
-                    return
-                }
-                var dataInfo = this.dataTable.aExtentData.checkCurrentData[0];
-                this.popup.setSize(1000, 730);
-                var Obj = this.popup.Show("修改接收人", this.template.split('$$')[1]);
-                this.initLinkHtml(this,Obj.conObj.find("#widget-PipeRecordSearchAdmin-edit"),this.dataTable.aExtentData.checkCurrentData[0],0)
-                //this.getLinkHtml(this, Obj.conObj.find('.widget-MaintenanceManagerReport-pop'), [getHtml.state.maintenanceReport], state, data);
-                this.setDepartmentAndUser(this, Obj.conObj.find('.deptId'), Obj.conObj.find('.userId'), this.dataTable.aExtentData.checkCurrentData[0]);
-                this.setAssistantDepartmentAndAssistantUser(this, Obj.conObj.find('.assistantDepartment'), Obj.conObj.find('.synergyUserIds'), this.dataTable.aExtentData.checkCurrentData[0]);
-                Obj.submitObj.off("click").on("click", function () {
-                    var idArr = [];
-                var ids = Obj.conObj.find('.synergyUserIds option:selected');
-                $(ids).each((i,id)=>{
-                    idArr.push($(id).val())
-                })
-                var sendData = {
-                    schedulerId:dataInfo.id,
-                    userId:Obj.conObj.find('.userId option:selected').val(),
-                    assistantUserId:idArr.join(",")
-                }
-                this.ajaxSend.sendAjax(this, sendData, this.config.updateSchedulerDispatchUser,this.ajaxSend.type.get, this.showResult.bind(this))
-                    this.popup.close();
-                }.bind(this));
-            //}
-        });
-        this.domObj.find(".btn_exportExcel").off().click(e => {
-            this.domObj.find(".buttons-excel").trigger("click");
-        });
         $.jeDate("." + this.baseClass + " .plan_begindate", this.planBegindate);
+        $.jeDate("." + this.baseClass + " .plan_enddate", this.planEnddate);
     }
-    showResult(results){
-        if (this.ajaxSend.checkResults(this, results)) {
-            this.popup.close();
-            this.toast.show("修改成功!");
-            this.getMaintenanceList();
-        }
-    }
-    initLinkHtml(that, dom, data, type) {
-        //通过select的name属性值对textarea控件进行初始化
-        for (var item of dom.find("select")) {
-            if (this.initTag.indexOf(item) == -1) {
-                this.initTag.push(item);
-                let index = 0;
-                let length = 0;
-                for (var dataItem in data) {
-                    length++;
-                    if (item.attributes.showname && dataItem == item.attributes.showname.value && type == this.actionType.look) {
-                        $(item).after('<input type="text" class="form-control" readonly="readonly" value="' + this.verificationHelper.setNullAndUndefinedEnpty(data[dataItem]) + '">');
-                        let parentDom = $(item).parents('.userSelect');
-                        if (parentDom.length > 0) {
-                            parentDom.find('.item:first-child').remove();
-                            parentDom.find('.item').addClass('oneItem').removeClass('item');
-                        }
-                        $(item).remove();
-                    } else { index++ };
-                }
-                if (index == length && type == this.actionType.look) {
-                    $(item).after('<input type="text" class="form-control" readonly="readonly" >');
-                    $(item).remove();
-                }
-                if (type == this.actionType.look) {
-                    $(item).attr("readonly", "readonly");
-                } else {
-                    if (data&&(this.verificationHelper.setNullAndUndefinedEnpty(data[item.name]) + "").trim() != "") {
-                        $(item).val(this.verificationHelper.setNullAndUndefinedEnpty(data[item.name]));
-                    }
-                }
-            }
-        }
-    }
-    /**部门和人员的联动
-     * @param that 用于获取全局的一些配置
-     * @param dDom 部门下拉框dom
-     * @param uDom 用户下拉框dom
-     */
-     setDepartmentAndUser(that, dDom, uDom, dataInfo?) {
-        let data = {
-            current: 1,
-            size: 10000
-        }
-        this.ajaxSend.sendAjax(this, data, this.config.getDepartment, this.ajaxSend.type.get, function (results) {
-            if (this.ajaxSend.checkResults(that, results)) {
-                let dHtml = "";
-                if (!dDom.hasClass('synergyDepartment')) {
-                    $.each(results.result.records, function (i, item) {
-                        if (dataInfo && dataInfo.department) {
-                            if (dataInfo.department == item.id) {
-                                dHtml += "<option selected value='" + item.id + "'>" + item.name + "</option>"
-                            } else {
-                                dHtml += "<option value='" + item.id + "'>" + item.name + "</option>"
-                            }
-                        } else {
-                            if (i == 0) {
-                                dHtml += "<option selected value='" + item.id + "'>" + item.name + "</option>"
-                            } else {
-                                dHtml += "<option value='" + item.id + "'>" + item.name + "</option>"
-                            }
-                        }
-                    })
-                } else {
-                    $.each(results.result.records, function (i, item) {
-                        dHtml += "<option value='" + item.id + "'>" + item.name + "</option>";
-                    })
-                }
-                dDom.empty().append(dHtml);
-                dDom.selectpicker({
-                    noneResultsText: "未查询到{0}",
-                    noneSelectedText: "无选择项"
-                });
-                dDom.selectpicker('refresh');
-                dDom.off().change(e => {
-                    dDom.selectpicker('render');
-                    this.setUserList(that, dDom, uDom, dataInfo);
-                });
-                this.setUserList(that, dDom, uDom, dataInfo);
-            }
-        }.bind(this));
+    exportExcel(){
+        this.getSearchInfo();
+        let tempData= Object.assign({},this.searchInfo) ;
+        tempData.isExport=1;
+        this.ajaxSend.exportExcelByUrl(this, tempData, this.config.getRushList,  function (results) {
+            let blob = results;
+            const elink = document.createElement("a"); //创建a标签
+            elink.download = "应急查询表.xls";
+            elink.style.display = "none";
+            elink.href = window.URL.createObjectURL(blob);
+            document.body.appendChild(elink);
+            elink.click();
+            window.URL.revokeObjectURL(elink.href);
+            document.body.removeChild(elink);
+        }.bind(this),undefined,true);
     }
 
-    /**协助部门和人员的联动
-     * @param that 用于获取全局的一些配置
-     * @param dDom 部门下拉框dom
-     * @param uDom 用户下拉框dom
-     */
-     setAssistantDepartmentAndAssistantUser(that, dDom, uDom, dataInfo?) {
-        let data = {
-            current: 1,
-            size: 10000
-        }
-        this.ajaxSend.sendAjax(this, data, this.config.getDepartment, this.ajaxSend.type.get, function (results) {
-            if (this.ajaxSend.checkResults(that, results)) {
-                let dHtml = "";
-                if (!dDom.hasClass('synergyDepartment')) {
-                    $.each(results.result.records, function (i, item) {
-                        if (dataInfo && dataInfo.assistantDepartment) {
-                            if (dataInfo.assistantDepartment == item.id) {
-                                dHtml += "<option selected value='" + item.id + "'>" + item.name + "</option>"
-                            } else {
-                                dHtml += "<option value='" + item.id + "'>" + item.name + "</option>"
-                            }
-                        } else {
-                            if (i == 0) {
-                                dHtml += "<option selected value='" + item.id + "'>" + item.name + "</option>"
-                            } else {
-                                dHtml += "<option value='" + item.id + "'>" + item.name + "</option>"
-                            }
-                        }
-                    })
-                } else {
-                    $.each(results.result.records, function (i, item) {
-                        dHtml += "<option value='" + item.id + "'>" + item.name + "</option>";
-                    })
-                }
-                dDom.empty().append(dHtml);
-                dDom.selectpicker({
-                    noneResultsText: "未查询到{0}",
-                    noneSelectedText: "无选择项"
-                });
-                dDom.selectpicker('refresh');
-                dDom.off().change(e => {
-                    dDom.selectpicker('render');
-                    this.setAssistantUserList(that, dDom, uDom, dataInfo);
-                });
-                this.setAssistantUserList(that, dDom, uDom, dataInfo);
-            }
-        }.bind(this));
-    }
-    /**协助人员的变动
-     * @param that 用于获取全局的一些配置
-     * @param dDom 部门下拉框dom
-     * @param uDom 用户下拉框dom
-     */
-    setUserList(that, dDom, uDom, dataInfo) {
-        let deparmentDom = dDom.find('option:selected');
-        let deparment = "";
-        let url = ""
-        if (deparmentDom.length == 1) {
-            url = this.config.getUserList;
-            deparment = deparmentDom.val();
-        } else {
-            url = this.config.getUserListMore;
-            $.each(deparmentDom, (index, item) => {
-                if (index != deparmentDom.length - 1) {
-                    deparment += item.value + ","
-                } else {
-                    deparment += item.value;
-                }
-            })
-        }
-        let uData = {
-            current: 1,
-            size: 10000,
-            departmentId: deparment
-        }
-        this.ajaxSend.sendAjax(this, uData, url, this.ajaxSend.type.get, function (results) {
-            if (this.ajaxSend.checkResults(that, results)) {
-                let dHtml = "";
-                $.each(results.result.records, function (i, item) {
-                    if (dataInfo && dataInfo.dispatchUserId && dataInfo.department) {
-                        if (dataInfo.dispatchUserId == item.id) {
-                            dHtml += "<option selected value='" + item.id + "'>" + item.realName + "</option>"
-                        } else {
-                            dHtml += "<option value='" + item.id + "'>" + item.realName + "</option>"
-                        }
-                    } else {
-                        if (i == 0) {
-                            dHtml += "<option selected value='" + item.id + "'>" + item.realName + "</option>"
-                        } else {
-                            dHtml += "<option value='" + item.id + "'>" + item.realName + "</option>"
-                        }
-                    }
-                })
-                if (dDom.hasClass('synergyDepartment') && dDom.val() == "") {
-                    dHtml = "";
-                }
-                uDom.empty().append(dHtml);
-                uDom.selectpicker({
-                    noneResultsText: "未查询到{0}",
-                    noneSelectedText: "无选择项"
-                });
-                uDom.selectpicker('refresh');
-                uDom.selectpicker('render');
-            }
-        });
-    }
-     /**协助人员的变动
-     * @param that 用于获取全局的一些配置
-     * @param dDom 部门下拉框dom
-     * @param uDom 用户下拉框dom
-     */
-      setAssistantUserList(that, dDom, uDom, dataInfo) {
-        let deparmentDom = dDom.find('option:selected');
-        let deparment = "";
-        let url = ""
-        if (deparmentDom.length == 1) {
-            url = this.config.getUserList;
-            deparment = deparmentDom.val();
-        } else {
-            url = this.config.getUserListMore;
-            $.each(deparmentDom, (index, item) => {
-                if (index != deparmentDom.length - 1) {
-                    deparment += item.value + ","
-                } else {
-                    deparment += item.value;
-                }
-            })
-        }
-        let uData = {
-            current: 1,
-            size: 10000,
-            departmentId: deparment
-        }
-        this.ajaxSend.sendAjax(this, uData, url, this.ajaxSend.type.get, function (results) {
-            if (this.ajaxSend.checkResults(that, results)) {
-                let dHtml = "";
-                $.each(results.result.records, function (i, item) {
-                    if (dataInfo && dataInfo.assistantUserId && dataInfo.department) {
-                        if (dataInfo.assistantUserId == item.id) {
-                            dHtml += "<option selected value='" + item.id + "'>" + item.realName + "</option>"
-                        } else {
-                            dHtml += "<option value='" + item.id + "'>" + item.realName + "</option>"
-                        }
-                    } else {
-                        if (i == 0) {
-                            dHtml += "<option  value='" + item.id + "'>" + item.realName + "</option>"
-                        } else {
-                            dHtml += "<option value='" + item.id + "'>" + item.realName + "</option>"
-                        }
-                    }
-                })
-                if (dDom.hasClass('synergyDepartment') && dDom.val() == "") {
-                    dHtml = "";
-                }
-                uDom.empty().append(dHtml);
-                uDom.selectpicker({
-                    noneResultsText: "未查询到{0}",
-                    noneSelectedText: "无选择项"
-                });
-                uDom.selectpicker('refresh');
-                uDom.selectpicker('render');
-            }
-        });
-    }
     setMainType(){
         let dHtml = "";
         $.each(this.config.typeList, function (i, item) {
@@ -478,7 +219,7 @@ class MaintenanceSearchAdmin extends BaseWidget {
         this.setSubType();
     }
     setSubType(){
-        let dHtml = "";
+        let dHtml = "<option value=''>全部</option>";
         let dDomIndex = this.domObj.find('.typeMain option:selected').attr("index");
         $.each(this.config.typeList[dDomIndex].subtype, function (i, item) {
             dHtml += "<option value='" + item.value + "'>" + item.name + "</option>"
@@ -502,6 +243,7 @@ class MaintenanceSearchAdmin extends BaseWidget {
             //dataState.push(getHtml.state.maintenanceConduct);//3抢维修派工界面
         }
         if(data.isMaintenance=="1"&&data.responsibleUserId){
+            //dataState.push(getHtml.state.preWaitAudit);//9调度中心抢维修派工
             dataState.push(getHtml.state.maintenanceConduct);//3抢维修派工界面
         }
         if(data.maintenanceNotes||(data.maintenanceFile&&data.maintenanceFile.length>0) ||data.schedulerMaintenanceHisList.length >0){//抢维修处理页面
@@ -628,10 +370,42 @@ class MaintenanceSearchAdmin extends BaseWidget {
         return data;
     }
 
+    /**获取审核人员内容
+     * @param uDom 部门下拉框dom
+     * @param searchInfo 查询人员的调整
+     */
+    getAuditUserInfo(){
+        let that=this;
+        this.ajaxSend.sendAjax(this, {}, this.config.getOneTwoAuditUserList, this.ajaxSend.type.get, function (results) {
+            if (this.ajaxSend.checkResults(that, results)) {
+                let peopleList=that.domObj.find('.peopleList');
+                let peopleList2=that.domObj.find('.peopleList2');
+                let oneAuditUserList=results.result.oneAuditUserList;
+                let twoAuditUserList=results.result.twoAuditUserList;
+                let tempFun=(dom,data)=>{
+                    let dHtml = "<option selected value=''>全部</option>";
+                    $.each(data, function (i, item) {
+                        if(item.auditUserName){
+                            dHtml += "<option value='" + item.auditUserId + "'>" + (item.auditUserName||"") + "</option>"
+                        }
+                    })
+                    dom.empty().append(dHtml);
+                    dom.selectpicker({
+                        noneResultsText: "未查询到{0}",
+                        noneSelectedText: "无选择项"
+                    });
+                    dom.selectpicker('refresh');
+                    dom.selectpicker('render');
+                }
+                tempFun(peopleList,oneAuditUserList);
+                tempFun(peopleList2,twoAuditUserList);
+            }
+        });
+    }
 
     /* 渲染出列表点选的点和线
     * */
-   getMaintenanceList() {
+    getMaintenanceList() {
     this.loadWait.show("正在查询数据,请耐心等待...", this.domObj);
     let that = this;
     this.getSearchInfo();
@@ -642,13 +416,14 @@ class MaintenanceSearchAdmin extends BaseWidget {
     let option = {
         that: this,
         dataTable: that.dataTable,
-        elementId: "MaintenanceSearchinfodata",
+        elementId: "MaintenanceSearchAdmininfodata",
         url: that.config.getRushList,
         // isCheck: false,
         // testData:this.config.dataInfo,
         searchInfo: that.searchInfo,//条件在不断变化,故需要有全局的条件监听
-        displayTitle: ["报警人", "创建人", "派工人",'协助人员',"一级类型","二级类型", "地址", "联系电话","状态","描述"],
-        displayField: ["alarmPeopleName", "createUserName","dispatchUserName",'assistantUserName',"typeMainName" ,"typeName", "address", "contactPhone","workOrderStateName", "description"],
+        displayTitle: ["报警人", "创建人", "派工人","派工时间","协助人员","一级类型","二级类型", "地址", "联系电话","状态","描述",'处理时间','处理完成时间',"抢修时间","抢修完成时间","处置情况","一级审核人","二级审核人","驳回情况"],
+        displayField: ["alarmPeopleName", "createUserName","dispatchUserName","createTime","assistantUserName","typeMainName","typeName", "address", "contactPhone","workOrderStateName", "description","signTime",
+        "completeTime","handleSignTime","maintenanceTime","emergencyHandling","oneAuditPerson","twoAuditPerson","isReject"],
         extentDisplayTitle: ['详情'],
         extentDisplayContent: [{
             field: "infoWrite",
@@ -656,7 +431,7 @@ class MaintenanceSearchAdmin extends BaseWidget {
         }],
         beforeTrClickEvent: undefined,
         afterTrClickEvent: function () {
-            this.domObj.off('click', '#MaintenanceSearchinfodata tr').on('click', "#MaintenanceSearchinfodata tr", e => {
+            this.domObj.off('click', '#MaintenanceSearchAdmininfodata tr').on('click', "#MaintenanceSearchAdmininfodata tr", e => {
                 this.AppX.runtimeConfig.maintenancePageInfo.goPoint(this.dataTable.aExtentData.currentTableData);
             })
         }.bind(this),
@@ -669,7 +444,10 @@ class MaintenanceSearchAdmin extends BaseWidget {
         }.bind(this),
         serachCallBack: function (results) {
             if (this.fristSearch) {
-                this.fristSearch = false
+                this.fristSearch = false;
+                if (results.result.records) {
+                    this.renderPoint(results.result.records);
+                }
             } else {
                 if (results.result.records) {
                     this.renderPoint(results.result.records);
@@ -692,8 +470,7 @@ class MaintenanceSearchAdmin extends BaseWidget {
             this.toast.Show(results.message);
             return;
         }
-        //this.toast.Show(results.message);
-        this.toast.show('删除成功');
+        this.toast.Show(results.message);
         this.getMaintenanceList();
     }.bind(this))
    }

+ 1 - 1
src/widgets/MaintenanceSearchAdmin/config.json

@@ -4,8 +4,8 @@
     "styleUrl": "widgets/MaintenanceSearchAdmin/css/style.css",
     "getDepartment":"/base/department/page",
     "getUserList": "/base/user/getUserByDepts/list",
-    "updateSchedulerDispatchUser":"/zmrq/scheduler/updateSchedulerDispatchUser",
     "rushReport":"/zmrq/rushrepair/auditend",
+    "getOneTwoAuditUserList":"/zmrq/scheduler/getOneTwoAuditUserList",
     "getRushList":"/zmrq/scheduler/page",
     "deleteScheduler":"/zmrq/scheduler/deleteByIds",
     "tolerance": 3,

+ 25 - 114
src/widgets/MaintenanceSearchAdmin/css/style.scss

@@ -7,136 +7,47 @@
         }
         .groupright{
             display: flex;
-            position: absolute;
-            right: 15px;
+            position: relative;
+            // right: 15px;
+            left: 15px;
             div{
                 margin-right: 15px;
                 cursor: pointer;
             }
         }
     }
-    .halfpaneltable {
-        overflow-y: hidden;
-        height: calc(100% - 46px) !important;
-        a.infoWrite{
-            color: rgba(0,0,255,0.7) !important;
-        }
-    }
-}
-.widget-MaintenanceSearchAdmin-pop{
-    .form-inline {
-        padding-bottom: 15px;
-        position: relative;
-        left: 60px;
-        width: calc(100% - 60px);
-        border-left: 2px solid rgba(128,128,128,0.5);
-        margin: 0px;
-    }
-
-    .stateInfo{
-        width: 280px;
-        position: relative;
-        left: 10px;
-        font-size: 20px;
-        text-align: left;
-        font-weight: 600;
-        color: gray;
-        padding: 10px 0px;
-        padding-left: 5px;
+    .bootstrap-select>.dropdown-toggle:after {
+        transform: rotate(180deg);
+        color: white;
     }
-
-    .titleInfo{
-        font-size: 23px;
+    .filter-option-inner-inner{
+        color: white;
     }
-
-    .spanValue{
-        position: relative;
-        left: 10px;
+    .noborder{
+        border: none !important;
+        width: 90px !important;
     }
-    // audio::-webkit-media-controls-enclosure {
-    //     width: calc(100% + 12px);
-    //     margin-left: auto;
-    // }
-
-    .mustWrite {
-        color: red;
+    .siteName{
+        width: 90px !important;
     }
-
-    .item {
-        display: flex;
-        width: 50%;
+    .typeMain{
+        width: 120px !important;
     }
-
-    .oneItem {
-        display: flex;
-        width: 100%;
-        position: relative;
+    .plan_begindate,.plan_enddate{
+        width: 95px !important;
     }
-
-    .pipe-turn,
-    .equipment-turn {
-        position: absolute;
-        bottom: 5px;
-        right: 5px;
+    .isReturn{
+        width: 70px;
     }
-
-    .item,
-    .oneItem {
-        label.control-label {
-            margin: 0px !important;
-            width: 120px;
-            float: right;
-            text-align: right;
-            display: block;
-            padding: 0px 10px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-        }
-
-        .dropdown,
-        select,
-        textarea,
-        table,
-        input.form-control {
-            width: calc(100% - 0px);
-        }
-
-        .dropdown-menu {
-            .inner {
-                height: 200px !important;
-            }
-        }
-
-        table {
-            margin: 0px;
-
-            td input {
-                width: calc(100% - 50px) !important;
-                text-align: center;
-                margin-left: 10px;
-            }
-        }
-
-        td,
-        th {
-            padding: 10px;
-        }
-
-        .isHide {
-            display: none;
-        }
-
-        ;
-
-        .fileInfoNot {
-            display: block;
-            padding-top: 5.8px;
-            color: #666666;
-            margin-left: 13px;
+    .halfpaneltable {
+        overflow-y: hidden;
+        height: calc(100% - 46px) !important;
+        a.infoWrite{
+            color: rgba(0,0,255,0.7) !important;
         }
     }
 }
+
 .widget-MaintenanceSearchAdmin-pop {
     width: 100%;
     height: 100%;

+ 110 - 0
src/widgets/MaintenanceSearchAdmin_/Widget.html

@@ -0,0 +1,110 @@
+<div class="widget-MaintenanceSearchAdmin box">
+    <div class='tool form-inline'>
+        <div class="form-group">
+            <label class=" control-label">状态</label>
+            <select class="input-sm form-control   workOrderType" data-live-search="true" name='workOrderType'
+                data-max-options="1" data-style="btn-primary">
+                <option value='' selected="selected">全部</option>
+                <option value='1'>派工待处理</option>
+                <option value='2'>抢修待派工</option>
+                <option value='3'>抢修待处理</option>
+                <option value='5'>一级待审核</option>
+                <option value='6'>二级待审核</option>
+                <option value='4'>审核归档</option>
+            </select>
+        </div>
+        <div class="form-group">
+            <label class=" control-label">地址</label>
+            <input type="text" autocomplete="off" class="form-control siteName" name="siteName" placeholder="地址">
+        </div>
+        <div class="form-group">
+            <label class=" control-label">一级抢修分类</label>
+            <select class="input-sm form-control typeMain minwidth">
+                <!-- <option value="" selected>全部</option>
+                <option value="0">无气/气小</option>
+                <option value="1">户内漏气</option>
+                <option value="2">户外漏气</option>
+                <option value="3">其他</option> -->
+            </select>
+            <!-- <input type="text" autocomplete="off" class="form-control type" name="type" placeholder="类型"> -->
+        </div>
+        <div class="form-group">
+            <label class=" control-label">二级抢修分类</label>
+            <select class="input-sm form-control type minwidth">
+                <!-- <option value="" selected>全部</option>
+                <option value="0">无气/气小</option>
+                <option value="1">户内漏气</option>
+                <option value="2">户外漏气</option>
+                <option value="3">其他</option> -->
+            </select>
+            <!-- <input type="text" autocomplete="off" class="form-control type" name="type" placeholder="类型"> -->
+        </div>
+        <div class="form-group">
+            <label class=" control-label">上报时间</label>
+            <input type="text" readonly="readonly" class="form-control plan_begindate minwidth" id="plan_begindate" placeholder="年-月-日">
+        </div>
+        <div class="form-group">
+            <button id="btn_add" type="button" class="btn btn-sm btn-default btn-success btn_search">
+                <span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询
+            </button>
+        </div>
+        <div class="form-group">
+            <button id="btn_delete" type="button" class="btn btn-sm btn-default btn-success btn_delete">
+                <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>删除
+            </button>
+        </div>
+        <!-- <div class="form-group">
+            <button id="btn_edit" type="button" class="btn btn-sm btn-default btn-success btn_edit">
+                <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>修改接收人
+            </button>
+        </div> -->
+        <div class="form-group groupright">
+            <div class="btn_exportExcel">
+                <img src="./widgets/KeyEquipment/images/export.png" />
+                <span>导出</span>
+            </div>
+        </div>
+    </div>
+    <div class="planpath_content halfpaneltable">
+        <table class="table table-bordered  table-striped MaintenanceSearchinfodata" cellspacing="0"
+            id='MaintenanceSearchinfodata'>
+        </table>
+    </div>
+</div>
+$$
+<div class='widget-MaintenanceSearchAdmin-pop'>
+    <div class="form-group form-inline userSelect">
+        <div class='item'>
+            <label class=" control-label">部门</label>
+            <select class="input-sm form-control  deptId" data-live-search="true"
+                name='deptId' showname='deptName' data-style="btn-primary">
+            </select>
+        </div>
+        <div class='item'>
+            <label class=" control-label">主要人员</label>
+            <select class="input-sm form-control  userId" data-live-search="true"
+                name='userId' showname='userIdName' data-style="btn-primary">
+            </select>
+        </div>
+    </div>
+    <div class="form-group form-inline userSelect">
+        <div class='item'>
+            <label class=" control-label">部门</label>
+            <select class="input-sm form-control  assistantDepartment" data-live-search="true"
+                name='assistantDepartment' showname='deptName' data-style="btn-primary">
+            </select>
+        </div>
+        <div class='item'>
+            <label class=" control-label">协助人员</label>
+            <select class="input-sm form-control  synergyUserIds" data-live-search="true"
+                name='synergyUserIds' showname='synergyUserNames' multiple data-style="btn-primary">
+            </select>
+        </div>
+    </div>
+</div>
+$$
+<div id="widget-MaintenanceSearchAdmin-delete" >
+    <div style="text-align: center;font-size:14px">
+           是否删除数据?
+    </div>
+</div>

+ 338 - 175
src/widgets/MaintenanceSearch——————/Widget.ts

@@ -19,9 +19,9 @@ enum graphic {
     point, line
 }
 
-export = MaintenanceSearch;
-class MaintenanceSearch extends BaseWidget {
-    baseClass = "widget-MaintenanceSearch";
+export = MaintenanceSearchAdmin;
+class MaintenanceSearchAdmin extends BaseWidget {
+    baseClass = "widget-MaintenanceSearchAdmin";
     /**根据这个图层id前缀来控制图层模块切换时展示和隐藏,展示本模块图层,隐藏其它模块的图层*/
     preLayerId='HalfPanel'+this.baseClass;
     map = null;
@@ -47,7 +47,13 @@ class MaintenanceSearch extends BaseWidget {
     allList = null;
     fristSearch = true;
     maintenancePageInfo=null;
-
+    initTag = [];
+    actionType = {
+        /**填写本环节内容*/
+        write: 0,
+        /**查看本环节内容*/
+        look: 1
+    }
     /**
      * @function 初始化启动
      */
@@ -67,8 +73,7 @@ class MaintenanceSearch extends BaseWidget {
         this.ready();
         this.getSearchInfo();
         this.getAllmaintenanceData();
-        this.setDepartmentAndUser('.department','.peopleList');
-        this.setDepartmentAndUser('.department2','.peopleList2');
+        // this.drawWebGL();
     }
 
     configure() {
@@ -87,32 +92,7 @@ class MaintenanceSearch extends BaseWidget {
     planBegindate = {
         format: 'YYYY-MM-DD', //日期格式
         isinitVal: false,
-        okfun: function (obj) {
-            // var period_id = this.domObj.find(".periodid option:selected").val();
-            // if (period_id == "3") {
-            //     this.endDate.minDate = obj.val;
-            // }
-            var dt = new Date(obj.val.replace(/-/g, "/"));
-            this.planEnddate.minDate = Functions.DateFormat(dt, "yyyy-MM-dd");
-            this.domObj.find(".plan_enddate").val(this.planEnddate.minDate);
-        }.bind(this)
-    }
-    planEnddate = {
-        format: 'YYYY-MM-DD', //日期格式
-        isinitVal: false,
-        okfun: function (obj) {
-            // var period_id = this.domObj.find(".periodid option:selected").val();
-            // var dt = new Date(obj.val.replace(/-/g, "/"));
-            // if (period_id == "1") {
-            //     this.endDate.minDate = obj.val;
-            // } else if (period_id == "2") {
-            //     // this.endDate.minDate = Functions.DateFormat(new Date(dt.getTime() + 24 * 3600000), "yyyy-MM-dd");
-            //     this.endDate.minDate = obj.val;
-            // }
-            // if (parseInt(this.domObj.find(".plan_enddate").val().replace(/-/g, "")) < parseInt(this.endDate.minDate.replace(/-/g, ""))) {
-            //     this.domObj.find(".plan_enddate").val(this.endDate.minDate);
-            // }
-        }.bind(this)
+
     }
     /**
      * 选中图层渲染创建、销毁、清理
@@ -135,22 +115,18 @@ class MaintenanceSearch extends BaseWidget {
     /**
     * 获取查询条件
     */
-    getSearchInfo() {
-        // let workOrderState = this.domObj.find(".workOrderType option:selected").val();
-        // let siteName = this.domObj.find(".siteName").val();
-        // let type = this.domObj.find(".type").val();
-        // let MainType = this.domObj.find(".typeMain").val();
+     getSearchInfo() {
+        let workOrderState = this.domObj.find(".workOrderType option:selected").val();
+        let siteName = this.domObj.find(".siteName").val();
+        let type = this.domObj.find(".type").val();
+        let MainType = this.domObj.find(".typeMain").val();
         let startTime = this.domObj.find(".plan_begindate").val();
         let endTime = this.domObj.find(".plan_enddate").val();
-        let oneAuditPerson=this.domObj.find(".peopleList").val();//一级审核人
-        let oneAuditStatus=this.domObj.find(".oneAuditStatus").val();//一级审核状态
-        let twoAuditPerson=this.domObj.find(".peopleList2").val();//二级审核人
-        let twoAuditStatus=this.domObj.find(".twoAuditStatus").val();//二级审核状态
         this.searchInfo = {
-            oneAuditPerson: oneAuditPerson ? oneAuditPerson : "",
-            oneAuditStatus: oneAuditStatus,
-            twoAuditPerson:twoAuditPerson ? twoAuditPerson : "",
-            twoAuditStatus:twoAuditStatus ,
+            workOrderState: workOrderState ? workOrderState : "",
+            address: siteName ? siteName : "",
+            type:type ? type : "",
+            typeMain:MainType ? MainType : "",
             startTime: startTime ? startTime +" 00:00:00" :"",
             endTime: endTime ? endTime +" 23:59:59" :"",
             "orders[0].asc":false,
@@ -163,40 +139,327 @@ class MaintenanceSearch extends BaseWidget {
      */
     initEvent() {
         this.initSelectGraphic(operation.create);
-        // this.setMainType();
+        this.setMainType();
         this.domObj.find(".btn_search").off().click(e => {
             this.getMaintenanceList();
         });
         this.domObj.find(".btn_delete").off().click(e => {
-            this.deleteScheduler();
+            if (!this.dataTable.aExtentData.checkCurrentData) {
+                this.toast.show("请选择数据进行删除");
+                return;
+            }else{
+                this.popup.setSize(300, 170);
+                let title = "删除";
+                var Obj = this.popup.Show(title, this.template.split('$$')[2]);
+                Obj.submitObj.off("click").on("click", function () {
+                    this.deleteScheduler();
+                    this.popup.close();
+                }.bind(this));
+            }
+        });
+        this.domObj.find(".typeMain").off().on("change",e=>{
+            this.setSubType();
+        })
+        //修改
+        this.domObj.find(".btn_edit").off().click(e => {
+            //if (!this.dataTable.aExtentData.currentTableData) {
+
+                //this.toast.show("请选择一行数据进行修改");
+                //return;
+            //}else{
+                // if(this.dataTable.aExtentData.currentTableData.workOrderState != 4){
+                //     this.toast.show("请选择已完成的工单进行修改");
+                //     return;
+                // }
+                if (!this.dataTable.aExtentData.checkCurrentData) {
+                    this.toast.show("请选择数据");
+                    return
+                }
+                if (this.dataTable.aExtentData.checkCurrentData.length == 0) {
+                    this.toast.show("请选择数据");
+                    return
+                }
+                var dataInfo = this.dataTable.aExtentData.checkCurrentData[0];
+                this.popup.setSize(1000, 730);
+                var Obj = this.popup.Show("修改接收人", this.template.split('$$')[1]);
+                this.initLinkHtml(this,Obj.conObj.find("#widget-PipeRecordSearchAdmin-edit"),this.dataTable.aExtentData.checkCurrentData[0],0)
+                //this.getLinkHtml(this, Obj.conObj.find('.widget-MaintenanceManagerReport-pop'), [getHtml.state.maintenanceReport], state, data);
+                this.setDepartmentAndUser(this, Obj.conObj.find('.deptId'), Obj.conObj.find('.userId'), this.dataTable.aExtentData.checkCurrentData[0]);
+                this.setAssistantDepartmentAndAssistantUser(this, Obj.conObj.find('.assistantDepartment'), Obj.conObj.find('.synergyUserIds'), this.dataTable.aExtentData.checkCurrentData[0]);
+                Obj.submitObj.off("click").on("click", function () {
+                    var idArr = [];
+                var ids = Obj.conObj.find('.synergyUserIds option:selected');
+                $(ids).each((i,id)=>{
+                    idArr.push($(id).val())
+                })
+                var sendData = {
+                    schedulerId:dataInfo.id,
+                    userId:Obj.conObj.find('.userId option:selected').val(),
+                    assistantUserId:idArr.join(",")
+                }
+                this.ajaxSend.sendAjax(this, sendData, this.config.updateSchedulerDispatchUser,this.ajaxSend.type.get, this.showResult.bind(this))
+                    this.popup.close();
+                }.bind(this));
+            //}
         });
         this.domObj.find(".btn_exportExcel").off().click(e => {
-            // this.domObj.find(".buttons-excel").trigger("click");
-            this.exportExcel();
+            this.domObj.find(".buttons-excel").trigger("click");
         });
-        // this.domObj.find(".typeMain").off().on("change",e=>{
-        //     this.setSubType();
-        // })
         $.jeDate("." + this.baseClass + " .plan_begindate", this.planBegindate);
-        $.jeDate("." + this.baseClass + " .plan_enddate", this.planEnddate);
     }
-    exportExcel(){
-        this.getSearchInfo();
-        let tempData= Object.assign({},this.searchInfo) ;
-        tempData.isExport=1;
-        this.ajaxSend.exportExcelByUrl(this, tempData, this.config.getRushList,  function (results) {
-            let blob = results;
-            const elink = document.createElement("a"); //创建a标签
-            elink.download = "应急查询表.xls";
-            elink.style.display = "none";
-            elink.href = window.URL.createObjectURL(blob);
-            document.body.appendChild(elink);
-            elink.click();
-            window.URL.revokeObjectURL(elink.href);
-            document.body.removeChild(elink);
-        }.bind(this),undefined,true);
+    showResult(results){
+        if (this.ajaxSend.checkResults(this, results)) {
+            this.popup.close();
+            this.toast.show("修改成功!");
+            this.getMaintenanceList();
+        }
+    }
+    initLinkHtml(that, dom, data, type) {
+        //通过select的name属性值对textarea控件进行初始化
+        for (var item of dom.find("select")) {
+            if (this.initTag.indexOf(item) == -1) {
+                this.initTag.push(item);
+                let index = 0;
+                let length = 0;
+                for (var dataItem in data) {
+                    length++;
+                    if (item.attributes.showname && dataItem == item.attributes.showname.value && type == this.actionType.look) {
+                        $(item).after('<input type="text" class="form-control" readonly="readonly" value="' + this.verificationHelper.setNullAndUndefinedEnpty(data[dataItem]) + '">');
+                        let parentDom = $(item).parents('.userSelect');
+                        if (parentDom.length > 0) {
+                            parentDom.find('.item:first-child').remove();
+                            parentDom.find('.item').addClass('oneItem').removeClass('item');
+                        }
+                        $(item).remove();
+                    } else { index++ };
+                }
+                if (index == length && type == this.actionType.look) {
+                    $(item).after('<input type="text" class="form-control" readonly="readonly" >');
+                    $(item).remove();
+                }
+                if (type == this.actionType.look) {
+                    $(item).attr("readonly", "readonly");
+                } else {
+                    if (data&&(this.verificationHelper.setNullAndUndefinedEnpty(data[item.name]) + "").trim() != "") {
+                        $(item).val(this.verificationHelper.setNullAndUndefinedEnpty(data[item.name]));
+                    }
+                }
+            }
+        }
+    }
+    /**部门和人员的联动
+     * @param that 用于获取全局的一些配置
+     * @param dDom 部门下拉框dom
+     * @param uDom 用户下拉框dom
+     */
+     setDepartmentAndUser(that, dDom, uDom, dataInfo?) {
+        let data = {
+            current: 1,
+            size: 10000
+        }
+        this.ajaxSend.sendAjax(this, data, this.config.getDepartment, this.ajaxSend.type.get, function (results) {
+            if (this.ajaxSend.checkResults(that, results)) {
+                let dHtml = "";
+                if (!dDom.hasClass('synergyDepartment')) {
+                    $.each(results.result.records, function (i, item) {
+                        if (dataInfo && dataInfo.department) {
+                            if (dataInfo.department == item.id) {
+                                dHtml += "<option selected value='" + item.id + "'>" + item.name + "</option>"
+                            } else {
+                                dHtml += "<option value='" + item.id + "'>" + item.name + "</option>"
+                            }
+                        } else {
+                            if (i == 0) {
+                                dHtml += "<option selected value='" + item.id + "'>" + item.name + "</option>"
+                            } else {
+                                dHtml += "<option value='" + item.id + "'>" + item.name + "</option>"
+                            }
+                        }
+                    })
+                } else {
+                    $.each(results.result.records, function (i, item) {
+                        dHtml += "<option value='" + item.id + "'>" + item.name + "</option>";
+                    })
+                }
+                dDom.empty().append(dHtml);
+                dDom.selectpicker({
+                    noneResultsText: "未查询到{0}",
+                    noneSelectedText: "无选择项"
+                });
+                dDom.selectpicker('refresh');
+                dDom.off().change(e => {
+                    dDom.selectpicker('render');
+                    this.setUserList(that, dDom, uDom, dataInfo);
+                });
+                this.setUserList(that, dDom, uDom, dataInfo);
+            }
+        }.bind(this));
     }
 
+    /**协助部门和人员的联动
+     * @param that 用于获取全局的一些配置
+     * @param dDom 部门下拉框dom
+     * @param uDom 用户下拉框dom
+     */
+     setAssistantDepartmentAndAssistantUser(that, dDom, uDom, dataInfo?) {
+        let data = {
+            current: 1,
+            size: 10000
+        }
+        this.ajaxSend.sendAjax(this, data, this.config.getDepartment, this.ajaxSend.type.get, function (results) {
+            if (this.ajaxSend.checkResults(that, results)) {
+                let dHtml = "";
+                if (!dDom.hasClass('synergyDepartment')) {
+                    $.each(results.result.records, function (i, item) {
+                        if (dataInfo && dataInfo.assistantDepartment) {
+                            if (dataInfo.assistantDepartment == item.id) {
+                                dHtml += "<option selected value='" + item.id + "'>" + item.name + "</option>"
+                            } else {
+                                dHtml += "<option value='" + item.id + "'>" + item.name + "</option>"
+                            }
+                        } else {
+                            if (i == 0) {
+                                dHtml += "<option selected value='" + item.id + "'>" + item.name + "</option>"
+                            } else {
+                                dHtml += "<option value='" + item.id + "'>" + item.name + "</option>"
+                            }
+                        }
+                    })
+                } else {
+                    $.each(results.result.records, function (i, item) {
+                        dHtml += "<option value='" + item.id + "'>" + item.name + "</option>";
+                    })
+                }
+                dDom.empty().append(dHtml);
+                dDom.selectpicker({
+                    noneResultsText: "未查询到{0}",
+                    noneSelectedText: "无选择项"
+                });
+                dDom.selectpicker('refresh');
+                dDom.off().change(e => {
+                    dDom.selectpicker('render');
+                    this.setAssistantUserList(that, dDom, uDom, dataInfo);
+                });
+                this.setAssistantUserList(that, dDom, uDom, dataInfo);
+            }
+        }.bind(this));
+    }
+    /**协助人员的变动
+     * @param that 用于获取全局的一些配置
+     * @param dDom 部门下拉框dom
+     * @param uDom 用户下拉框dom
+     */
+    setUserList(that, dDom, uDom, dataInfo) {
+        let deparmentDom = dDom.find('option:selected');
+        let deparment = "";
+        let url = ""
+        if (deparmentDom.length == 1) {
+            url = this.config.getUserList;
+            deparment = deparmentDom.val();
+        } else {
+            url = this.config.getUserListMore;
+            $.each(deparmentDom, (index, item) => {
+                if (index != deparmentDom.length - 1) {
+                    deparment += item.value + ","
+                } else {
+                    deparment += item.value;
+                }
+            })
+        }
+        let uData = {
+            current: 1,
+            size: 10000,
+            departmentId: deparment
+        }
+        this.ajaxSend.sendAjax(this, uData, url, this.ajaxSend.type.get, function (results) {
+            if (this.ajaxSend.checkResults(that, results)) {
+                let dHtml = "";
+                $.each(results.result.records, function (i, item) {
+                    if (dataInfo && dataInfo.dispatchUserId && dataInfo.department) {
+                        if (dataInfo.dispatchUserId == item.id) {
+                            dHtml += "<option selected value='" + item.id + "'>" + item.realName + "</option>"
+                        } else {
+                            dHtml += "<option value='" + item.id + "'>" + item.realName + "</option>"
+                        }
+                    } else {
+                        if (i == 0) {
+                            dHtml += "<option selected value='" + item.id + "'>" + item.realName + "</option>"
+                        } else {
+                            dHtml += "<option value='" + item.id + "'>" + item.realName + "</option>"
+                        }
+                    }
+                })
+                if (dDom.hasClass('synergyDepartment') && dDom.val() == "") {
+                    dHtml = "";
+                }
+                uDom.empty().append(dHtml);
+                uDom.selectpicker({
+                    noneResultsText: "未查询到{0}",
+                    noneSelectedText: "无选择项"
+                });
+                uDom.selectpicker('refresh');
+                uDom.selectpicker('render');
+            }
+        });
+    }
+     /**协助人员的变动
+     * @param that 用于获取全局的一些配置
+     * @param dDom 部门下拉框dom
+     * @param uDom 用户下拉框dom
+     */
+      setAssistantUserList(that, dDom, uDom, dataInfo) {
+        let deparmentDom = dDom.find('option:selected');
+        let deparment = "";
+        let url = ""
+        if (deparmentDom.length == 1) {
+            url = this.config.getUserList;
+            deparment = deparmentDom.val();
+        } else {
+            url = this.config.getUserListMore;
+            $.each(deparmentDom, (index, item) => {
+                if (index != deparmentDom.length - 1) {
+                    deparment += item.value + ","
+                } else {
+                    deparment += item.value;
+                }
+            })
+        }
+        let uData = {
+            current: 1,
+            size: 10000,
+            departmentId: deparment
+        }
+        this.ajaxSend.sendAjax(this, uData, url, this.ajaxSend.type.get, function (results) {
+            if (this.ajaxSend.checkResults(that, results)) {
+                let dHtml = "";
+                $.each(results.result.records, function (i, item) {
+                    if (dataInfo && dataInfo.assistantUserId && dataInfo.department) {
+                        if (dataInfo.assistantUserId == item.id) {
+                            dHtml += "<option selected value='" + item.id + "'>" + item.realName + "</option>"
+                        } else {
+                            dHtml += "<option value='" + item.id + "'>" + item.realName + "</option>"
+                        }
+                    } else {
+                        if (i == 0) {
+                            dHtml += "<option  value='" + item.id + "'>" + item.realName + "</option>"
+                        } else {
+                            dHtml += "<option value='" + item.id + "'>" + item.realName + "</option>"
+                        }
+                    }
+                })
+                if (dDom.hasClass('synergyDepartment') && dDom.val() == "") {
+                    dHtml = "";
+                }
+                uDom.empty().append(dHtml);
+                uDom.selectpicker({
+                    noneResultsText: "未查询到{0}",
+                    noneSelectedText: "无选择项"
+                });
+                uDom.selectpicker('refresh');
+                uDom.selectpicker('render');
+            }
+        });
+    }
     setMainType(){
         let dHtml = "";
         $.each(this.config.typeList, function (i, item) {
@@ -206,7 +469,7 @@ class MaintenanceSearch extends BaseWidget {
         this.setSubType();
     }
     setSubType(){
-        let dHtml = "<option value=''>全部</option>";
+        let dHtml = "";
         let dDomIndex = this.domObj.find('.typeMain option:selected').attr("index");
         $.each(this.config.typeList[dDomIndex].subtype, function (i, item) {
             dHtml += "<option value='" + item.value + "'>" + item.name + "</option>"
@@ -230,7 +493,6 @@ class MaintenanceSearch extends BaseWidget {
             //dataState.push(getHtml.state.maintenanceConduct);//3抢维修派工界面
         }
         if(data.isMaintenance=="1"&&data.responsibleUserId){
-            //dataState.push(getHtml.state.preWaitAudit);//9调度中心抢维修派工
             dataState.push(getHtml.state.maintenanceConduct);//3抢维修派工界面
         }
         if(data.maintenanceNotes||(data.maintenanceFile&&data.maintenanceFile.length>0) ||data.schedulerMaintenanceHisList.length >0){//抢维修处理页面
@@ -247,7 +509,7 @@ class MaintenanceSearch extends BaseWidget {
             dataState.push(getHtml.state.AuditSecond);//6
         }
 
-        getHtml.getLinkHtml(this, Obj.conObj.find('.widget-MaintenanceSearch-pop'), dataState,undefined, data);
+        getHtml.getLinkHtml(this, Obj.conObj.find('.widget-MaintenanceSearchAdmin-pop'), dataState,undefined, data);
         Obj.submitObj.off("click").on("click", function () {
             this.popup.close();
         }.bind(this));
@@ -368,12 +630,6 @@ class MaintenanceSearch extends BaseWidget {
         that.dataTable.ajax.reload();
         return;
     };
-
-    let oneAuditPerson=this.domObj.find(".peopleList").val();//一级审核人
-    let oneAuditStatus=this.domObj.find(".oneAuditStatus").val();//一级审核状态
-    let twoAuditPerson=this.domObj.find(".peopleList2").val();//二级审核人
-    let twoAuditStatus=this.domObj.find(".twoAuditStatus").val();//二级审核状态
-
     let option = {
         that: this,
         dataTable: that.dataTable,
@@ -382,8 +638,8 @@ class MaintenanceSearch extends BaseWidget {
         // isCheck: false,
         // testData:this.config.dataInfo,
         searchInfo: that.searchInfo,//条件在不断变化,故需要有全局的条件监听
-        displayTitle: ["报警人", "创建人", "派工人","派工时间","协助人员","一级类型","二级类型", "地址", "联系电话","状态","描述",'处理时间','处理完成时间',"抢修时间","抢修完成时间","处置情况"],
-        displayField: ["alarmPeopleName", "createUserName","dispatchUserName","createTime","assistantUserName","typeMainName","typeName", "address", "contactPhone","workOrderStateName", "description","signTime","completeTime","handleSignTime","maintenanceTime","emergencyHandling"],
+        displayTitle: ["报警人", "创建人", "派工人",'协助人员',"一级类型","二级类型", "地址", "联系电话","状态","描述"],
+        displayField: ["alarmPeopleName", "createUserName","dispatchUserName",'assistantUserName',"typeMainName" ,"typeName", "address", "contactPhone","workOrderStateName", "description"],
         extentDisplayTitle: ['详情'],
         extentDisplayContent: [{
             field: "infoWrite",
@@ -404,10 +660,7 @@ class MaintenanceSearch extends BaseWidget {
         }.bind(this),
         serachCallBack: function (results) {
             if (this.fristSearch) {
-                this.fristSearch = false;
-                if (results.result.records) {
-                    this.renderPoint(results.result.records);
-                }
+                this.fristSearch = false
             } else {
                 if (results.result.records) {
                     this.renderPoint(results.result.records);
@@ -430,101 +683,11 @@ class MaintenanceSearch extends BaseWidget {
             this.toast.Show(results.message);
             return;
         }
-        this.toast.Show(results.message);
+        //this.toast.Show(results.message);
+        this.toast.show('删除成功');
         this.getMaintenanceList();
     }.bind(this))
    }
-
-      /**部门和人员的联动 
-     * @param that 用于获取全局的一些配置
-     * @param dDom 部门下拉框dom
-     * @param uDom 用户下拉框dom
-     */
-
-      setDepartmentAndUser(deptClass,userClass) {
-        let that=this;
-        let dDom=this.domObj.find(deptClass);
-        let uDom=this.domObj.find(userClass);
-        let data = {
-            current: 1,
-            size: 10000
-        }
-        let departmentFi=dDom[0].name;
-        this.ajaxSend.sendAjax(this, data, this.config.getDepartment, this.ajaxSend.type.get, function (results) {
-            if (this.ajaxSend.checkResults(that, results)) {
-                let dHtml = "";
-                $.each(results.result.records, function (i, item) {
-                    if (i == 0) {
-                        dHtml += "<option selected value='" + item.id + "'>" + item.name + "</option>"
-                    } else {
-                        dHtml += "<option value='" + item.id + "'>" + item.name + "</option>"
-                    }
-                })
-                dDom.empty().append(dHtml);
-                dDom.selectpicker({
-                    noneResultsText: "未查询到{0}",
-                    noneSelectedText: "无选择项"
-                });
-                dDom.selectpicker('refresh');
-                dDom.off().change(e => {
-                    dDom.selectpicker('render');
-                    this.setUserList(that, dDom, uDom);
-                })
-                this.setUserList(that, dDom, uDom);
-            }
-        }.bind(this));
-    }
-
-     /**人员的变动
-     * @param that 用于获取全局的一些配置
-     * @param dDom 部门下拉框dom
-     * @param uDom 用户下拉框dom
-     */
-     setUserList(that, dDom, uDom) {
-        let deparmentDom = dDom.find('option:selected');
-        let deparment = "";
-        let url = "";
-        if (deparmentDom.length == 1) {
-            url = this.config.getUserList;
-            deparment = deparmentDom.val();
-        } else {
-            url = this.config.getUserListMore;
-            $.each(deparmentDom, (index, item) => {
-                if (index != deparmentDom.length - 1) {
-                    deparment += item.value + ","
-                } else {
-                    deparment += item.value;
-                }
-            })
-        }
-        if (deparment != "") {
-            let uData = {
-                current: 1,
-                size: 10000,
-                departmentId: deparment
-            }
-            this.ajaxSend.sendAjax(this, uData, url, this.ajaxSend.type.get, function (results) {
-                if (this.ajaxSend.checkResults(that, results)) {
-                    let dHtml = "<option selected value=''>全部</option>";
-                    $.each(results.result.records, function (i, item) {
-                        dHtml += "<option value='" + item.id + "'>" + item.realName + "</option>"
-                    })
-                    uDom.empty().append(dHtml);
-                    uDom.selectpicker({
-                        noneResultsText: "未查询到{0}",
-                        noneSelectedText: "无选择项"
-                    });
-                    uDom.selectpicker('refresh');
-                    uDom.selectpicker('render');
-                    // uDom.multiselect("destroy").multiselect({
-                    //     maxHeight: 200,
-                    //     inheritClass: false
-                    // }).multiselect("enable")
-                }
-            });
-        }
-    }
-
     /**
      * 销毁对象
      */

+ 4 - 3
src/widgets/MaintenanceSearch——————/config.json

@@ -1,9 +1,10 @@
 {
-    "widgetUrl": "widgets/MaintenanceSearch",
-    "tmplateUrl": "widgets/MaintenanceSearch/Widget.html",
-    "styleUrl": "widgets/MaintenanceSearch/css/style.css",
+    "widgetUrl": "widgets/MaintenanceSearchAdmin",
+    "tmplateUrl": "widgets/MaintenanceSearchAdmin/Widget.html",
+    "styleUrl": "widgets/MaintenanceSearchAdmin/css/style.css",
     "getDepartment":"/base/department/page",
     "getUserList": "/base/user/getUserByDepts/list",
+    "updateSchedulerDispatchUser":"/zmrq/scheduler/updateSchedulerDispatchUser",
     "rushReport":"/zmrq/rushrepair/auditend",
     "getRushList":"/zmrq/scheduler/page",
     "deleteScheduler":"/zmrq/scheduler/deleteByIds",

+ 144 - 0
src/widgets/MaintenanceSearchAdmin_/css/style.scss

@@ -0,0 +1,144 @@
+.widget-MaintenanceSearchAdmin {
+    height: 100%;
+    .tool {
+        .form-group {
+            float: left;
+            margin: 4px 0px 4px 4px;
+        }
+        .groupright{
+            display: flex;
+            position: absolute;
+            right: 15px;
+            div{
+                margin-right: 15px;
+                cursor: pointer;
+            }
+        }
+    }
+    .halfpaneltable {
+        overflow-y: hidden;
+        height: calc(100% - 46px) !important;
+        a.infoWrite{
+            color: rgba(0,0,255,0.7) !important;
+        }
+    }
+}
+.widget-MaintenanceSearchAdmin-pop{
+    .form-inline {
+        padding-bottom: 15px;
+        position: relative;
+        left: 60px;
+        width: calc(100% - 60px);
+        border-left: 2px solid rgba(128,128,128,0.5);
+        margin: 0px;
+    }
+
+    .stateInfo{
+        width: 280px;
+        position: relative;
+        left: 10px;
+        font-size: 20px;
+        text-align: left;
+        font-weight: 600;
+        color: gray;
+        padding: 10px 0px;
+        padding-left: 5px;
+    }
+
+    .titleInfo{
+        font-size: 23px;
+    }
+
+    .spanValue{
+        position: relative;
+        left: 10px;
+    }
+    // audio::-webkit-media-controls-enclosure {
+    //     width: calc(100% + 12px);
+    //     margin-left: auto;
+    // }
+
+    .mustWrite {
+        color: red;
+    }
+
+    .item {
+        display: flex;
+        width: 50%;
+    }
+
+    .oneItem {
+        display: flex;
+        width: 100%;
+        position: relative;
+    }
+
+    .pipe-turn,
+    .equipment-turn {
+        position: absolute;
+        bottom: 5px;
+        right: 5px;
+    }
+
+    .item,
+    .oneItem {
+        label.control-label {
+            margin: 0px !important;
+            width: 120px;
+            float: right;
+            text-align: right;
+            display: block;
+            padding: 0px 10px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+
+        .dropdown,
+        select,
+        textarea,
+        table,
+        input.form-control {
+            width: calc(100% - 0px);
+        }
+
+        .dropdown-menu {
+            .inner {
+                height: 200px !important;
+            }
+        }
+
+        table {
+            margin: 0px;
+
+            td input {
+                width: calc(100% - 50px) !important;
+                text-align: center;
+                margin-left: 10px;
+            }
+        }
+
+        td,
+        th {
+            padding: 10px;
+        }
+
+        .isHide {
+            display: none;
+        }
+
+        ;
+
+        .fileInfoNot {
+            display: block;
+            padding-top: 5.8px;
+            color: #666666;
+            margin-left: 13px;
+        }
+    }
+}
+.widget-MaintenanceSearchAdmin-pop {
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+}

+ 0 - 90
src/widgets/MaintenanceSearch——————/Widget.html

@@ -1,90 +0,0 @@
-<div class="widget-MaintenanceSearch box">
-    <div class='tool form-inline'>
-        <div class="form-group  form-inline department_btn groupleft">
-            <label class="thspan">一级审核部门</label>
-            <select class="input-sm form-control noborder department minwidth" data-max-options="10" data-live-search="true"  id="department"></select>
-        </div>
-        <div class="form-group  form-inline peopleList_btn groupleft">
-            <label class="thspan">一级审核人员</label>
-            <select class="input-sm form-control noborder peopleList minwidth" data-max-options="10"  data-live-search="true"  id="peopleList"></select>
-        </div>
-        <!-- <div class="form-group  form-inline peopleList_btn groupleft">
-            <label class="thspan">一级审核状态</label>
-            <select class="input-sm form-control   oneAuditStatus minwidth" data-live-search="true" name='oneAuditStatus'
-                data-max-options="1" data-style="btn-primary">
-                <option value='' selected="selected">全部</option>
-                <option value='1'>通过</option>
-                <option value='0'>不通过</option>
-                </select>
-        </div> -->
-        <div class="form-group  form-inline department_btn groupleft">
-            <label class="thspan">二级审核部门</label>
-            <select class="input-sm form-control noborder department2 minwidth" data-max-options="10" data-live-search="true"  id="department2"></select>
-        </div>
-        <div class="form-group  form-inline peopleList_btn groupleft">
-            <label class="thspan">二级审核人员</label>
-            <select class="input-sm form-control noborder peopleList2 minwidth" data-max-options="10"  data-live-search="true"  id="peopleList2"></select>
-        </div>
-        <!-- <div class="form-group  form-inline peopleList_btn groupleft">
-            <label class="thspan">二级审核状态</label>
-            <select class="input-sm form-control   twoAuditStatus minwidth" data-live-search="true" name='twoAuditStatus'
-                data-max-options="1" data-style="btn-primary">
-                <option value='' selected="selected">全部</option>
-                <option value='1'>通过</option>
-                <option value='0'>不通过</option>
-                </select>
-        </div> -->
-        <!-- <div class="form-group">
-            <label class=" control-label">状态</label>
-            <select class="input-sm form-control   workOrderType" data-live-search="true" name='workOrderType'
-                data-max-options="1" data-style="btn-primary">
-                <option value='' selected="selected">全部</option>
-                <option value='1'>派工待处理</option>
-                <option value='2'>抢修待派工</option>
-                <option value='3'>抢修待处理</option>
-                <option value='5'>一级待审核</option>
-                <option value='6'>二级待审核</option>
-                <option value='4'>审核归档</option>
-            </select>
-        </div> -->
-        <!-- <div class="form-group">
-            <label class=" control-label">地址</label>
-            <input type="text" autocomplete="off" class="form-control siteName" name="siteName" placeholder="地址">
-        </div> -->
-        <!-- <div class="form-group">
-            <label class=" control-label">一级抢修分类</label>
-            <select class="input-sm form-control typeMain minwidth">
-            </select>
-        </div>
-        <div class="form-group">
-            <label class=" control-label">二级抢修分类</label>
-            <select class="input-sm form-control type minwidth">
-            </select>
-        </div> -->
-        <!-- <div class="form-group">
-            <label class=" control-label">上报时间</label>
-            <input type="text" readonly="readonly" class="form-control plan_begindate minwidth" id="plan_begindate" placeholder="年-月-日"/>
-            ~
-            <input type="text" readonly="readonly" class="form-control plan_enddate minwidth" id="plan_enddate" placeholder="年-月-日"/>
-        </div> -->
-        <div class="form-group">
-            <button id="btn_add" type="button" class="btn btn-sm btn-default btn-success btn_search">
-                <span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询
-            </button>
-        </div>
-        <div class="form-group groupright">
-            <div class="btn_exportExcel">
-                <img src="./widgets/KeyEquipment/images/export.png" />
-                <span>导出</span>
-            </div>
-        </div>
-    </div>
-    <div class="planpath_content halfpaneltable">
-        <table class="table table-bordered  table-striped MaintenanceSearchinfodata" cellspacing="0"
-            id='MaintenanceSearchinfodata'>
-        </table>
-    </div>
-</div>
-$$
-<div class='widget-MaintenanceSearch-pop'>
-</div>

+ 0 - 45
src/widgets/MaintenanceSearch——————/css/style.scss

@@ -1,45 +0,0 @@
-.widget-MaintenanceSearch {
-    height: 100%;
-    .tool {
-        .form-group {
-            float: left;
-            margin: 4px 0px 4px 4px;
-        }
-        .groupright{
-            display: flex;
-            position: absolute;
-            right: 15px;
-            div{
-                margin-right: 15px;
-                cursor: pointer;
-            }
-        }
-    }
-    .bootstrap-select>.dropdown-toggle:after {
-        transform: rotate(180deg);
-        color: white;
-    }
-    .filter-option-inner-inner{
-        color: white;
-    }
-    .noborder{
-        border: none !important;
-        width: 110px !important;
-    }
-    .plan_begindate,.plan_enddate{
-        width: 110px !important;
-    }
-    .halfpaneltable {
-        overflow-y: hidden;
-        height: calc(100% - 46px) !important;
-        a.infoWrite{
-            color: rgba(0,0,255,0.7) !important;
-        }
-    }
-}
-
-.widget-MaintenanceSearch-pop {
-    width: 100%;
-    height: 100%;
-    overflow: auto;
-}

+ 9 - 0
src/widgets/PlanPoint/Widget.html

@@ -1,6 +1,15 @@
 <div class="widget-planpoint">
     <div class="planpoint_tit">
         <div class="form-inline">
+            <div class="form-group ">
+                <span class="thspan"> 巡检点名称 </span>
+                <input type="text" class="input-sm form-control title pointName minwidth" />
+            </div> 
+            <div class="form-group">
+                <button id="btn_add" type="button" class="searchList">
+                            查询
+                    </button>
+            </div>
             <div class="form-group">
                 <button id="btn_add" type="button" class="btn_addplanpoint">
                             新增

+ 5 - 2
src/widgets/PlanPoint/Widget.ts

@@ -109,7 +109,9 @@ class PlanPoint extends BaseWidget {
                 }
             }
         }.bind(this));
-
+        this.domObj.find('.searchList').on("click",e=>{
+            this.getPlanPoint();
+        })
         //添加巡检点 先绘制点然后弹出信息框
         this.domObj.find('.btn_addplanpoint').on("click", function () {
             if (this.drawToolbar != null) {
@@ -419,7 +421,8 @@ class PlanPoint extends BaseWidget {
                     return {
                         "current": start || that.config.pagenumber,
                         "size": e['length'] || that.config.pagesize,
-                        "deviceTypeId": that.config.device_type_id.point
+                        "deviceTypeId": that.config.device_type_id.point,
+                        "pointNameLike":that.domObj.find('.pointName').val()
                     }
                 },
                 url: that.apiRoot + that.config.getPlanPointList,