Skip to content

蔡永松 / fontweb-dc

Go to a project
Toggle navigation
Toggle navigation pinning
797f9643 by weimo934
Options

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

2 parents bfa5054c 3ab844e6
Expand all
Inline Side-by-side
Showing 4 changed files with 190 additions and 203 deletions
...@@ -9,34 +9,7 @@ var self = new Vue({ ...@@ -9,34 +9,7 @@ var self = new Vue({
9 pageSize:10, 9 pageSize:10,
10 total:0, 10 total:0,
11 // 表格数据 11 // 表格数据
12 tabaledata:[ 12 tabaledata:[],
13 {
14 xmmc:'西安电子工程小区改造',
15 xmdz:'长安区丰西路',
16 rwnf:'2020',
17 zrdw:'西安电子工程研究所',
18 ssqy:'所属区域',
19 zdmj:'2600',
20 jzmj:"5000",
21 ds:'7',
22 hs:'313',
23 hjrs:'1000',
24 jzjd:'完成改造',
25 },
26 {
27 xmmc:'和平门小区工程小区改造',
28 xmdz:'长安区丰西路',
29 rwnf:'2020',
30 zrdw:'西安电子工程研究所',
31 ssqy:'所属区域',
32 zdmj:'2600',
33 jzmj:"5000",
34 ds:'7',
35 hs:'313',
36 hjrs:'1000',
37 jzjd:'完成改造',
38 },
39 ],
40 multipleSelection: [] 13 multipleSelection: []
41 } 14 }
42 }, 15 },
...@@ -51,74 +24,55 @@ var self = new Vue({ ...@@ -51,74 +24,55 @@ var self = new Vue({
51 } 24 }
52 }, 25 },
53 methods:{ 26 methods:{
27 //数据请求
54 getData() { 28 getData() {
55 axios.get(CONF_NEWGHSC_SERVERURL + '/ghjg/backlog/'+this.pageNum+'/'+this.pageSize, { 29 axios.get(CONF_NEWGHSC_SERVERURL + '/wfsj/list',{
56 params: { 30 params:{
57 flowid: this.flowid, 31 pageNum:this.pageNum,
58 userId: this.userid, 32 pageSize:this.pageSize,
59 keyword: this.search 33 keyWord:this.search
60 } 34 }
61 }).then(res => { 35 }).then(res => {
62 this.total=res.data.total; 36 if(res && res.data && res.data.code==200){
63 let data=res.data.data.Data; 37 this.tabaledata = res.data.data.list;
64 let result =[] 38 this.total = res.data.data.total
65 if(data.length){
66 for (let i=0;i<data.length;i++){
67 for (let j=0;j<data[i].length;j++){
68 result.push( data[i][[j]]);
69 }
70 }
71 } 39 }
72 this.total = result.length; 40 }).catch(err=>{
73 this.tabaledata = result.slice((this.pageNum - 1) * this.pageSize, (this.pageNum - 1) * this.pageSize + this.pageSize); 41 console.log(err)
74 }).catch(res=>{
75 console.log(res)
76 }); 42 });
77 43
78 }, 44 },
79 clickData(row){ 45 clickData(row){
80 this.jumpdetailPage(row) 46 // console.log(row)
47 let id = row.id;
48 window.parent.document.getElementById('iframecontent').src = 'view/PHJG/WFSJ/xmgl/Sonwidget.html?id='+id;
81 }, 49 },
82 //点击删除 50 //点击删除
83 handlDelete(){ 51 handlDelete(){
84 if(this.multipleSelection.length!=1){ 52 if(this.multipleSelection.length < 1){
85 this.$message.warning('请先选择需要删除的数据') 53 this.$message.warning('请先选择需要删除的数据')
86 return false 54 return false
87 } 55 }
88 this.$message.success('删除数据成功') 56 let params =[];
57 this.multipleSelection.forEach(item=>{
58 params.push(item.id)
59 })
60 axios.delete(CONF_NEWGHSC_SERVERURL + '/wfsj/phqgz',{data:params}).then(res=>{
61 if(res && res.data && res.data.code ==200){
62 this.$message.success('删除数据成功')
63 }
64 this.getData()
65 }
66 )
89 }, 67 },
90 //点击表格的多选框 68 //点击表格的多选框
91 handleSelectionChange(val){ 69 handleSelectionChange(val){
92 this.multipleSelection = val 70 this.multipleSelection = val
71 console.log(this.multipleSelection)
93 }, 72 },
94 //搜索事件 73 //搜索事件
95 SearchInfo(){ 74 SearchInfo(){
96 if(!this.search){ 75 this.getData()
97 this.$message.warning('请先输入关键字后轻敲Enter键搜索')
98 }
99 },
100 jumpdetailPage(data) {
101 var taskid = data.TASKID;
102 var detailType = data.detailType;
103 var projectid = data.id;
104 var flowInstanceId =data.INSTANCEID;
105 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
106 var stats = 'dealedproject';
107 var projecttype = data.FLOWNAME;
108 var PROJECTSTATUS = encodeURI(encodeURI(data.PROJECTSTATUS));
109 var FLOWREVISIONID = data.FLOWREVISIONID;
110 var projectcode = data.PROJECTCODE;
111 var flowItemTypeKvStr = data.FLOWITEMTYPE?"&flowItemTypeId=" + data.FLOWITEMTYPE:"";
112 var version = data.FLOWVERSION;
113 var layerid="";
114 var coverage="";
115 var url = CONF_FRONT_SERVERURL
116 + 'view/projecttask/detailproject.jsp?projectid=' + projectid + "&referer=''&stats="
117 + stats +"&projectcode="+projectcode+"&taskId=" + taskid + "&flowInstanceId=" + flowInstanceId+'&titleEncode='
118 + titleEncode + "&projectStatus=" + PROJECTSTATUS+"&flowRevisionId="+FLOWREVISIONID+flowItemTypeKvStr+"&FLOWVERSION="+version+"&detailType="+detailType;
119
120 detailPage = window.open(this.handleJumpUrl(url));
121 parent.saveOpenNew?parent.saveOpenNew(detailPage):sreachparent(opener,"saveOpenNew",detailPage);
122 }, 76 },
123 handleSizeChange(pageSize){ 77 handleSizeChange(pageSize){
124 this.pageSize = pageSize 78 this.pageSize = pageSize
...@@ -128,88 +82,9 @@ var self = new Vue({ ...@@ -128,88 +82,9 @@ var self = new Vue({
128 this.pageNum = pageNum 82 this.pageNum = pageNum
129 this.getData() 83 this.getData()
130 }, 84 },
131 openHandleJumpUrl (flowId, itemTypeId, _stats = 'create') { 85 //点击添加
132 // debugger 86 AddNewPage(){
133 var unique = this.uuid(); 87 window.parent.document.getElementById('iframecontent').src = 'view/PHJG/WFSJ/xmgl/Sonwidget.html';
134 let url = CONF_FRONT_SERVERURL + 'view/projecttask/detailproject.jsp?';
135 url += 'stats=' + _stats;
136 url += '&flowid=' + flowId;
137 url += '&create=' + (this.projectId ? 1 : 0);
138 url += '&projectid=' + (this.projectId || "");
139 url += '&flowItemTypeId=' + (itemTypeId || "");
140 url += '&uniquePath=' + unique;
141 window.open(this.handleJumpUrl(url));
142 this.addFlowUserCount(flowId);
143 },
144 addFlowUserCount (flowId) {
145 if (flowId === null || flowId === undefined) {
146 return false;
147 }
148
149 this.ajaxPromise({
150 data: JSON.stringify({"flowId": flowId,"userId": this.userId}),
151 contentType: "application/json",
152 url: CONF_BACK_SERVERURL + "/mvc/flow/saveFlowUserCount.do"
153 }).catch((error)=> {
154 console.error(error);
155 });
156 }, 88 },
157 handleJumpUrl(url){
158 var myid = "guid" + this.guid();
159 var tempArr = url.split("?");
160 var returnStr = tempArr[0] + "?guid=" + myid;
161 var urlValue = tempArr[1];
162 var cacheUrlValue = null;
163 var data = {
164 paramUrl:urlValue,
165 ftoken:$.cookie('ftoken')
166 };
167 if(window.globalLocalCache){
168 cacheUrlValue = window.globalLocalCache.AddCache(myid,"","",data);
169 }
170 return returnStr;
171 },
172 S4() {
173 return (((1+Math.random())*0x10000)|0).toString(16).substring(1);
174 },
175 guid() {
176 return (this.S4()+this.S4()+"-"+this.S4()+"-"+this.S4()+"-"+this.S4()+"-"+this.S4()+this.S4()+this.S4());
177 },
178 uuid(){
179 var s = [];
180 var hexDigits = "0123456789abcdef";
181 for (var i = 0; i < 36; i++) {
182 s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
183 }
184 s[14] = "4";
185 s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
186 s[8] = s[13] = s[18] = s[23] = "-";
187
188 var uuid = s.join("");
189 return uuid;
190 },
191 ajaxPromise(options) {
192 return new Promise(function (resolve, reject) {
193 if ( typeof options !== "object" ) {
194 return reject("参数错误！");
195 }
196 let _type = options.type || "POST";
197 //'application/json'
198 $.ajax({
199 type: _type,
200 url: options.url,
201 data: options.data,
202 dataType: options.dataType,
203 contentType: options.contentType,
204 headers: {"token":$.cookie('ftoken') },
205 success: function(result){
206 resolve(result);
207 },
208 error: function (error) {
209 reject(error);
210 }
211 });
212 })
213 }
214 } 89 }
215 }) 90 })
...\ No newline at end of file ...\ No newline at end of file
......
1 var self = new Vue({
2 el:'#app',
3 data(){
4 return {
5 FloatRightTitle:'图片',
6 imgtabaledata:[
7 {
8 wjmc:'微信截图.png',
9 size:'5k',
10 scsj:'2020-8-06'
11 },
12 {
13 wjmc:'微信截图.png',
14 size:'5k',
15 scsj:'2020-8-06'
16 }
17 ],
18 filetabeldata:[
19 {
20 wjmc:'test.txt',
21 size:'15k',
22 scsj:'2020-8-01'
23 },
24 {
25 wjmc:'违法结果.txt',
26 size:'10k',
27 scsj:'2020-8-01'
28 },
29 ],
30 //所属区域list
31 distictList:[
32 {
33 distict:'港务区',
34 label:'港务区'
35 },
36 {
37 distict:'碑林区',
38 label:'碑林区'
39 },
40 {
41 distict:'莲湖区',
42 label:'莲湖区'
43 }
44 ],
45 //进展阶段list
46 evdlveStageList:[
47 {
48 evdlveStage:'前期摸底',
49 label:'前期摸底'
50 },
51 {
52 evdlveStage:'启动拆迁',
53 label:'启动拆迁'
54 },
55 {
56 evdlveStage:'场地平整',
57 label:'场地平整'
58 },
59 {
60 evdlveStage:'开工建设',
61 label:'开工建设'
62 },
63 {
64 evdlveStage:'工程完工',
65 label:'工程完工'
66 },
67 {
68 evdlveStage:'分配回迁',
69 label:'分配回迁'
70 },
71 ],
72 form:{
73 procjectName:'', //项目名称
74 procjectAddress:'', //项目地址
75 taskYear:'', //任务年份
76 dutyUnit:'', //责任单位
77 distict:'', //所属区域
78 evdlveStage:'', // 进展阶段
79 procjectOverview:'' ,//项目概况
80 progress:'',//进展情况
81 content:'',// 建设类容
82 },
83 fromsrcid:'',
84 }
85 },
86 created(){
87 let srcinfo = window.parent.document.getElementById('iframecontent').src;
88 this.fromsrcid =srcinfo.split('?')[1].split('=')[1]
89 },
90 mounted(){
91 this.getdetail()
92 },
93 methods:{
94 getdetail(){
95 axios.get(CONF_NEWGHSC_SERVERURL +'/wfsj/phqgz' ,{
96 params:{
97 id:this.fromsrcid
98 }
99 }).then(res=>{
100 if(res && res.data && res.data.code ==200){
101 this.form.procjectName = res.data.data.procjectName
102 this.form.procjectAddress = res.data.data.procjectAddress
103 this.form.taskYear = res.data.data.taskYear
104 this.form.dutyUnit = res.data.data.dutyUnit
105 this.form.distict = res.data.data.distict
106 this.form.evdlveStage = res.data.data.evdlveStage
107 this.form.procjectOverview = res.data.data.procjectOverview
108 this.form.progress = res.data.data.progress
109 this.form.content = res.data.data.content
110 }
111 })
112 },
113 //点击返回按钮事件
114 back(){
115 window.parent.document.getElementById('iframecontent').src = 'view/PHJG/WFSJ/xmgl/widget.html';
116 },
117 //保存数据
118 saveData(){
119 if( this.form.content==""&& this.form.procjectName =='' && this.form.procjectAddress=="" && this.form.taskYear==""&& this.form.dutyUnit==""&& this.form.distict=="" && this.form.evdlveStage==""&& this.form.procjectOverview==""&& this.form.progress==""){
120 this.$message.error('请先输入数据进行保存.... ')
121 return false
122 }
123 axios.post(CONF_NEWGHSC_SERVERURL +'/wfsj/phqgz',null ,{ data:this.form }).then(res=>{
124 if(res && res.data && res.data.code ==200){
125 this.$message.success('新增数据成功')
126 window.parent.document.getElementById('iframecontent').src = 'view/PHJG/WFSJ/xmgl/widget.html';
127 }
128 })
129 },
130 clicktitle(val){
131 this.FloatRightTitle = val
132 },
133 handleRemove(file, fileList) {
134 console.log(file, fileList);
135 },
136 handlePreview(file) {
137 console.log(file);
138 },
139 handleExceed(files, fileList) {
140 this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
141 },
142 beforeRemove(file, fileList) {
143 return this.$confirm(`确定移除 ${ file.name }？`);
144 }
145 }
146 })
...\ No newline at end of file ...\ No newline at end of file
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
84 .el-col-4{ 84 .el-col-4{
85 margin-top:20px 85 margin-top:20px
86 } 86 }
87 /*将导出按钮注释掉 margin-left 从-40 变成了 -125*/
87 .div-search{ 88 .div-search{
88 border: 1px solid #cac8c8; 89 border: 1px solid #cac8c8;
89 border-radius: 2px; 90 border-radius: 2px;
...@@ -92,7 +93,7 @@ ...@@ -92,7 +93,7 @@
92 width: 280px; 93 width: 280px;
93 height: 30px; 94 height: 30px;
94 margin-left: 10px; 95 margin-left: 10px;
95 margin-left: -40px; 96 margin-left: -125px;
96 margin-top: 18px; 97 margin-top: 18px;
97 } 98 }
98 .div-search input{ 99 .div-search input{
...@@ -110,9 +111,9 @@ ...@@ -110,9 +111,9 @@
110 <el-row :gutter="20"> 111 <el-row :gutter="20">
111 <el-col :span="4"> 112 <el-col :span="4">
112 <!-- <button class="btns">查询</button>--> 113 <!-- <button class="btns">查询</button>-->
113 <button class="btns" @click="openHandleJumpUrl('t1001_8a8610d86117e3b401611848a8690000')">添加</button> 114 <button class="btns" @click="AddNewPage">添加</button>
114 <button class="btns" @click="handlDelete">删除</button> 115 <button class="btns" @click="handlDelete">删除</button>
115 <button class="btns">导出</button> 116 <!-- <button class="btns">导出</button>-->
116 </el-col> 117 </el-col>
117 <el-col :span="6"> 118 <el-col :span="6">
118 <div class="div-search"> 119 <div class="div-search">
...@@ -136,79 +137,44 @@ ...@@ -136,79 +137,44 @@
136 width="55"> 137 width="55">
137 </el-table-column> 138 </el-table-column>
138 <el-table-column 139 <el-table-column
139 prop="xmmc" 140 prop="procjectName"
140 width="330" 141 width="330"
141 label="项目名称" 142 label="项目名称"
142 align="center" 143 align="center"
143 ></el-table-column> 144 ></el-table-column>
144 <el-table-column 145 <el-table-column
145 prop="xmdz" 146 prop="procjectAddress"
146 label="项目地址" 147 label="项目地址"
147 align="center" 148 align="center"
148 width="450" 149 width="450"
149 > 150 >
150 </el-table-column> 151 </el-table-column>
151 <el-table-column 152 <el-table-column
152 prop="rwnf" 153 prop="taskYear"
153 label="任务年份" 154 label="任务年份"
154 align="center" 155 align="center"
155 width="100" 156 width="100"
156 > 157 >
157 </el-table-column> 158 </el-table-column>
158 <el-table-column 159 <el-table-column
159 prop="zrdw" 160 prop="dutyUnit"
160 label="责任单位" 161 label="责任单位"
161 align="center" 162 align="center"
162 width="180" 163 width="300"
163 > 164 >
164 </el-table-column> 165 </el-table-column>
165 <el-table-column 166 <el-table-column
166 prop="ssqy" 167 prop="distict"
167 label="所属区域" 168 label="所属区域"
168 align="center" 169 align="center"
169 width="200" 170 width="200"
170 > 171 >
171 </el-table-column> 172 </el-table-column>
172 <el-table-column 173 <el-table-column
173 prop="zdmj" 174 prop="evdlveStage"
174 label="占地面积"
175 align="center"
176 width="150"
177 >
178 </el-table-column>
179 <el-table-column
180 prop="jzmj"
181 label="建筑面积"
182 align="center"
183 width="100"
184 >
185 </el-table-column>
186 <el-table-column
187 prop="ds"
188 label="栋数"
189 align="center"
190 width="100"
191 >
192 </el-table-column>
193 <el-table-column
194 prop="hs"
195 label="户数"
196 align="center"
197 width="100"
198 >
199 </el-table-column>
200 <el-table-column
201 prop="hjrs"
202 label="惠及人数"
203 align="center"
204 width="100"
205 >
206 </el-table-column>
207 <el-table-column
208 prop="jzjd"
209 label="进展阶段" 175 label="进展阶段"
210 align="center" 176 align="center"
211 width="100" 177 width="275"
212 > 178 >
213 </el-table-column> 179 </el-table-column>
214 </el-table> 180 </el-table>
......