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 189 additions and 202 deletions
......@@ -9,34 +9,7 @@ var self = new Vue({
pageSize:10,
total:0,
// 表格数据
tabaledata:[
{
xmmc:'西安电子工程小区改造',
xmdz:'长安区丰西路',
rwnf:'2020',
zrdw:'西安电子工程研究所',
ssqy:'所属区域',
zdmj:'2600',
jzmj:"5000",
ds:'7',
hs:'313',
hjrs:'1000',
jzjd:'完成改造',
},
{
xmmc:'和平门小区工程小区改造',
xmdz:'长安区丰西路',
rwnf:'2020',
zrdw:'西安电子工程研究所',
ssqy:'所属区域',
zdmj:'2600',
jzmj:"5000",
ds:'7',
hs:'313',
hjrs:'1000',
jzjd:'完成改造',
},
],
tabaledata:[],
multipleSelection: []
}
},
......@@ -51,74 +24,55 @@ var self = new Vue({
}
},
methods:{
//数据请求
getData() {
axios.get(CONF_NEWGHSC_SERVERURL + '/ghjg/backlog/'+this.pageNum+'/'+this.pageSize, {
params: {
flowid: this.flowid,
userId: this.userid,
keyword: this.search
axios.get(CONF_NEWGHSC_SERVERURL + '/wfsj/list',{
params:{
pageNum:this.pageNum,
pageSize:this.pageSize,
keyWord:this.search
}
}).then(res => {
this.total=res.data.total;
let data=res.data.data.Data;
let result =[]
if(data.length){
for (let i=0;i<data.length;i++){
for (let j=0;j<data[i].length;j++){
result.push( data[i][[j]]);
}
}
if(res && res.data && res.data.code==200){
this.tabaledata = res.data.data.list;
this.total = res.data.data.total
}
this.total = result.length;
this.tabaledata = result.slice((this.pageNum - 1) * this.pageSize, (this.pageNum - 1) * this.pageSize + this.pageSize);
}).catch(res=>{
console.log(res)
}).catch(err=>{
console.log(err)
});
},
clickData(row){
this.jumpdetailPage(row)
// console.log(row)
let id = row.id;
window.parent.document.getElementById('iframecontent').src = 'view/PHJG/WFSJ/xmgl/Sonwidget.html?id='+id;
},
//点击删除
handlDelete(){
if(this.multipleSelection.length!=1){
if(this.multipleSelection.length < 1){
this.$message.warning('请先选择需要删除的数据')
return false
}
let params =[];
this.multipleSelection.forEach(item=>{
params.push(item.id)
})
axios.delete(CONF_NEWGHSC_SERVERURL + '/wfsj/phqgz',{data:params}).then(res=>{
if(res && res.data && res.data.code ==200){
this.$message.success('删除数据成功')
}
this.getData()
}
)
},
//点击表格的多选框
handleSelectionChange(val){
this.multipleSelection = val
console.log(this.multipleSelection)
},
//搜索事件
SearchInfo(){
if(!this.search){
this.$message.warning('请先输入关键字后轻敲Enter键搜索')
}
},
jumpdetailPage(data) {
var taskid = data.TASKID;
var detailType = data.detailType;
var projectid = data.id;
var flowInstanceId =data.INSTANCEID;
var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
var stats = 'dealedproject';
var projecttype = data.FLOWNAME;
var PROJECTSTATUS = encodeURI(encodeURI(data.PROJECTSTATUS));
var FLOWREVISIONID = data.FLOWREVISIONID;
var projectcode = data.PROJECTCODE;
var flowItemTypeKvStr = data.FLOWITEMTYPE?"&flowItemTypeId=" + data.FLOWITEMTYPE:"";
var version = data.FLOWVERSION;
var layerid="";
var coverage="";
var url = CONF_FRONT_SERVERURL
+ 'view/projecttask/detailproject.jsp?projectid=' + projectid + "&referer=''&stats="
+ stats +"&projectcode="+projectcode+"&taskId=" + taskid + "&flowInstanceId=" + flowInstanceId+'&titleEncode='
+ titleEncode + "&projectStatus=" + PROJECTSTATUS+"&flowRevisionId="+FLOWREVISIONID+flowItemTypeKvStr+"&FLOWVERSION="+version+"&detailType="+detailType;
detailPage = window.open(this.handleJumpUrl(url));
parent.saveOpenNew?parent.saveOpenNew(detailPage):sreachparent(opener,"saveOpenNew",detailPage);
this.getData()
},
handleSizeChange(pageSize){
this.pageSize = pageSize
......@@ -128,88 +82,9 @@ var self = new Vue({
this.pageNum = pageNum
this.getData()
},
openHandleJumpUrl (flowId, itemTypeId, _stats = 'create') {
// debugger
var unique = this.uuid();
let url = CONF_FRONT_SERVERURL + 'view/projecttask/detailproject.jsp?';
url += 'stats=' + _stats;
url += '&flowid=' + flowId;
url += '&create=' + (this.projectId ? 1 : 0);
url += '&projectid=' + (this.projectId || "");
url += '&flowItemTypeId=' + (itemTypeId || "");
url += '&uniquePath=' + unique;
window.open(this.handleJumpUrl(url));
this.addFlowUserCount(flowId);
//点击添加
AddNewPage(){
window.parent.document.getElementById('iframecontent').src = 'view/PHJG/WFSJ/xmgl/Sonwidget.html';
},
addFlowUserCount (flowId) {
if (flowId === null || flowId === undefined) {
return false;
}
this.ajaxPromise({
data: JSON.stringify({"flowId": flowId,"userId": this.userId}),
contentType: "application/json",
url: CONF_BACK_SERVERURL + "/mvc/flow/saveFlowUserCount.do"
}).catch((error)=> {
console.error(error);
});
},
handleJumpUrl(url){
var myid = "guid" + this.guid();
var tempArr = url.split("?");
var returnStr = tempArr[0] + "?guid=" + myid;
var urlValue = tempArr[1];
var cacheUrlValue = null;
var data = {
paramUrl:urlValue,
ftoken:$.cookie('ftoken')
};
if(window.globalLocalCache){
cacheUrlValue = window.globalLocalCache.AddCache(myid,"","",data);
}
return returnStr;
},
S4() {
return (((1+Math.random())*0x10000)|0).toString(16).substring(1);
},
guid() {
return (this.S4()+this.S4()+"-"+this.S4()+"-"+this.S4()+"-"+this.S4()+"-"+this.S4()+this.S4()+this.S4());
},
uuid(){
var s = [];
var hexDigits = "0123456789abcdef";
for (var i = 0; i < 36; i++) {
s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
}
s[14] = "4";
s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
s[8] = s[13] = s[18] = s[23] = "-";
var uuid = s.join("");
return uuid;
},
ajaxPromise(options) {
return new Promise(function (resolve, reject) {
if ( typeof options !== "object" ) {
return reject("参数错误！");
}
let _type = options.type || "POST";
//'application/json'
$.ajax({
type: _type,
url: options.url,
data: options.data,
dataType: options.dataType,
contentType: options.contentType,
headers: {"token":$.cookie('ftoken') },
success: function(result){
resolve(result);
},
error: function (error) {
reject(error);
}
});
})
}
}
})
\ No newline at end of file
......
var self = new Vue({
el:'#app',
data(){
return {
FloatRightTitle:'图片',
imgtabaledata:[
{
wjmc:'微信截图.png',
size:'5k',
scsj:'2020-8-06'
},
{
wjmc:'微信截图.png',
size:'5k',
scsj:'2020-8-06'
}
],
filetabeldata:[
{
wjmc:'test.txt',
size:'15k',
scsj:'2020-8-01'
},
{
wjmc:'违法结果.txt',
size:'10k',
scsj:'2020-8-01'
},
],
//所属区域list
distictList:[
{
distict:'港务区',
label:'港务区'
},
{
distict:'碑林区',
label:'碑林区'
},
{
distict:'莲湖区',
label:'莲湖区'
}
],
//进展阶段list
evdlveStageList:[
{
evdlveStage:'前期摸底',
label:'前期摸底'
},
{
evdlveStage:'启动拆迁',
label:'启动拆迁'
},
{
evdlveStage:'场地平整',
label:'场地平整'
},
{
evdlveStage:'开工建设',
label:'开工建设'
},
{
evdlveStage:'工程完工',
label:'工程完工'
},
{
evdlveStage:'分配回迁',
label:'分配回迁'
},
],
form:{
procjectName:'', //项目名称
procjectAddress:'', //项目地址
taskYear:'', //任务年份
dutyUnit:'', //责任单位
distict:'', //所属区域
evdlveStage:'', // 进展阶段
procjectOverview:'' ,//项目概况
progress:'',//进展情况
content:'',// 建设类容
},
fromsrcid:'',
}
},
created(){
let srcinfo = window.parent.document.getElementById('iframecontent').src;
this.fromsrcid =srcinfo.split('?')[1].split('=')[1]
},
mounted(){
this.getdetail()
},
methods:{
getdetail(){
axios.get(CONF_NEWGHSC_SERVERURL +'/wfsj/phqgz' ,{
params:{
id:this.fromsrcid
}
}).then(res=>{
if(res && res.data && res.data.code ==200){
this.form.procjectName = res.data.data.procjectName
this.form.procjectAddress = res.data.data.procjectAddress
this.form.taskYear = res.data.data.taskYear
this.form.dutyUnit = res.data.data.dutyUnit
this.form.distict = res.data.data.distict
this.form.evdlveStage = res.data.data.evdlveStage
this.form.procjectOverview = res.data.data.procjectOverview
this.form.progress = res.data.data.progress
this.form.content = res.data.data.content
}
})
},
//点击返回按钮事件
back(){
window.parent.document.getElementById('iframecontent').src = 'view/PHJG/WFSJ/xmgl/widget.html';
},
//保存数据
saveData(){
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==""){
this.$message.error('请先输入数据进行保存.... ')
return false
}
axios.post(CONF_NEWGHSC_SERVERURL +'/wfsj/phqgz',null ,{ data:this.form }).then(res=>{
if(res && res.data && res.data.code ==200){
this.$message.success('新增数据成功')
window.parent.document.getElementById('iframecontent').src = 'view/PHJG/WFSJ/xmgl/widget.html';
}
})
},
clicktitle(val){
this.FloatRightTitle = val
},
handleRemove(file, fileList) {
console.log(file, fileList);
},
handlePreview(file) {
console.log(file);
},
handleExceed(files, fileList) {
this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${ file.name }？`);
}
}
})
\ No newline at end of file
......@@ -84,6 +84,7 @@
.el-col-4{
margin-top:20px
}
/*将导出按钮注释掉 margin-left 从-40 变成了 -125*/
.div-search{
border: 1px solid #cac8c8;
border-radius: 2px;
......@@ -92,7 +93,7 @@
width: 280px;
height: 30px;
margin-left: 10px;
margin-left: -40px;
margin-left: -125px;
margin-top: 18px;
}
.div-search input{
......@@ -110,9 +111,9 @@
<el-row :gutter="20">
<el-col :span="4">
<!-- <button class="btns">查询</button>-->
<button class="btns" @click="openHandleJumpUrl('t1001_8a8610d86117e3b401611848a8690000')">添加</button>
<button class="btns" @click="AddNewPage">添加</button>
<button class="btns" @click="handlDelete">删除</button>
<button class="btns">导出</button>
<!-- <button class="btns">导出</button>-->
</el-col>
<el-col :span="6">
<div class="div-search">
......@@ -136,79 +137,44 @@
width="55">
</el-table-column>
<el-table-column
prop="xmmc"
prop="procjectName"
width="330"
label="项目名称"
align="center"
></el-table-column>
<el-table-column
prop="xmdz"
prop="procjectAddress"
label="项目地址"
align="center"
width="450"
>
</el-table-column>
<el-table-column
prop="rwnf"
prop="taskYear"
label="任务年份"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="zrdw"
prop="dutyUnit"
label="责任单位"
align="center"
width="180"
width="300"
>
</el-table-column>
<el-table-column
prop="ssqy"
prop="distict"
label="所属区域"
align="center"
width="200"
>
</el-table-column>
<el-table-column
prop="zdmj"
label="占地面积"
align="center"
width="150"
>
</el-table-column>
<el-table-column
prop="jzmj"
label="建筑面积"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="ds"
label="栋数"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="hs"
label="户数"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="hjrs"
label="惠及人数"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="jzjd"
prop="evdlveStage"
label="进展阶段"
align="center"
width="100"
width="275"
>
</el-table-column>
</el-table>
......