Skip to content

蔡永松 / fontweb-dc

Go to a project
Toggle navigation
Toggle navigation pinning
511b091a by 焦小希
Options

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

2 parents 9b8979ac 175b3dbc
Inline Side-by-side
Showing 16 changed files with 37 additions and 36 deletions
...@@ -1063,7 +1063,6 @@ function ListFormMgr(projectId, taskId, formPanel, options,isChangFromId) { ...@@ -1063,7 +1063,6 @@ function ListFormMgr(projectId, taskId, formPanel, options,isChangFromId) {
1063 });*/ 1063 });*/
1064 }; 1064 };
1065 function create(thisfm,jsonNumberParam,jsonProjectData){ 1065 function create(thisfm,jsonNumberParam,jsonProjectData){
1066 debugger;
1067 $.ajax({ 1066 $.ajax({
1068 type: "POST", 1067 type: "POST",
1069 url: curserver + global.modelctls.project.number.create, 1068 url: curserver + global.modelctls.project.number.create,
...@@ -1097,7 +1096,6 @@ function ListFormMgr(projectId, taskId, formPanel, options,isChangFromId) { ...@@ -1097,7 +1096,6 @@ function ListFormMgr(projectId, taskId, formPanel, options,isChangFromId) {
1097 thisfm.updateDataToUI(true); 1096 thisfm.updateDataToUI(true);
1098 if (callback) callback(result); 1097 if (callback) callback(result);
1099 } else { 1098 } else {
1100 debugger
1101 if (callback) { 1099 if (callback) {
1102 callback(result) 1100 callback(result)
1103 }; 1101 };
......
1 //获取地址栏中的某个查询参数 1 //获取地址栏中的某个查询参数
2 function getQueryString(name) { 2 function getQueryString(name) {
3 debugger;
4 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i"); 3 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
5 var r = window.location.search.substr(1).match(reg); 4 var r = window.location.search.substr(1).match(reg);
6 if (r != null) { 5 if (r != null) {
...@@ -11,7 +10,6 @@ function getQueryString(name) { ...@@ -11,7 +10,6 @@ function getQueryString(name) {
11 10
12 //解析url中的guid在localStorage中的值 返回参数的js对象形式 11 //解析url中的guid在localStorage中的值 返回参数的js对象形式
13 function getUrlQueryString(){ 12 function getUrlQueryString(){
14 debugger;
15 var jy = getQueryString('jy'); 13 var jy = getQueryString('jy');
16 if(jy!=null&&jy!=""&&jy!=undefined){ 14 if(jy!=null&&jy!=""&&jy!=undefined){
17 if(jy=="jiyao"){ 15 if(jy=="jiyao"){
......
...@@ -767,7 +767,6 @@ function createItem(name,divId,index) { ...@@ -767,7 +767,6 @@ function createItem(name,divId,index) {
767 }else { 767 }else {
768 nav.selectFlag = false; 768 nav.selectFlag = false;
769 navArray.push(nav); 769 navArray.push(nav);
770 debugger;
771 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>"; 770 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>";
772 } 771 }
773 }else { 772 }else {
......
...@@ -83,7 +83,6 @@ function jumpdetailPage(data) { ...@@ -83,7 +83,6 @@ function jumpdetailPage(data) {
83 } 83 }
84 84
85 // function jumpdetailPage(data) { 85 // function jumpdetailPage(data) {
86 // debugger
87 // var taskid = data.taskId; 86 // var taskid = data.taskId;
88 // var projectid = data.projectId; 87 // var projectid = data.projectId;
89 // var flowInstanceId =data.instanceId; 88 // var flowInstanceId =data.instanceId;
......
...@@ -49,7 +49,7 @@ $(function () { ...@@ -49,7 +49,7 @@ $(function () {
49 //TODO 先注释lhy 49 //TODO 先注释lhy
50 setListHeight(); 50 setListHeight();
51 51
52 getUnhandledProjectCount(); 52 // getUnhandledProjectCount();
53 53
54 }); 54 });
55 55
...@@ -1953,7 +1953,7 @@ function WaitingToStart() { ...@@ -1953,7 +1953,7 @@ function WaitingToStart() {
1953 } 1953 }
1954 1954
1955 1955
1956 function getUnhandledProjectCount() { 1956 /*function getUnhandledProjectCount() {
1957 $.ajax({ 1957 $.ajax({
1958 url: CONF_DOCKINGSYSTEM_SERVERURL + '/xiangj/resource/getUnhandledItemCount', 1958 url: CONF_DOCKINGSYSTEM_SERVERURL + '/xiangj/resource/getUnhandledItemCount',
1959 data: {roleid: roleIds}, 1959 data: {roleid: roleIds},
...@@ -1968,7 +1968,7 @@ function getUnhandledProjectCount() { ...@@ -1968,7 +1968,7 @@ function getUnhandledProjectCount() {
1968 1968
1969 } 1969 }
1970 }) 1970 })
1971 } 1971 }*/
1972 1972
1973 function uuid() { 1973 function uuid() {
1974 function S4() { 1974 function S4() {
......
...@@ -100,7 +100,7 @@ $(function () { ...@@ -100,7 +100,7 @@ $(function () {
100 //TODO 先注释lhy 100 //TODO 先注释lhy
101 setListHeight(); 101 setListHeight();
102 102
103 getUnhandledProjectCount(); 103 //getUnhandledProjectCount();
104 104
105 }); 105 });
106 106
...@@ -452,10 +452,9 @@ function getApproveList(pageIndex, condition, starttimecondition, ...@@ -452,10 +452,9 @@ function getApproveList(pageIndex, condition, starttimecondition,
452 // parent.window.$.hideLoading(); 452 // parent.window.$.hideLoading();
453 }, 453 },
454 error(e) { 454 error(e) {
455 // debugger 455
456 }, 456 },
457 success: function (res) { 457 success: function (res) {
458 debugger
459 if (res.code===500){ 458 if (res.code===500){
460 $('#msg').css("display", "block"); 459 $('#msg').css("display", "block");
461 $('#nvaTab').css("visibility", "hidden"); 460 $('#nvaTab').css("visibility", "hidden");
...@@ -1542,7 +1541,17 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -1542,7 +1541,17 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
1542 // createdFlag = false; 1541 // createdFlag = false;
1543 // }; 1542 // };
1544 var _url = '/xm/getLcList'; 1543 var _url = '/xm/getLcList';
1545 var user = JSON.parse(parent.userCookies).user; 1544 // var user = JSON.parse(parent.userCookies).user;
1545 var user={
1546 id: "t0101_8a8610de737b99270173941e5c50017e",
1547 loginname: "案件查处",
1548 realname: "案件查处",
1549 nameinitial: "A",
1550 sex: 1,
1551 state: 1,
1552 token: 0,
1553 registertime: 1595917884480
1554 }
1546 var _obj = { 1555 var _obj = {
1547 userId: user.id, 1556 userId: user.id,
1548 userName: user.realname, 1557 userName: user.realname,
...@@ -1581,7 +1590,17 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -1581,7 +1590,17 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
1581 var htmlTableBodyTr = "";//归类项目内容 1590 var htmlTableBodyTr = "";//归类项目内容
1582 1591
1583 var _url = '/xm/getLcList'; 1592 var _url = '/xm/getLcList';
1584 var user = JSON.parse(parent.userCookies).user; 1593 // var user = JSON.parse(parent.userCookies).user;
1594 var user={
1595 id: "t0101_8a8610de737b99270173941e5c50017e",
1596 loginname: "案件查处",
1597 realname: "案件查处",
1598 nameinitial: "A",
1599 sex: 1,
1600 state: 1,
1601 token: 0,
1602 registertime: 1595917884480
1603 }
1585 var _obj = { 1604 var _obj = {
1586 userId: user.id, 1605 userId: user.id,
1587 userName: user.realname, 1606 userName: user.realname,
...@@ -2494,7 +2513,7 @@ function WaitingToStart() { ...@@ -2494,7 +2513,7 @@ function WaitingToStart() {
2494 } 2513 }
2495 2514
2496 2515
2497 function getUnhandledProjectCount() { 2516 /*function getUnhandledProjectCount() {
2498 $.ajax({ 2517 $.ajax({
2499 url: CONF_DOCKINGSYSTEM_SERVERURL + '/xiangj/resource/getUnhandledItemCount', 2518 url: CONF_DOCKINGSYSTEM_SERVERURL + '/xiangj/resource/getUnhandledItemCount',
2500 data: {roleid: roleIds}, 2519 data: {roleid: roleIds},
...@@ -2509,7 +2528,7 @@ function getUnhandledProjectCount() { ...@@ -2509,7 +2528,7 @@ function getUnhandledProjectCount() {
2509 2528
2510 } 2529 }
2511 }) 2530 })
2512 } 2531 }*/
2513 2532
2514 function uuid() { 2533 function uuid() {
2515 function S4() { 2534 function S4() {
......
...@@ -951,7 +951,6 @@ function creatingProject() { ...@@ -951,7 +951,6 @@ function creatingProject() {
951 task = data.task; 951 task = data.task;
952 flowObjectId = task.flowObjectId; 952 flowObjectId = task.flowObjectId;
953 flowInstanceId = task ? data.task.instanceId : null; 953 flowInstanceId = task ? data.task.instanceId : null;
954 debugger
955 materialList = data.materialDirList ? data.materialDirList : []; 954 materialList = data.materialDirList ? data.materialDirList : [];
956 formMgr = new ListFormMgr(null, null, formPanel, { 955 formMgr = new ListFormMgr(null, null, formPanel, {
957 flowId: _flowId, 956 flowId: _flowId,
...@@ -1044,9 +1043,9 @@ function creatingProject() { ...@@ -1044,9 +1043,9 @@ function creatingProject() {
1044 if (_dockingid) { 1043 if (_dockingid) {
1045 loadDockinglSystemData(_flowid, _dockingid); 1044 loadDockinglSystemData(_flowid, _dockingid);
1046 } 1045 }
1047 if (create == '1' && _projectId != null) { 1046 /*if (create == '1' && _projectId != null) {
1048 getSxbmByProjectid(_projectId); 1047 getSxbmByProjectid(_projectId);
1049 } 1048 }*/
1050 } 1049 }
1051 }); 1050 });
1052 1051
...@@ -1864,7 +1863,6 @@ function loadAttach(attachpath, projectMaterialDirList) { ...@@ -1864,7 +1863,6 @@ function loadAttach(attachpath, projectMaterialDirList) {
1864 } 1863 }
1865 1864
1866 function checkMaterial() { 1865 function checkMaterial() {
1867 debugger
1868 var flag = false; 1866 var flag = false;
1869 if (materialList != null && materialList.length != 0) { 1867 if (materialList != null && materialList.length != 0) {
1870 flag = true; 1868 flag = true;
...@@ -4942,7 +4940,7 @@ function returned() { ...@@ -4942,7 +4940,7 @@ function returned() {
4942 } 4940 }
4943 4941
4944 4942
4945 function loadDockinglSystemData(flowid, _dockingid) { 4943 /*function loadDockinglSystemData(flowid, _dockingid) {
4946 $.ajax({ 4944 $.ajax({
4947 type: "POST", 4945 type: "POST",
4948 url: CONF_DOCKINGSYSTEM_SERVERURL + '/xiangj/resource/get', 4946 url: CONF_DOCKINGSYSTEM_SERVERURL + '/xiangj/resource/get',
...@@ -4961,9 +4959,9 @@ function loadDockinglSystemData(flowid, _dockingid) { ...@@ -4961,9 +4959,9 @@ function loadDockinglSystemData(flowid, _dockingid) {
4961 _dockingid = 'error'; 4959 _dockingid = 'error';
4962 } 4960 }
4963 }); 4961 });
4964 } 4962 }*/
4965 4963
4966 function getSxbmByProjectid(projectid) { 4964 /*function getSxbmByProjectid(projectid) {
4967 var thisfm = this; 4965 var thisfm = this;
4968 $.ajax({ 4966 $.ajax({
4969 type: "POST", 4967 type: "POST",
...@@ -4982,7 +4980,7 @@ function getSxbmByProjectid(projectid) { ...@@ -4982,7 +4980,7 @@ function getSxbmByProjectid(projectid) {
4982 _dockingid = 'error'; 4980 _dockingid = 'error';
4983 } 4981 }
4984 }); 4982 });
4985 } 4983 }*/
4986 4984
4987 function validateMaterialRequired() { 4985 function validateMaterialRequired() {
4988 var isRe = {flag: false, message: '效验成功'}; 4986 var isRe = {flag: false, message: '效验成功'};
......
...@@ -339,6 +339,5 @@ ajaxPromise({ ...@@ -339,6 +339,5 @@ ajaxPromise({
339 url: ITEMSALLURL, 339 url: ITEMSALLURL,
340 data: {name: KVTREEKEY} 340 data: {name: KVTREEKEY}
341 }).then((result) => { 341 }).then((result) => {
342 debugger
343 defaultUsedClass = result; 342 defaultUsedClass = result;
344 }); 343 });
......
...@@ -2510,7 +2510,6 @@ function flowNameSearch(text) { ...@@ -2510,7 +2510,6 @@ function flowNameSearch(text) {
2510 } 2510 }
2511 2511
2512 function rightFlowData(leftData) { 2512 function rightFlowData(leftData) {
2513 debugger;
2514 var types = window.parent.$ ? window.parent.$('#projectTypes').val() : undefined; 2513 var types = window.parent.$ ? window.parent.$('#projectTypes').val() : undefined;
2515 2514
2516 $.ajax({ 2515 $.ajax({
......
...@@ -121,7 +121,6 @@ var self = new Vue({ ...@@ -121,7 +121,6 @@ var self = new Vue({
121 } 121 }
122 }, 122 },
123 openHandleJumpUrl (flowId, itemTypeId, _stats = 'create') { 123 openHandleJumpUrl (flowId, itemTypeId, _stats = 'create') {
124 // debugger
125 var unique = this.uuid(); 124 var unique = this.uuid();
126 let url = CONF_FRONT_SERVERURL + 'view/projecttask/detailproject.jsp?'; 125 let url = CONF_FRONT_SERVERURL + 'view/projecttask/detailproject.jsp?';
127 url += 'stats=' + _stats; 126 url += 'stats=' + _stats;
......
...@@ -187,7 +187,6 @@ var self = new Vue({ ...@@ -187,7 +187,6 @@ var self = new Vue({
187 this.jumpdetailPage(data); 187 this.jumpdetailPage(data);
188 }, 188 },
189 openHandleJumpUrl(flowId, itemTypeId, _stats = 'create') { 189 openHandleJumpUrl(flowId, itemTypeId, _stats = 'create') {
190 // debugger
191 var unique = this.uuid(); 190 var unique = this.uuid();
192 let url = CONF_FRONT_SERVERURL + 'view/projecttask/detailproject.jsp?'; 191 let url = CONF_FRONT_SERVERURL + 'view/projecttask/detailproject.jsp?';
193 url += 'stats=' + _stats; 192 url += 'stats=' + _stats;
......
...@@ -39,14 +39,12 @@ var vm = new Vue({ ...@@ -39,14 +39,12 @@ var vm = new Vue({
39 window.location.href='modelSystemView.html?bsm='+bsm+''; 39 window.location.href='modelSystemView.html?bsm='+bsm+'';
40 }, 40 },
41 getZBTXData (keyWord) { 41 getZBTXData (keyWord) {
42 debugger
43 // 获取指标体系列表 42 // 获取指标体系列表
44 this.loading = true; 43 this.loading = true;
45 axios.get(CONF_NEWGHSC_SERVERURL + "/zbtxgl/getZbtxList", { 44 axios.get(CONF_NEWGHSC_SERVERURL + "/zbtxgl/getZbtxList", {
46 params: { 'keyWord': keyWord } 45 params: { 'keyWord': keyWord }
47 }) 46 })
48 .then(res => { 47 .then(res => {
49 debugger
50 this.tableData = res.data.data; 48 this.tableData = res.data.data;
51 this.loading = false 49 this.loading = false
52 }) 50 })
...@@ -116,7 +114,6 @@ var vm = new Vue({ ...@@ -116,7 +114,6 @@ var vm = new Vue({
116 "txmc": form.txmc, 114 "txmc": form.txmc,
117 "xtfl": form.xtfl 115 "xtfl": form.xtfl
118 }).then(res => { 116 }).then(res => {
119 debugger
120 if (res.status === 200) { 117 if (res.status === 200) {
121 this.$message({ 118 this.$message({
122 message: '编辑成功', 119 message: '编辑成功',
......
...@@ -856,7 +856,7 @@ require([ ...@@ -856,7 +856,7 @@ require([
856 let czData =[Math.random()*50,Math.random()*50,Math.random()*50,Math.random()*50,Math.random()*50,Math.random()*50]; 856 let czData =[Math.random()*50,Math.random()*50,Math.random()*50,Math.random()*50,Math.random()*50,Math.random()*50];
857 let ProvinceChartData = res.data.data; 857 let ProvinceChartData = res.data.data;
858 /* for (let i = 0; i < ProvinceChartData.length; i++) { 858 /* for (let i = 0; i < ProvinceChartData.length; i++) {
859 debugger 859
860 qymcData.push(ProvinceChartData[i].qymc); 860 qymcData.push(ProvinceChartData[i].qymc);
861 jczData.push(ProvinceChartData[i].jcz); 861 jczData.push(ProvinceChartData[i].jcz);
862 ghmbData.push(ProvinceChartData[i].ghmb); 862 ghmbData.push(ProvinceChartData[i].ghmb);
......
...@@ -406,7 +406,7 @@ ...@@ -406,7 +406,7 @@
406 </div> 406 </div>
407 <!--nav start --> 407 <!--nav start -->
408 <div id="nav"> 408 <div id="nav">
409 <div class="headbg row m-b-0" style="box-sizing: border-box;padding-left: 15px;"> 409 <div class="headbg row m-b-0" style="box-sizing: border-box;padding-left: 15px;display: none">
410 <div class="headbg-logo col-xs-12"> 410 <div class="headbg-logo col-xs-12">
411 <div id="HEADERLOGO"></div> 411 <div id="HEADERLOGO"></div>
412 <!-- <img class="div-head-title mCS_img_loaded documentFormDetail" src="../../image/index/title05_nngh.png" style="margin-top: 0px;"> --> 412 <!-- <img class="div-head-title mCS_img_loaded documentFormDetail" src="../../image/index/title05_nngh.png" style="margin-top: 0px;"> -->
......
...@@ -185,9 +185,7 @@ ...@@ -185,9 +185,7 @@
185 ]} 185 ]}
186 ]; // 使用data加载/ 使用url加载（可与data加载同时存在）, 186 ]; // 使用data加载/ 使用url加载（可与data加载同时存在）,
187 dTreeInit('demoTree', _data, res => { 187 dTreeInit('demoTree', _data, res => {
188 debugger
189 }, (optres, nodename) => { 188 }, (optres, nodename) => {
190 debugger
191 if (nodename === 'view') { 189 if (nodename === 'view') {
192 $('#ghcg_iframe').attr('src','/frontweb/view/reviewmanage/resultreview/widgets/Review/Review/images/icon_menu.png') 190 $('#ghcg_iframe').attr('src','/frontweb/view/reviewmanage/resultreview/widgets/Review/Review/images/icon_menu.png')
193 } else if (nodename === 'delete') { 191 } else if (nodename === 'delete') {
......
...@@ -55,7 +55,6 @@ layui.use(['layer', 'form', 'laytpl'], function(){ ...@@ -55,7 +55,6 @@ layui.use(['layer', 'form', 'laytpl'], function(){
55 btnButton(res => { 55 btnButton(res => {
56 switch (res) { 56 switch (res) {
57 case 0: 57 case 0:
58 debugger;
59 break; 58 break;
60 case 1: 59 case 1:
61 // 发送 60 // 发送
......