bfa5054c by weimo934

提交代码

1 parent 20848d0b
...@@ -2,52 +2,11 @@ ...@@ -2,52 +2,11 @@
2 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 2 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3 <modelVersion>4.0.0</modelVersion> 3 <modelVersion>4.0.0</modelVersion>
4 <groupId>NNOAWEB</groupId> 4 <groupId>NNOAWEB</groupId>
5 <artifactId>frontweb-xayzt</artifactId> 5 <artifactId>frontweb-dc</artifactId>
6 <packaging>war</packaging> 6 <packaging>war</packaging>
7 <version>0.0.1-SNAPSHOT</version> 7 <version>0.0.1-SNAPSHOT</version>
8 <name>frontweb-xayzt Maven Webapp</name> 8 <name>frontweb-xayzt Maven Webapp</name>
9 <url>http://maven.apache.org</url> 9 <url>http://maven.apache.org</url>
10 <dependencies>
11 <!-- <dependency>
12 <groupId>junit</groupId>
13 <artifactId>junit</artifactId>
14 <version>3.8.1</version>
15 <scope>test</scope>
16 </dependency>
17 <dependency>
18 <groupId>org.apache.commons</groupId>
19 <artifactId>commons-lang3</artifactId>
20 <version>3.3.2</version>
21 </dependency>
22 &lt;!&ndash; <dependency>
23 <groupId>org.jasig.cas.client</groupId>
24 <artifactId>cas-client-core</artifactId>
25 <version>3.2.0</version>
26 </dependency> &ndash;&gt;
27 <dependency>
28 <groupId>org.springframework</groupId>
29 <artifactId>spring-context</artifactId>
30 <version>4.1.0.Release</version>
31 </dependency>
32
33 &lt;!&ndash; https://mvnrepository.com/artifact/com.thetransactioncompany/cors-filter &ndash;&gt;
34 <dependency>
35 <groupId>com.thetransactioncompany</groupId>
36 <artifactId>cors-filter</artifactId>
37 <version>2.5</version>
38 </dependency>
39 &lt;!&ndash; https://mvnrepository.com/artifact/com.thetransactioncompany/java-property-utils &ndash;&gt;
40 <dependency>
41 <groupId>com.thetransactioncompany</groupId>
42 <artifactId>java-property-utils</artifactId>
43 <version>1.9</version>
44 </dependency>
45 <dependency>
46 <groupId>cmp</groupId>
47 <artifactId>cmp-project</artifactId>
48 <version>0.0.1-SNAPSHOT</version>
49 </dependency>-->
50 </dependencies>
51 <build> 10 <build>
52 <finalName>frontweb</finalName> 11 <finalName>frontweb</finalName>
53 <plugins> 12 <plugins>
......
...@@ -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','t1001_8a8610d86125b9a801612600a4c60003','t1001_402885c973b703220173b73ed4e6004d'],
7 userName: '案件查处', 7 userName: '案件查处',
8 pageNum:1, 8 pageNum:1,
9 pageSize:10, 9 pageSize:10,
...@@ -29,7 +29,7 @@ var self = new Vue({ ...@@ -29,7 +29,7 @@ var self = new Vue({
29 const mm = (dt.getMinutes() + '').padStart(2, '0') 29 const mm = (dt.getMinutes() + '').padStart(2, '0')
30 const ss = (dt.getSeconds() + '').padStart(2, '0') 30 const ss = (dt.getSeconds() + '').padStart(2, '0')
31 // yyyy-mm-dd hh:mm:ss 31 // yyyy-mm-dd hh:mm:ss
32 return `${y}-${m}-${d} ${hh}:${mm}:${ss}` 32 return `${y}-${m}-${d} `
33 } 33 }
34 }, 34 },
35 directives:{ 35 directives:{
...@@ -43,16 +43,16 @@ var self = new Vue({ ...@@ -43,16 +43,16 @@ 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 flowids: this.flowid.toString(), 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,
50 keyWord:this.search 50 keyWord:this.search
51 } 51 }
52 }).then(res => { 52 }).then(res => {
53 this.total=res.data.data.total; 53 this.total=res.data.total;
54 let data=res.data.data.Data; 54 let data=res.data.data.Data;
55 let result =[] 55 let result =[];
56 if(data.length){ 56 if(data.length){
57 for (let i=0;i<data.length;i++){ 57 for (let i=0;i<data.length;i++){
58 for (let j=0;j<data[i].length;j++){ 58 for (let j=0;j<data[i].length;j++){
...@@ -82,9 +82,26 @@ var self = new Vue({ ...@@ -82,9 +82,26 @@ var self = new Vue({
82 this.pageNum = pageNum 82 this.pageNum = pageNum
83 this.getData() 83 this.getData()
84 }, 84 },
85 click(val) { 85 click(val){
86 if(val==3){
87 this.flowid = []
88 this.flowid.push('t1001_8a8610de737b99270173937337e00133')
89 this.getData()
90 }else if (val==5){
91 this.flowid = []
92 this.flowid.push('t1001_8a8610d86125b9a801612600a4c60003')
93 this.getData()
94 }else if (val =='2'){
95 this.flowid = []
96 this.flowid.push('t1001_402885c973b703220173b73ed4e6004d')
97 this.getData()
98 }else if (val=='1'){
99 this.flowid=[]
100 this.flowid = ['t1001_8a8610de737b99270173937337e00133','t1001_8a8610d86125b9a801612600a4c60003','t1001_402885c973b703220173b73ed4e6004d']
101 this.getData()
102 }
86 this.isActive = val 103 this.isActive = val
87 console.log(val) 104 console.log(this.flowid)
88 }, 105 },
89 openHandleJumpUrl(flowId, itemTypeId, _stats = 'create') { 106 openHandleJumpUrl(flowId, itemTypeId, _stats = 'create') {
90 var unique = uuid(); 107 var unique = uuid();
......
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
143 </el-table-column> 143 </el-table-column>
144 <el-table-column 144 <el-table-column
145 prop="PHXMMC" 145 prop="PHXMMC"
146 width="300" 146 width="500"
147 label="案件名称" 147 label="案件名称"
148 align="center" 148 align="center"
149 ></el-table-column> 149 ></el-table-column>
...@@ -154,13 +154,13 @@ ...@@ -154,13 +154,13 @@
154 width="100" 154 width="100"
155 > 155 >
156 </el-table-column> 156 </el-table-column>
157 <el-table-column 157 <!-- <el-table-column
158 prop="PHZRDW" 158 prop="PHZRDW"
159 label="责任单位" 159 label="责任单位"
160 align="center" 160 align="center"
161 width="200" 161 width="200"
162 > 162 >
163 </el-table-column> 163 </el-table-column>-->
164 <el-table-column 164 <el-table-column
165 prop="PHSSQY" 165 prop="PHSSQY"
166 label="所属区域" 166 label="所属区域"
...@@ -168,13 +168,13 @@ ...@@ -168,13 +168,13 @@
168 width="200" 168 width="200"
169 > 169 >
170 </el-table-column> 170 </el-table-column>
171 <el-table-column 171 <!-- <el-table-column
172 prop="ljr" 172 prop="ljr"
173 label="来件人" 173 label="来件人"
174 align="center" 174 align="center"
175 width="400" 175 width="400"
176 > 176 >
177 </el-table-column> 177 </el-table-column>-->
178 <el-table-column 178 <el-table-column
179 prop="CREATETIME" 179 prop="CREATETIME"
180 label="登记时间" 180 label="登记时间"
...@@ -221,24 +221,24 @@ ...@@ -221,24 +221,24 @@
221 </el-table-column> 221 </el-table-column>
222 <el-table-column 222 <el-table-column
223 prop="PHXMMC" 223 prop="PHXMMC"
224 width="300" 224 width="PHXMMC"
225 label="案件名称" 225 label="案件名称"
226 align="center" 226 align="center"
227 ></el-table-column> 227 ></el-table-column>
228 <el-table-column 228 <el-table-column
229 prop="anlx" 229 prop="PHAJLX"
230 label="案件类型" 230 label="案件类型"
231 align="center" 231 align="center"
232 width="100" 232 width="100"
233 > 233 >
234 </el-table-column> 234 </el-table-column>
235 <el-table-column 235 <!-- <el-table-column
236 prop="PHZRDW" 236 prop="PHZRDW"
237 label="责任单位" 237 label="责任单位"
238 align="center" 238 align="center"
239 width="200" 239 width="200"
240 > 240 >
241 </el-table-column> 241 </el-table-column>-->
242 <el-table-column 242 <el-table-column
243 prop="PHSSQY" 243 prop="PHSSQY"
244 label="所属区域" 244 label="所属区域"
...@@ -246,13 +246,13 @@ ...@@ -246,13 +246,13 @@
246 width="200" 246 width="200"
247 > 247 >
248 </el-table-column> 248 </el-table-column>
249 <el-table-column 249 <!-- <el-table-column
250 prop="ljr" 250 prop="ljr"
251 label="来件人" 251 label="来件人"
252 align="center" 252 align="center"
253 width="400" 253 width="400"
254 > 254 >
255 </el-table-column> 255 </el-table-column>-->
256 <el-table-column 256 <el-table-column
257 prop="CREATETIME" 257 prop="CREATETIME"
258 label="登记时间" 258 label="登记时间"
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
289 </el-table-column> 289 </el-table-column>
290 <el-table-column 290 <el-table-column
291 prop="PHXMMC" 291 prop="PHXMMC"
292 width="300" 292 width="PHXMMC"
293 label="案件名称" 293 label="案件名称"
294 align="center" 294 align="center"
295 ></el-table-column> 295 ></el-table-column>
...@@ -300,13 +300,13 @@ ...@@ -300,13 +300,13 @@
300 width="100" 300 width="100"
301 > 301 >
302 </el-table-column> 302 </el-table-column>
303 <el-table-column 303 <!-- <el-table-column
304 prop="PHZRDW" 304 prop="PHZRDW"
305 label="责任单位" 305 label="责任单位"
306 align="center" 306 align="center"
307 width="200" 307 width="200"
308 > 308 >
309 </el-table-column> 309 </el-table-column>-->
310 <el-table-column 310 <el-table-column
311 prop="PHSSQY" 311 prop="PHSSQY"
312 label="所属区域" 312 label="所属区域"
...@@ -314,13 +314,13 @@ ...@@ -314,13 +314,13 @@
314 width="200" 314 width="200"
315 > 315 >
316 </el-table-column> 316 </el-table-column>
317 <el-table-column 317 <!-- <el-table-column
318 prop="ljr" 318 prop="ljr"
319 label="来件人" 319 label="来件人"
320 align="center" 320 align="center"
321 width="400" 321 width="400"
322 > 322 >
323 </el-table-column> 323 </el-table-column>-->
324 <el-table-column 324 <el-table-column
325 prop="CREATETIME" 325 prop="CREATETIME"
326 label="登记时间" 326 label="登记时间"
...@@ -357,24 +357,24 @@ ...@@ -357,24 +357,24 @@
357 </el-table-column> 357 </el-table-column>
358 <el-table-column 358 <el-table-column
359 prop="PHXMMC" 359 prop="PHXMMC"
360 width="300" 360 width="PHXMMC"
361 label="案件名称" 361 label="案件名称"
362 align="center" 362 align="center"
363 ></el-table-column> 363 ></el-table-column>
364 <el-table-column 364 <el-table-column
365 prop="anlx" 365 prop="PHAJLX"
366 label="案件类型" 366 label="案件类型"
367 align="center" 367 align="center"
368 width="100" 368 width="100"
369 > 369 >
370 </el-table-column> 370 </el-table-column>
371 <el-table-column 371 <!-- <el-table-column
372 prop="PHZRDW" 372 prop="PHZRDW"
373 label="责任单位" 373 label="责任单位"
374 align="center" 374 align="center"
375 width="200" 375 width="200"
376 > 376 >
377 </el-table-column> 377 </el-table-column>-->
378 <el-table-column 378 <el-table-column
379 prop="PHSSQY" 379 prop="PHSSQY"
380 label="所属区域" 380 label="所属区域"
...@@ -382,13 +382,13 @@ ...@@ -382,13 +382,13 @@
382 width="200" 382 width="200"
383 > 383 >
384 </el-table-column> 384 </el-table-column>
385 <el-table-column 385 <!-- <el-table-column
386 prop="ljr" 386 prop="ljr"
387 label="来件人" 387 label="来件人"
388 align="center" 388 align="center"
389 width="400" 389 width="400"
390 > 390 >
391 </el-table-column> 391 </el-table-column>-->
392 <el-table-column 392 <el-table-column
393 prop="CREATETIME" 393 prop="CREATETIME"
394 label="登记时间" 394 label="登记时间"
......
...@@ -30,7 +30,7 @@ var self = new Vue({ ...@@ -30,7 +30,7 @@ var self = new Vue({
30 const mm = (dt.getMinutes() + '').padStart(2, '0') 30 const mm = (dt.getMinutes() + '').padStart(2, '0')
31 const ss = (dt.getSeconds() + '').padStart(2, '0') 31 const ss = (dt.getSeconds() + '').padStart(2, '0')
32 // yyyy-mm-dd hh:mm:ss 32 // yyyy-mm-dd hh:mm:ss
33 return `${y}-${m}-${d} ${hh}:${mm}:${ss}` 33 return `${y}-${m}-${d} `
34 } 34 }
35 }, 35 },
36 directives:{ 36 directives:{
...@@ -70,7 +70,7 @@ var self = new Vue({ ...@@ -70,7 +70,7 @@ var self = new Vue({
70 }); 70 });
71 }, 71 },
72 handleSizeChange(pageSize){ 72 handleSizeChange(pageSize){
73 this.pageSize = pageSize 73 this.pageSize = pageSize;
74 this.getData() 74 this.getData()
75 }, 75 },
76 handleCurrentChange(pageNum){ 76 handleCurrentChange(pageNum){
......
...@@ -157,13 +157,13 @@ ...@@ -157,13 +157,13 @@
157 width="100" 157 width="100"
158 > 158 >
159 </el-table-column> 159 </el-table-column>
160 <el-table-column 160 <!-- <el-table-column
161 prop="PHZRDW" 161 prop="PHZRDW"
162 label="责任单位" 162 label="责任单位"
163 align="center" 163 align="center"
164 width="200" 164 width="200"
165 > 165 >
166 </el-table-column> 166 </el-table-column>-->
167 <el-table-column 167 <el-table-column
168 prop="PHSSQY" 168 prop="PHSSQY"
169 label="所属区域" 169 label="所属区域"
...@@ -230,13 +230,13 @@ ...@@ -230,13 +230,13 @@
230 width="100" 230 width="100"
231 > 231 >
232 </el-table-column> 232 </el-table-column>
233 <el-table-column 233 <!-- <el-table-column
234 prop="PHZRDW" 234 prop="PHZRDW"
235 label="责任单位" 235 label="责任单位"
236 align="center" 236 align="center"
237 width="200" 237 width="200"
238 > 238 >
239 </el-table-column> 239 </el-table-column>-->
240 <el-table-column 240 <el-table-column
241 prop="PHSSQY" 241 prop="PHSSQY"
242 label="所属区域" 242 label="所属区域"
...@@ -298,13 +298,13 @@ ...@@ -298,13 +298,13 @@
298 width="100" 298 width="100"
299 > 299 >
300 </el-table-column> 300 </el-table-column>
301 <el-table-column 301 <!-- <el-table-column
302 prop="PHZRDW" 302 prop="PHZRDW"
303 label="责任单位" 303 label="责任单位"
304 align="center" 304 align="center"
305 width="200" 305 width="200"
306 > 306 >
307 </el-table-column> 307 </el-table-column>-->
308 <el-table-column 308 <el-table-column
309 prop="PHSSQY" 309 prop="PHSSQY"
310 label="所属区域" 310 label="所属区域"
......
...@@ -33,7 +33,7 @@ var self = new Vue({ ...@@ -33,7 +33,7 @@ var self = new Vue({
33 const mm = (dt.getMinutes() + '').padStart(2, '0') 33 const mm = (dt.getMinutes() + '').padStart(2, '0')
34 const ss = (dt.getSeconds() + '').padStart(2, '0') 34 const ss = (dt.getSeconds() + '').padStart(2, '0')
35 // yyyy-mm-dd hh:mm:ss 35 // yyyy-mm-dd hh:mm:ss
36 return `${y}-${m}-${d} ${hh}:${mm}:${ss}` 36 return `${y}-${m}-${d} `
37 } 37 }
38 }, 38 },
39 directives:{ 39 directives:{
......
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
144 prop="PHXMMC" 144 prop="PHXMMC"
145 label="项目名称" 145 label="项目名称"
146 align="center" 146 align="center"
147 width="450" 147 width="400"
148 > 148 >
149 </el-table-column> 149 </el-table-column>
150 <el-table-column 150 <el-table-column
...@@ -175,13 +175,13 @@ ...@@ -175,13 +175,13 @@
175 width="150" 175 width="150"
176 > 176 >
177 </el-table-column> 177 </el-table-column>
178 <el-table-column 178 <!-- <el-table-column
179 prop="PHZRDW" 179 prop="PHZRDW"
180 label="责任单位" 180 label="责任单位"
181 align="center" 181 align="center"
182 width="100" 182 width="100"
183 > 183 >
184 </el-table-column> 184 </el-table-column>-->
185 <el-table-column 185 <el-table-column
186 prop="PHSSQY" 186 prop="PHSSQY"
187 label="所属区域" 187 label="所属区域"
......
...@@ -30,7 +30,7 @@ var self = new Vue({ ...@@ -30,7 +30,7 @@ var self = new Vue({
30 const mm = (dt.getMinutes() + '').padStart(2, '0') 30 const mm = (dt.getMinutes() + '').padStart(2, '0')
31 const ss = (dt.getSeconds() + '').padStart(2, '0') 31 const ss = (dt.getSeconds() + '').padStart(2, '0')
32 // yyyy-mm-dd hh:mm:ss 32 // yyyy-mm-dd hh:mm:ss
33 return `${y}-${m}-${d} ${hh}:${mm}:${ss}` 33 return `${y}-${m}-${d} `
34 } 34 }
35 }, 35 },
36 directives:{ 36 directives:{
...@@ -42,12 +42,13 @@ var self = new Vue({ ...@@ -42,12 +42,13 @@ var self = new Vue({
42 }, 42 },
43 methods:{ 43 methods:{
44 getData() { 44 getData() {
45 axios.post(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,
49 flowIds: this.flowid.toString(), 49 flowIds: this.flowid.toString(),
50 userName: this.userName, 50 userName: this.userName,
51 keyWord:this.search
51 } 52 }
52 }).then(res => { 53 }).then(res => {
53 /* this.total=res.data.Data.total;*/ 54 /* this.total=res.data.Data.total;*/
......
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
144 prop="PHXMMC" 144 prop="PHXMMC"
145 label="项目名称" 145 label="项目名称"
146 align="center" 146 align="center"
147 width="450" 147 width="400"
148 > 148 >
149 </el-table-column> 149 </el-table-column>
150 <el-table-column 150 <el-table-column
...@@ -175,13 +175,13 @@ ...@@ -175,13 +175,13 @@
175 width="150" 175 width="150"
176 > 176 >
177 </el-table-column> 177 </el-table-column>
178 <el-table-column 178 <!-- <el-table-column
179 prop="PHZZDW" 179 prop="PHZZDW"
180 label="责任单位" 180 label="责任单位"
181 align="center" 181 align="center"
182 width="100" 182 width="100"
183 > 183 >
184 </el-table-column> 184 </el-table-column>-->
185 <el-table-column 185 <el-table-column
186 prop="PHSSQY" 186 prop="PHSSQY"
187 label="所属区域" 187 label="所属区域"
......