Merge branch '3ddc' of http://yun.pashanhoo.com:9090/xian-java/fontweb-dc into 3ddc

@@ -1063,7 +1063,6 @@ function ListFormMgr(projectId, taskId, formPanel, options,isChangFromId) {
 		});*/
 	};
 	function create(thisfm,jsonNumberParam,jsonProjectData){
-		debugger;
 		$.ajax({
 			type: "POST",
 			url: curserver + global.modelctls.project.number.create,
@@ -1097,7 +1096,6 @@ function ListFormMgr(projectId, taskId, formPanel, options,isChangFromId) {
 					thisfm.updateDataToUI(true);
 					if (callback) callback(result);
 				} else {
-					debugger
 					if (callback) {
 						callback(result)
 					};

 //获取地址栏中的某个查询参数
 function getQueryString(name) {
-	debugger;
     var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
     var r = window.location.search.substr(1).match(reg);
     if (r != null) {
@@ -11,7 +10,6 @@ function getQueryString(name) {
 
 //解析url中的guid在localStorage中的值  返回参数的js对象形式
 function getUrlQueryString(){
-	debugger;
 	var jy = getQueryString('jy');	
 	if(jy!=null&&jy!=""&&jy!=undefined){
 		if(jy=="jiyao"){

@@ -767,7 +767,6 @@ function createItem(name,divId,index) {
 		}else {
 			nav.selectFlag = false;
 			navArray.push(nav);
-			debugger;
 			item = "<div class = 'hideLeftName'><div id='"+id+"' class='submenuitem waves-effect submenuitem-selected' onclick='iframeLoad(\""+CONF_FRONT_SERVERURL+"/"+nav.url+"\",\""+nav.text+"\",\""+indexStr+"\")'><img title='"+nav.text+"' src=\""+nav.iconCls+"\" /><span>"+nav.text+"</span><label style=\"color:black;display:none\"><ul><li>"+nav.text+"</li></ul></label></div></div>";
 		}
 	}else {

@@ -83,7 +83,6 @@ function jumpdetailPage(data) {
 }
 
 // function jumpdetailPage(data) {
-// 	debugger
 // 	var taskid = data.taskId; 
 // 	var projectid = data.projectId;
 // 	var flowInstanceId =data.instanceId;

@@ -49,7 +49,7 @@ $(function () {
 	//TODO 先注释lhy
 	setListHeight();
 
-	getUnhandledProjectCount();
+//	getUnhandledProjectCount();
 
 });
 
@@ -1953,7 +1953,7 @@ function WaitingToStart() {
 }
 
 
-function getUnhandledProjectCount() {
+/*function getUnhandledProjectCount() {
  	$.ajax({
 		url: CONF_DOCKINGSYSTEM_SERVERURL + '/xiangj/resource/getUnhandledItemCount',
 		data: {roleid: roleIds},
@@ -1968,7 +1968,7 @@ function getUnhandledProjectCount() {
 
 		}
 	})
-}
+}*/
 
 function uuid() {
 	function S4() {

@@ -100,7 +100,7 @@ $(function () {
     //TODO 先注释lhy
     setListHeight();
 
-    getUnhandledProjectCount();
+    //getUnhandledProjectCount();
 
 });
 
@@ -452,10 +452,9 @@ function getApproveList(pageIndex, condition, starttimecondition,
             // parent.window.$.hideLoading();
         },
         error(e) {
-            // debugger
+
         },
         success: function (res) {
-            debugger
             if (res.code===500){
                 $('#msg').css("display", "block");
                 $('#nvaTab').css("visibility", "hidden");
@@ -1542,7 +1541,17 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
                 // 	createdFlag = false;
                 // };
                 var _url = '/xm/getLcList';
-                var user = JSON.parse(parent.userCookies).user;
+               // var user = JSON.parse(parent.userCookies).user;
+                var user={
+                    id: "t0101_8a8610de737b99270173941e5c50017e",
+                    loginname: "案件查处",
+                    realname: "案件查处",
+                    nameinitial: "A",
+                    sex: 1,
+                    state: 1,
+                    token: 0,
+                    registertime: 1595917884480
+                }
                 var _obj = {
                     userId: user.id,
                     userName: user.realname,
@@ -1581,7 +1590,17 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
                     var htmlTableBodyTr = "";//归类项目内容
 
                     var _url = '/xm/getLcList';
-                    var user = JSON.parse(parent.userCookies).user;
+                  //  var user = JSON.parse(parent.userCookies).user;
+                    var user={
+                        id: "t0101_8a8610de737b99270173941e5c50017e",
+                        loginname: "案件查处",
+                        realname: "案件查处",
+                        nameinitial: "A",
+                        sex: 1,
+                        state: 1,
+                        token: 0,
+                        registertime: 1595917884480
+                    }
                     var _obj = {
                         userId: user.id,
                         userName: user.realname,
@@ -2494,7 +2513,7 @@ function WaitingToStart() {
 }
 
 
-function getUnhandledProjectCount() {
+/*function getUnhandledProjectCount() {
     $.ajax({
         url: CONF_DOCKINGSYSTEM_SERVERURL + '/xiangj/resource/getUnhandledItemCount',
         data: {roleid: roleIds},
@@ -2509,7 +2528,7 @@ function getUnhandledProjectCount() {
 
         }
     })
-}
+}*/
 
 function uuid() {
     function S4() {

@@ -951,7 +951,6 @@ function creatingProject() {
             task = data.task;
             flowObjectId = task.flowObjectId;
             flowInstanceId = task ? data.task.instanceId : null;
-            debugger
             materialList = data.materialDirList ? data.materialDirList : [];
             formMgr = new ListFormMgr(null, null, formPanel, {
                 flowId: _flowId,
@@ -1044,9 +1043,9 @@ function creatingProject() {
             if (_dockingid) {
                 loadDockinglSystemData(_flowid, _dockingid);
             }
-            if (create == '1' && _projectId != null) {
+            /*if (create == '1' && _projectId != null) {
                 getSxbmByProjectid(_projectId);
-            }
+            }*/
         }
     });
 
@@ -1864,7 +1863,6 @@ function loadAttach(attachpath, projectMaterialDirList) {
 }
 
 function checkMaterial() {
-    debugger
     var flag = false;
     if (materialList != null && materialList.length != 0) {
         flag = true;
@@ -4942,7 +4940,7 @@ function returned() {
 }
 
 
-function loadDockinglSystemData(flowid, _dockingid) {
+/*function loadDockinglSystemData(flowid, _dockingid) {
     $.ajax({
         type: "POST",
         url: CONF_DOCKINGSYSTEM_SERVERURL + '/xiangj/resource/get',
@@ -4961,9 +4959,9 @@ function loadDockinglSystemData(flowid, _dockingid) {
             _dockingid = 'error';
         }
     });
-}
+}*/
 
-function getSxbmByProjectid(projectid) {
+/*function getSxbmByProjectid(projectid) {
     var thisfm = this;
     $.ajax({
         type: "POST",
@@ -4982,7 +4980,7 @@ function getSxbmByProjectid(projectid) {
             _dockingid = 'error';
         }
     });
-}
+}*/
 
 function validateMaterialRequired() {
     var isRe = {flag: false, message: '效验成功'};

@@ -339,6 +339,5 @@ ajaxPromise({
     url: ITEMSALLURL,
     data: {name: KVTREEKEY}
 }).then((result) => {
-    debugger
     defaultUsedClass = result;
 });

@@ -2510,7 +2510,6 @@ function flowNameSearch(text) {
 }
 
 function rightFlowData(leftData) {
-	debugger;
 	var types = window.parent.$ ? window.parent.$('#projectTypes').val() : undefined;
 
 	$.ajax({

@@ -121,7 +121,6 @@ var self = new Vue({
             }
         },
         openHandleJumpUrl (flowId, itemTypeId, _stats = 'create') {
-            // debugger
             var unique = this.uuid();
             let url = CONF_FRONT_SERVERURL + 'view/projecttask/detailproject.jsp?';
             url += 'stats=' + _stats;

@@ -187,7 +187,6 @@ var self = new Vue({
             this.jumpdetailPage(data);
         },
         openHandleJumpUrl(flowId, itemTypeId, _stats = 'create') {
-            // debugger
             var unique = this.uuid();
             let url = CONF_FRONT_SERVERURL + 'view/projecttask/detailproject.jsp?';
             url += 'stats=' + _stats;

@@ -39,14 +39,12 @@ var vm = new Vue({
             window.location.href='modelSystemView.html?bsm='+bsm+'';
         },
         getZBTXData (keyWord) {
-            debugger
             // 获取指标体系列表
             this.loading = true;
             axios.get(CONF_NEWGHSC_SERVERURL + "/zbtxgl/getZbtxList", {
                 params: { 'keyWord': keyWord }
             })
             .then(res => {
-                debugger
                 this.tableData = res.data.data;
                 this.loading = false
             })
@@ -116,7 +114,6 @@ var vm = new Vue({
                             "txmc": form.txmc,
                             "xtfl": form.xtfl
                         }).then(res => {
-                            debugger
                             if (res.status === 200) {
                                 this.$message({
                                     message: '编辑成功',

@@ -856,7 +856,7 @@ require([
                         let czData =[Math.random()*50,Math.random()*50,Math.random()*50,Math.random()*50,Math.random()*50,Math.random()*50];
                         let ProvinceChartData = res.data.data;
                     /*    for (let i = 0; i < ProvinceChartData.length; i++) {
-                            debugger
+
                             qymcData.push(ProvinceChartData[i].qymc);
                             jczData.push(ProvinceChartData[i].jcz);
                             ghmbData.push(ProvinceChartData[i].ghmb);

@@ -406,7 +406,7 @@
 </div>
 <!--nav start  -->
 <div id="nav">
-	<div class="headbg  row m-b-0" style="box-sizing: border-box;padding-left: 15px;">
+	<div class="headbg  row m-b-0" style="box-sizing: border-box;padding-left: 15px;display: none">
 		<div class="headbg-logo col-xs-12">
 			<div id="HEADERLOGO"></div>
 			<!-- <img class="div-head-title mCS_img_loaded documentFormDetail" src="../../image/index/title05_nngh.png" style="margin-top: 0px;"> -->

@@ -185,9 +185,7 @@
                 ]}
         ]; // 使用data加载/ 使用url加载（可与data加载同时存在）,
         dTreeInit('demoTree', _data, res => {
-            debugger
         }, (optres, nodename) => {
-            debugger
             if (nodename === 'view') {
                 $('#ghcg_iframe').attr('src','/frontweb/view/reviewmanage/resultreview/widgets/Review/Review/images/icon_menu.png')
             } else if (nodename === 'delete') {

@@ -55,7 +55,6 @@ layui.use(['layer', 'form', 'laytpl'], function(){
     btnButton(res => {
         switch (res) {
             case 0:
-                debugger;
                 break;
             case 1:
                 //        发送