Skip to content

蔡永松 / fontweb-dc

Go to a project
Toggle navigation
Toggle navigation pinning
20848d0b by 焦小希
Options

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

2 parents e6c45757 09f51600
Inline Side-by-side
Showing 8 changed files with 17 additions and 11 deletions
...@@ -455,6 +455,12 @@ function getApproveList(pageIndex, condition, starttimecondition, ...@@ -455,6 +455,12 @@ function getApproveList(pageIndex, condition, starttimecondition,
455 // debugger 455 // debugger
456 }, 456 },
457 success: function (res) { 457 success: function (res) {
458 debugger
459 if (res.code===500){
460 $('#msg').css("display", "block");
461 $('#nvaTab').css("visibility", "hidden");
462 return false
463 }
458 var result = res.data; 464 var result = res.data;
459 var totalre = result["total"]; 465 var totalre = result["total"];
460 // layuiPage(totalre); 466 // layuiPage(totalre);
......
...@@ -3,7 +3,7 @@ var self = new Vue({ ...@@ -3,7 +3,7 @@ var self = new Vue({
3 data() { 3 data() {
4 return { 4 return {
5 search: '', 5 search: '',
6 flowid: 't1001_8a8610de737b99270173937337e00133', 6 flowid: ['t1001_8a8610de737b99270173937337e00133'],
7 userName: '案件查处', 7 userName: '案件查处',
8 pageNum:1, 8 pageNum:1,
9 pageSize:10, 9 pageSize:10,
...@@ -43,7 +43,7 @@ var self = new Vue({ ...@@ -43,7 +43,7 @@ var self = new Vue({
43 getData() { 43 getData() {
44 axios.post(CONF_NEWGHSC_SERVERURL + '/dblb/list/workings', null,{ 44 axios.post(CONF_NEWGHSC_SERVERURL + '/dblb/list/workings', null,{
45 params: { 45 params: {
46 flowid: this.flowid, 46 flowids: this.flowid.toString(),
47 userName: this.userName, 47 userName: this.userName,
48 pageIndex:this.pageNum, 48 pageIndex:this.pageNum,
49 pageSize:this.pageSize, 49 pageSize:this.pageSize,
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
111 <el-button v-show="isActive == 3" type ="primary" size="mini">删除</el-button> 111 <el-button v-show="isActive == 3" type ="primary" size="mini">删除</el-button>
112 <el-button v-show="isActive == 5" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610d86125b9a801612600a4c60003','1')">添加</el-button> 112 <el-button v-show="isActive == 5" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610d86125b9a801612600a4c60003','1')">添加</el-button>
113 <el-button v-show="isActive == 5" type ="primary" size="mini">删除</el-button> 113 <el-button v-show="isActive == 5" type ="primary" size="mini">删除</el-button>
114 <el-button v-show="isActive == 2" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610d86125b9a801612600a4c60003','1')">添加</el-button> 114 <el-button v-show="isActive == 2" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_402885c973b703220173b73ed4e6004d','1')">添加</el-button>
115 <el-button v-show="isActive == 2" type ="primary" size="mini">删除</el-button> 115 <el-button v-show="isActive == 2" type ="primary" size="mini">删除</el-button>
116 </div> 116 </div>
117 <div style="float: right" class="div-search" > 117 <div style="float: right" class="div-search" >
......
...@@ -77,7 +77,7 @@ var self = new Vue({ ...@@ -77,7 +77,7 @@ var self = new Vue({
77 }, 77 },
78 methods:{ 78 methods:{
79 getData() { 79 getData() {
80 axios.get(CONF_NEWGHSC_SERVERURL + '/dblb/list/worked', { 80 axios.post(CONF_NEWGHSC_SERVERURL + '/dblb/list/worked', {
81 params: { 81 params: {
82 pageIndex:this.pageNum, 82 pageIndex:this.pageNum,
83 pageSize:this.pageSize, 83 pageSize:this.pageSize,
......
...@@ -42,7 +42,7 @@ var self = new Vue({ ...@@ -42,7 +42,7 @@ var self = new Vue({
42 }, 42 },
43 methods:{ 43 methods:{
44 getData() { 44 getData() {
45 axios.get(CONF_NEWGHSC_SERVERURL + '/dblb/list/worked', { 45 axios.post(CONF_NEWGHSC_SERVERURL + '/dblb/list/worked', null,{
46 params: { 46 params: {
47 pageIndex:this.pageNum, 47 pageIndex:this.pageNum,
48 pageSize:this.pageSize, 48 pageSize:this.pageSize,
......
...@@ -5,7 +5,7 @@ var self = new Vue({ ...@@ -5,7 +5,7 @@ var self = new Vue({
5 search:'', 5 search:'',
6 projectId:null, 6 projectId:null,
7 userId:null, 7 userId:null,
8 flowid: 't1001_8a8610d86117e3b401611848a8690000', 8 flowid: ['t1001_8a8610d86117e3b401611848a8690000'],
9 userName: '案件查处', 9 userName: '案件查处',
10 pageNum:1, 10 pageNum:1,
11 pageSize:2, 11 pageSize:2,
...@@ -64,7 +64,7 @@ var self = new Vue({ ...@@ -64,7 +64,7 @@ var self = new Vue({
64 params: { 64 params: {
65 pageIndex:this.pageNum, 65 pageIndex:this.pageNum,
66 pageSize:this.pageSize, 66 pageSize:this.pageSize,
67 flowId: this.flowid, 67 flowIds: this.flowid.toString(),
68 userName: this.userName, 68 userName: this.userName,
69 } 69 }
70 }).then(res => { 70 }).then(res => {
......
...@@ -5,7 +5,7 @@ var self = new Vue({ ...@@ -5,7 +5,7 @@ var self = new Vue({
5 search:'', 5 search:'',
6 projectId:null, 6 projectId:null,
7 userId:null, 7 userId:null,
8 flowid: 't1001_8a8610d86117e3b401611848a8690000', 8 flowid: ['t1001_8a8610d86117e3b401611848a8690000'],
9 userName: '案件查处', 9 userName: '案件查处',
10 pageNum:1, 10 pageNum:1,
11 pageSize:2, 11 pageSize:2,
...@@ -42,11 +42,11 @@ var self = new Vue({ ...@@ -42,11 +42,11 @@ var self = new Vue({
42 }, 42 },
43 methods:{ 43 methods:{
44 getData() { 44 getData() {
45 axios.get(CONF_NEWGHSC_SERVERURL + '/dblb/list/worked', { 45 axios.post(CONF_NEWGHSC_SERVERURL + '/dblb/list/worked', {
46 params: { 46 params: {
47 pageIndex:this.pageNum, 47 pageIndex:this.pageNum,
48 pageSize:this.pageSize, 48 pageSize:this.pageSize,
49 flowId: this.flowid, 49 flowIds: this.flowid.toString(),
50 userName: this.userName, 50 userName: this.userName,
51 } 51 }
52 }).then(res => { 52 }).then(res => {
......
...@@ -807,7 +807,7 @@ ...@@ -807,7 +807,7 @@
807 807
808 <!-- GIS服务 --> 808 <!-- GIS服务 -->
809 <div id="browsingGrp" class="div-right-content-item" 809 <div id="browsingGrp" class="div-right-content-item"
810 style="display: none;text-overflow: ellipsis;width: 100%;margin-left: 0;padding: 0px;"> 810 style="display: inline-block;text-overflow: ellipsis;width: 100%;margin-left: 0;padding: 0px;">
811 <div style="margin:33px 0 15px 0;"> 811 <div style="margin:33px 0 15px 0;">
812 <img src="../../image/projecttask/dt.png" 812 <img src="../../image/projecttask/dt.png"
813 style="width: 25px;height:25px;margin-top: -5px;margin-right: 5px;"> 813 style="width: 25px;height:25px;margin-top: -5px;margin-right: 5px;">
......