style(审批详情页):先将地图隐藏,按需显示

weimo934
Showing 4 changed files with 67 additions and 177 deletions
src/main/webapp/js/projecttask/dealingproject.js
src/main/webapp/js/projecttask/detailproject.js
src/main/webapp/view/projecttask/dealedproject.jsp
src/main/webapp/view/projecttask/detailproject.jsp
--- a/src/main/webapp/js/projecttask/dealingproject.js
View file @f6a19f9
+++ b/src/main/webapp/js/projecttask/dealingproject.js
View file @f6a19f9
@@ -61,8 +61,7 @@ $(function () {
    // 去掉tabs
    if (orign != 'ghsc') {
        $('#isTabs').remove();
-    }
+    };
-    ;
    if (orign === 'ghsc') {
        $("#continueProject").remove();
        $("#createProject").html('<span class="glyphicon glyphicon-download-alt" style="font-size: 15px"></span><a class="bumpbox_white">新建</a>').show();
--- a/src/main/webapp/js/projecttask/detailproject.js
View file @f6a19f9
+++ b/src/main/webapp/js/projecttask/detailproject.js
View file @f6a19f9
@@ -197,9 +197,9 @@ $(function () {
        } else if (!taskId && stats == "Manage") {
            lookProjectManage();
        } else {
-            if(stats == "dealedproject"){
+            if (stats == "dealedproject") {
                lookThroughProject();
-            }else if (stats == "correctionproject") {
+            } else if (stats == "correctionproject") {
                correctionRecordId = _queryParams.correctionRecordId;
                correctionProject();
                var res = getCorrectionRecord(correctionRecordId);
@@ -270,7 +270,7 @@ function uploadBtnNone() {
    if (temp > -1) {
        roleArr = roleIds.split(",");
    }
-    if(_flowId1!='t1001_4028d83970955d2a01709577b3870018'){
+    if (_flowId1 != 't1001_4028d83970955d2a01709577b3870018') {
        return;
    }
    $.ajax({
@@ -432,9 +432,11 @@ function initBureau(currentUnitId) {
        }
    });
 }
 var flag = true;
 var invFlag;
 var invFlag1;
 function initOneMap() {
    // 初始化地图
    initGis(_projectId);
@@ -460,7 +462,7 @@ function initOneMap() {
    }
    // 点击录入坐标
    $("#AxisMap").attr("disabled", false).click(function () {
-        if(invFlag) {
+        if (invFlag) {
            clearTimeout(invFlag)
        }
        invFlag = setTimeout(() => {
@@ -478,11 +480,11 @@ function initOneMap() {
    });
    // 点击查看大图
    $("#MaxMap").attr("disabled", false).click(function () {
-        if(invFlag1) {
+        if (invFlag1) {
            clearTimeout(invFlag1)
        }
        invFlag1 = setTimeout(() => {
-            if(_projectId == ""){
+            if (_projectId == "") {
                layer.msg("请先保存！", {icon: 2});
            }
            if (_projectId) {
@@ -1199,7 +1201,7 @@ function lookThroughProject() {
                                console.log("查询当前流程的所有环节失败");
                            }
                        });
-                        if (_flowId=='t1001_4028d83970955d2a01709577b3870018') {//判断是不是数据申请流程
+                        if (_flowId == 't1001_4028d83970955d2a01709577b3870018') {//判断是不是数据申请流程
                            rootPath = project.attachpath;
                            loadMaterialsNew(res.data);
                            $("#project_saveSuggest").css("display", "none");
@@ -1376,10 +1378,10 @@ function dealingProject() {
                    console.log("查询当前流程的所有环节失败");
                }
            });
-            if(_flowId=='t1001_4028d83970955d2a01709577b3870018'){
+            if (_flowId == 't1001_4028d83970955d2a01709577b3870018') {
                rootPath = project.attachpath;
                loadMaterialsNew(flowObjectName);
-            }else if (_flowId == 't1001_4028d839710f68d101710f8b74ad0006'){
+            } else if (_flowId == 't1001_4028d839710f68d101710f8b74ad0006') {
                rootPath = project.attachpath;
                loadAttach(project.attachpath, data.projectMaterialDirList);//加载附件
            }
@@ -4897,50 +4899,6 @@ function returned() {
        }
    });
 }
-/*function loadDockinglSystemData(flowid, _dockingid) {
-    $.ajax({
-        type: "POST",
-        url: CONF_DOCKINGSYSTEM_SERVERURL + '/xiangj/resource/get',
-        data: {'sxslbm': _dockingid, 'flowid': flowid},
-        dataType: 'json',
-        success: function (result) {
-            if (result.status == 'ok') {
-                dataList.map = result.data;
-            } else {
-                _dockingid = 'error'
-                console.log(result.message);
-            }
-        },
-        error: function (e) {
-            console.log(e);
-            _dockingid = 'error';
-        }
-    });
-}*/
-/*function getSxbmByProjectid(projectid) {
-    var thisfm = this;
-    $.ajax({
-        type: "POST",
-        url: CONF_DOCKINGSYSTEM_SERVERURL + '/xiangj/resource/getSxbmByProjectid',
-        data: {'projectid': projectid},
-        dataType: 'json',
-        success: function (result) {
-            if (result.status == 'ok') {
-                _dockingid = result.data;
-            } else {
-                _dockingid = 'error';
-            }
-        },
-        error: function (e) {
-            console.log(e);
-            _dockingid = 'error';
-        }
-    });
-}*/
 function validateMaterialRequired() {
    var isRe = {flag: false, message: '效验成功'};
@@ -5047,7 +5005,8 @@ function displayBlock(nodeName, _projerct, _flage) {
        }
    });
    //flag 已办结
-    if (version && version.indexOf('1.0') > -1) {//判断是不是规划审查流程
+    if (version && version.indexOf('1.0') > -1) {
+        //判断是不是规划审查流程
        // FIXME: 申请环节为新增流程 申请数据流程
        if (hjArr.includes(flowObjectId)) {
            if (_flowId == 't1001_4028d83970955d2a01709577b3870018') {//判断是不是成果审查流程
@@ -5077,7 +5036,7 @@ function displayBlock(nodeName, _projerct, _flage) {
                            }
                        }
                    });
-                    if(lcyj.length>0){
+                    if (lcyj.length > 0) {
                        var _width = $("#project_suggest_div").width();
                        $("#project_suggest_div").css({
                            "display": "flex",
@@ -5107,6 +5066,8 @@ function displayBlock(nodeName, _projerct, _flage) {
                $('#project_saveSuggest').off('click').on('click', function () {
                    saveSuggest($('#project_textarea_cs').val());
                });
+            }else {
+                $("#browsingGrp").css('display', 'inline-block');
            }
            if (_flowId == 't1001_4028d839710f68d101710f8b74ad0006') {//判断是不是数据申请流程
@@ -5126,7 +5087,7 @@ function displayBlock(nodeName, _projerct, _flage) {
     */
    else if (version && version.indexOf('2.0') > -1) {//判断是不是业务协同模块
        initOneMap();
-        var arr1=['sid-862DE529-CECB-4360-ABDB-CFA518A0907F','sid-1CC0CEE0-D6C2-461A-807B-2361D0E8BC54','sid-2D676B0B-FBF0-42E3-9A8C-7860614DAF7A'];
+        var arr1 = ['sid-862DE529-CECB-4360-ABDB-CFA518A0907F', 'sid-1CC0CEE0-D6C2-461A-807B-2361D0E8BC54', 'sid-2D676B0B-FBF0-42E3-9A8C-7860614DAF7A'];
        $("#form_div").children('div:first-child').css('margin-top', '0');
        //FIXME:wei
        //如果环节id 等于流程环节启动id
@@ -5141,29 +5102,29 @@ function displayBlock(nodeName, _projerct, _flage) {
                lcyj = res.data;
            }
        });
-        if(detailType != undefined){
+        if (detailType != undefined) {
-            if(detailType == "1"){
+            if (detailType == "1") {
-                if(flowObjectId == startTaskId){
+                if (flowObjectId == startTaskId) {
                    $('#project_cl,#formPanel,#project_div_attachment,#form_div,#browsingGrp,#hint,#pro_btn_group_div').css('display', 'inline-block');
-                }else{
+                } else {
                    $('#ywxt_right,#project_cl,#formPanel,#project_div_attachment,#form_div,#browsingGrp,#hint,#pro_btn_group_div').css('display', 'inline-block');
                }
            }
-            if(detailType == "2"){
+            if (detailType == "2") {
                if (lcyj.length > 0) {
                    $('#ywxt_right,#project_cl,#formPanel,#project_div_attachment,#form_div,#browsingGrp,#hint,#pro_btn_group_div').css('display', 'inline-block');
                } else {
                    $('#project_cl,#formPanel,#project_div_attachment,#form_div,#browsingGrp,#hint,#pro_btn_group_div').css('display', 'inline-block');
                }
            }
-        }else{
+        } else {
            $('#project_cl,#formPanel,#project_div_attachment,#form_div,#browsingGrp,#hint,#pro_btn_group_div').css('display', 'inline-block');
        }
        $("#createFolder,#uploadFile").show();
        isTypeInreference = true;
        //$('#ywxt_right,#project_cl,#formPanel,#project_div_attachment,#form_div,#browsingGrp,#hint,#pro_btn_group_div button').css('display', 'inline-block');
-        if(_flowId=="t1001_4028d8397114eb4501713455a38d3544"){
+        if (_flowId == "t1001_4028d8397114eb4501713455a38d3544") {
-            if(arr1.includes(flowObjectId)){
+            if (arr1.includes(flowObjectId)) {
                $("#pro_ywxt_csyj").remove();
                $("#project_ywxt_textarea_cs").remove();
                $("#project_ywxt_saveSuggest").remove();
@@ -5197,40 +5158,9 @@ function displayBlock(nodeName, _projerct, _flage) {
        }
        suggestFun1(nodeName);
    }
-}
+    else {
+        $("#browsingGrp").css('display', 'inline-block');
-/*
-// load Fs module
-function cgsbjdxx(_id) {
-    layui.use('laytpl', function () {
-        var laytpl = layui.laytpl;
-        if (!_id) {
-            layer.msg("未查询到进度信息！");
-            return false;
-        }
-        //	联调 $(').html()
-        $.ajax({
-            type: "POST",
-            url: CONF_NEWGHSC_SERVERURL + '/bz/getZblcXx?id=' + _id,
-            data: '',
-            dataType: 'json',
-            success: function (res) {
-                console.log(res)
-                if (res.code == 200) {
-                    //直接解析字符
-                    laytpl($("#projectCgsbJdxx").html()).render(res.data, function (_html) {
-                        $("#project_jdxx ul.layui-timeline").html(_html);
-                    });
-                } else {
-                    layer.msg('error');
-                }
-            },
-            error: function (e) {
-                layer.msg('error');
    }
-        });
-    });
 }
 /**
@@ -5367,34 +5297,34 @@ function qualityInspection() {
        layer.msg('请先保存项目！');
        return;
    }
-    if(fileListBack == null){
+    if (fileListBack == null) {
        layer.msg('请先导入成果包！');
        return;
    }
    var data = window.formMgr.getDataJson();
    var formData = JSON.parse(data);
    var xmlx = formData.XM.XMLX;
-    if(xmlx == null || xmlx == "" || xmlx == undefined || xmlx == "请选择"){
+    if (xmlx == null || xmlx == "" || xmlx == undefined || xmlx == "请选择") {
        layer.msg("基本信息-规划类型不能为空");
        return;
    }
    var ghjb = formData.XM.GHJB;
-    if(ghjb == null || ghjb == "" || ghjb == undefined || ghjb == "请选择"){
+    if (ghjb == null || ghjb == "" || ghjb == undefined || ghjb == "请选择") {
        layer.msg("基本信息-规划级别不能为空");
        return;
    }
    var xmmc = formData.XM.XMMC;
-    if(xmmc == null || xmmc == "" || xmmc == undefined){
+    if (xmmc == null || xmmc == "" || xmmc == undefined) {
        layer.msg("基本信息-规划名称不能为空");
        return;
    }
    var ghqx = formData.XM.GHQX;
-    if(ghqx == null || ghqx == "" || ghqx == undefined){
+    if (ghqx == null || ghqx == "" || ghqx == undefined) {
        layer.msg("基本信息-规划期限不能为空");
        return;
    }
    var bsrq = formData.CG_LS.BSRQ;
-    if(bsrq == null || bsrq == "" || bsrq == undefined){
+    if (bsrq == null || bsrq == "" || bsrq == undefined) {
        layer.msg("版本信息-报送日期不能为空");
        return;
    }
@@ -5760,7 +5690,7 @@ function dTreeInit1(_id, _initData, _fn, _optFn) {
        // 绑定节点点击
-    dtree.on(`node('${_id}')`, (obj, e) =>{
+        dtree.on(`node('${_id}')`, (obj, e) => {
            if (typeof _fn === 'function') {
                _fn(obj.param);
            }
@@ -5779,7 +5709,7 @@ function dTreeInit1(_id, _initData, _fn, _optFn) {
                _optFn.call(this, dtree.getParam(`${_id}`, $(this).data('id')), $(this).data('node'));
            })
        }
-}, 500);
+    }, 500);
 }
 /*
@@ -5906,7 +5836,7 @@ function loadMaterialsNew(nodeName, rename) {
                    }
                    parent.imgArrSrc = [];
-                    let _data =fjDataFormat([res.data[0]]);
+                    let _data = fjDataFormat([res.data[0]]);
                    //_data = fjDataFormat([res.data[0]]);
                    dTreeInit('project_fjTree', _data, res => {
                            // 点击附件查看附件预览
@@ -5945,7 +5875,7 @@ function loadMaterialsNew(nodeName, rename) {
                            deletefile2(resOpt.context, resOpt.basicData.isDir, 'origin', window.event || arguments.callee.caller.arguments[0], resOpt.nodeId);
                        }
                    });*/
-                    if(res.data.length>1){
+                    if (res.data.length > 1) {
                        let data1 = fjDataFormat([res.data[1]]);
                        $("#noAttachment1").hide();
                        dTreeInit1('project_bgTree', data1, res => {
@@ -6404,13 +6334,15 @@ function saveSuggest(yjnr) {
                        $.ajax({
                            type: "POST",
                            url: CONF_NEWGHSC_SERVERURL + '/ghsc/createScYjReport',
-                            data: JSON.stringify({flowObjectId:flowObjectId,
+                            data: JSON.stringify({
-                                    userId:userid,
+                                flowObjectId: flowObjectId,
-                                    userName:username,
+                                userId: userid,
-                                    pid:_projectId}),
+                                userName: username,
+                                pid: _projectId
+                            }),
                            dataType: 'json',
                            contentType: "application/json;charset=UTF-8",
-                            async:false,
+                            async: false,
                            success: function (res) {
                                if (res.code == 200) {
                                    layer.msg(res.msg);
@@ -6782,11 +6714,11 @@ function isTypeIn() {
        $.ajax({
            type: "POST",
            url: CONF_GIS_ONEMAP + "projectMap/getProjectMapAndProjectLayerOne",
-            data:JSON.stringify(param),
+            data: JSON.stringify(param),
            contentType: 'application/json',
            async: false,
            success: function (res) {
-                if (res!= null&&res!="") {
+                if (res != null && res != "") {
                    return resolve(true)
                }
                return reject(false)
@@ -6923,14 +6855,14 @@ async function sendClickBefore() {
    });
    if (_flowId == 't1001_4028d83970955d2a01709577b3870018') {
        if (flowObjectId == startTaskId) {
-            if(!quality){
+            if (!quality) {
                layer.msg('您还没有进行一键质检');
                return false;
            }
        }
    }
-    var arr1=['sid-862DE529-CECB-4360-ABDB-CFA518A0907F','sid-1CC0CEE0-D6C2-461A-807B-2361D0E8BC54','sid-2D676B0B-FBF0-42E3-9A8C-7860614DAF7A'];
+    var arr1 = ['sid-862DE529-CECB-4360-ABDB-CFA518A0907F', 'sid-1CC0CEE0-D6C2-461A-807B-2361D0E8BC54', 'sid-2D676B0B-FBF0-42E3-9A8C-7860614DAF7A'];
    var flowId1 = 't1001_4028d839710f68d101710f8b74ad0006'
    var hjArr = [];
    $.ajax({
@@ -6995,7 +6927,9 @@ async function sendClickBefore() {
        }
    }
 }
-var quality=false;
+var quality = false;
 function createReport() {
    var data = window.formMgr.getDataJson();
    var formData = JSON.parse(data);
@@ -7017,27 +6951,27 @@ function createReport() {
        type: "POST",
        url: CONF_NEWGHSC_SERVERURL + '/ghsc/createPdfFileAndFold',
        data: JSON.stringify({
-            userId:userid,
+            userId: userid,
-            userName:username,
+            userName: username,
-            pid:_projectId,
+            pid: _projectId,
-            yjzjData:{
+            yjzjData: {
-                xmlx:xmlx,
+                xmlx: xmlx,
-                ghjb:ghjb,
+                ghjb: ghjb,
-                xmmc:xmmc,
+                xmmc: xmmc,
-                ghqx:ghqx,
+                ghqx: ghqx,
-                bsrq:bsrq,
+                bsrq: bsrq,
-                ghfw:ghfw,
+                ghfw: ghfw,
-                cgbbh:cgbbh
+                cgbbh: cgbbh
            }
        }),
-        async:false,
+        async: false,
        dataType: 'json',
        contentType: "application/json;charset=UTF-8",
        success: function (res) {
            console.log(res)
            if (res.code == 200) {
                layer.msg('生成一键质检报告成功');
-                $("#yjzjTableTpl").css("display","none");
+                $("#yjzjTableTpl").css("display", "none");
                loadMaterialsNew(flowObjectName);
            } else {
                console.log("生成一键质检报告失败");
@@ -7049,5 +6983,5 @@ function createReport() {
            $("#yjzjTableTpl").remove();
        }
    });
-    quality=true;
+    quality = true;
 }
--- a/src/main/webapp/view/projecttask/dealedproject.jsp
View file @f6a19f9
+++ b/src/main/webapp/view/projecttask/dealedproject.jsp
View file @f6a19f9
@@ -229,27 +229,6 @@ nav span {
 				<a class="glyphicon glyphicon-plus bindingAssignee" title="选择类型" onclick="selectProjecType()"></a>
 		</div>
-		<!-- <div class="search" style="position: relative;">
-				<label>业务类别</label> 
-				<select id="documentType"
-					onchange="changeType()">
-					<option>所有</option>
-					<option v-for="option in options" v-bind:value="option.value">{{option.text}}</option>			
-				</select>
-			</div> -->
-		<%--<div id="isTabs" style=" height: 32px;">
-			<div style="display: flex;height: 32px;">
-				<div onclick="lyfunc.tabsChanges(2)" id="cgscTable" class="tabs-changes select-tables">
-					<img src="./img/menu-document-selected.png"/>
-					<span>成果审查</span>
-				</div>
-				<div onclick="lyfunc.tabsChanges(1)" id="sjsqTable" class="tabs-changes">
-					<img src="./img/menu-document-checkbox.png"/>
-					<span>数据申请</span>
-				</div>
-			</div>
-		</div>--%>
 		<div class="clearboth"></div>
 <%--		<div style="border-bottom: 1px solid #cac8c8; margin-top: 5px;"></div>--%>
@@ -260,29 +239,7 @@ nav span {
 			<div id="page2" style="float:right"></div>
 		</div>
-<!-- 		<div id="nvaTab" class="data-list" style="margin-top: 10px;display:none">
-			<div style="width: 100%;" dir="ltr" id="gbox_gridTable"
-				class="ui-jqgrid ui-widget ui-widget-content ui-corner-all">
-				<div style="width: 100%;" id="gview_gridTable"
-					class="ui-jqgrid-view">
-					<div class="ui-state-default ui-jqgrid-hdiv" style="width: 100%;">
-						 <table class="table datatable">
-						</table>
-						<div class="nav-page" id="pageZero">
-							<div>
-								共<span id="total_records"></span>条，共<span id="total_page"></span>页
-							</div>
-							<nav style="cursor:pointer;">
-							<ul class="pagination">
-							</nav>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div> -->
 		<div id="msg" style="display: none;position: absolute;top: 50%;left: 50%;">
 			<div style="color: #b9b4b4;font-size: 20px;position: fixed;top: 50%;left: 50%;transform: translate(-50%,-50%);">没有相关数据</div>
 		</div>		
--- a/src/main/webapp/view/projecttask/detailproject.jsp
View file @f6a19f9
+++ b/src/main/webapp/view/projecttask/detailproject.jsp
View file @f6a19f9
@@ -807,7 +807,7 @@
 				<!-- GIS服务 -->
 				<div id="browsingGrp" class="div-right-content-item"
-					 style="display: inline-block;text-overflow: ellipsis;width: 100%;margin-left: 0;padding: 0px;">
+					 style="display: none;text-overflow: ellipsis;width: 100%;margin-left: 0;padding: 0px;">
 					<div style="margin:33px 0 15px 0;">
 						<img src="../../image/projecttask/dt.png"
 							 style="width: 25px;height:25px;margin-top: -5px;margin-right: 5px;">