6f0e5832 by weimo934

Merge remote-tracking branch 'origin/3ddc' into 3ddc

2 parents 7edebdb0 92ae7c8c
......@@ -5,70 +5,99 @@ var self = new Vue({
search:'',
projectId:null,
userId:null,
total:5,
// 表格数据
tabaledata:[
{
xh:'1',
ajmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
anlx:'批后',
zrdw:'高新分局',
ssqy:'高新',
ljr:'向小华',
djsh:'2020-07-05',
jssi:'2020-07-05',
xmmc:'西安电子工程小区改造',
xmdz:'长安区丰西路',
rwnf:'2020',
zrdw:'西安电子工程研究所',
ssqy:'所属区域',
zdmj:'2600',
jzmj:"5000",
ds:'7',
hs:'313',
hjrs:'1000',
jzjd:'完成改造',
},
{
xh:'2',
ajmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
anlx:'批后',
zrdw:'高新分局',
ssqy:'高新',
ljr:'向小华',
djsh:'2020-07-05',
jssi:'2020-07-05',
xmmc:'和平门小区工程小区改造',
xmdz:'长安区丰西路',
rwnf:'2020',
zrdw:'西安电子工程研究所',
ssqy:'所属区域',
zdmj:'2600',
jzmj:"5000",
ds:'7',
hs:'313',
hjrs:'1000',
jzjd:'完成改造',
},
{
xh:'3',
ajmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
anlx:'批后',
zrdw:'高新分局',
ssqy:'高新',
ljr:'向小华',
djsh:'2020-07-05',
jssi:'2020-07-05',
],
multipleSelection: []
}
},
{
xh:'4',
ajmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
anlx:'批后',
zrdw:'高新分局',
ssqy:'高新',
ljr:'向小华',
djsh:'2020-07-05',
jssi:'2020-07-05',
mounted(){
this.getData();
},
{
xh:'5',
ajmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
anlx:'批后',
zrdw:'高新分局',
ssqy:'高新',
ljr:'向小华',
djsh:'2020-07-05',
jssi:'2020-07-05',
methods:{
getData() {
axios.get(CONF_NEWGHSC_SERVERURL + '/ghjg/backlog/'+this.pageNum+'/'+this.pageSize, {
params: {
flowid: this.flowid,
userId: this.userid,
keyword: this.search
}
}).then(res => {
this.total=res.data.data.total;
this.tabaledata = res.data.data.list;
}).catch(res=>{
console.log(res)
});
},
],
isActive:1,
clickData(row){
this.jumpdetailPage(row)
},
//点击删除
handlDelete(){
if(this.multipleSelection.length!=1){
this.$message.warning('请先选择需要删除的数据')
return false
}
},
methods:{
//点击表格的多选框
handleSelectionChange(val){
this.multipleSelection = val
},
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);
},
handleSizeChange(){
},
handleCurrentChange(){},
click(val){
this.isActive = val
},
openHandleJumpUrl (flowId, itemTypeId, _stats = 'create') {
// debugger
var unique = this.uuid();
......
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>棚户区改造</title>
<title>批后管理待办</title>
<script src="/frontweb/common/js/config.js"></script>
<link rel="stylesheet" href="/frontweb/libs/element-ui/lib-master/theme-chalk/index.css"/>
<script src="/frontweb/libs/vue/vue.js"></script>
......@@ -77,7 +77,7 @@
width: 280px;
height: 30px;
margin-left: 10px;
margin-left: -120px;
margin-left: -40px;
margin-top: 18px;
}
.div-search input{
......@@ -96,7 +96,8 @@
<el-col :span="4">
<!-- <button class="btns">查询</button>-->
<button class="btns" @click="openHandleJumpUrl('t1001_8a8610d86117e3b401611848a8690000')">添加</button>
<button class="btns">删除</button>
<button class="btns" @click="handlDelete">删除</button>
<button class="btns">导出</button>
</el-col>
<el-col :span="6">
<div class="div-search">
......@@ -113,69 +114,84 @@
border
stripe
@row-click="clickData"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="xmbh"
width="130"
label="项目编号"
prop="xmmc"
width="330"
label="项目名称"
align="center"
></el-table-column>
<el-table-column
prop="xmmc"
label="项目名称"
prop="xmdz"
label="项目地址"
align="center"
width="450"
>
</el-table-column>
<el-table-column
prop="djbh"
label="地籍编号"
prop="rwnf"
label="任务年份"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="ydmj"
label="用地面积(亩)"
prop="zrdw"
label="责任单位"
align="center"
width="180"
>
</el-table-column>
<el-table-column
prop="zdwz"
label="宗地位置"
prop="ssqy"
label="所属区域"
align="center"
width="400"
width="200"
>
</el-table-column>
<el-table-column
prop="tdyt"
label="土地用途"
prop="zdmj"
label="占地面积"
align="center"
width="150"
>
</el-table-column>
<el-table-column
prop="zrdw"
label="责任单位"
prop="jzmj"
label="建筑面积"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="ssqy"
label="所属区域"
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="cjsj"
label="创建时间"
prop="jzjd"
label="进展阶段"
align="center"
width="100"
>
......@@ -188,14 +204,14 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="pageNum"
:current-page="1"
:page-sizes="[2, 5, 8]"
:page-size="pageSize"
:page-size="1"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
<script src="js/widget.js"></script>
<script src="./js/widget.js"></script>
</body>
</html>
\ No newline at end of file
......
var self = new Vue({
el:'#app',
data(){
return {
fileList: [
// {
// name: 'food.jpeg',
// url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'
// },
// {
// name: 'food2.jpeg',
// url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'
// }
],
tabaledata:[
{
wjmc:'碑林区老旧小区改造台账',
scsj:'2020年8月3日11:20:45',
size:'500k'
},
{
wjmc:'莲湖区老旧小区改造台账',
scsj:'2020年8月3日11:20:45',
size:'500k'
},
{
wjmc:'新城区老旧小区改造台账',
scsj:'2020年8月3日11:20:45',
size:'500k'
},
],
total: 0,
pageNum:1,
pageSize:1
};
},
mounted(){
},
methods:{
handleSizeChange(){},
handleCurrentChange(){},
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 }?`);
},
clickData(){
},
handlePriview(){},
handleEdit(){},
handleDelete(){}
}
})
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>批后管理待办</title>
<script src="/frontweb/common/js/config.js"></script>
<link rel="stylesheet" href="/frontweb/libs/element-ui/lib-master/theme-chalk/index.css"/>
<script src="/frontweb/libs/vue/vue.js"></script>
<script src="/frontweb/libs/element/index.js"></script>
<script src="/frontweb/libs/axios/axios.min.js"></script>
<script type="text/javascript" src="/frontweb/libs/jquery/jquery.min.js"></script>
<script src="/frontweb/libs/jquery/jquery.cookie.js"></script>
<script type="text/javascript" src="/frontweb/common/js/global/global.localStorage.js"></script>
<script type="text/javascript" src="/frontweb/common/js/global/global.modelctls.js"></script>
<style>
.upload-demo{
padding: 0 10px;
}
.contanier{
margin:-20px 10px 0 10px;
height:100%;
background: #fff;
}
.el-row{
margin-top:20px;
}
.el-input{
margin-top:15px;
}
.el-button{
margin-top: 20px;
}
.el-table{
border: 1px solid #cac8c8;
min-height:750px
}
.el-table th {
background:#F2F2F2 !important;
}
.el-table tbody tr:hover>td {
background-color:#EEF9FF!important
}
.block{
float: right;
background: #fff;
position: fixed;
bottom: 15px;
right: 11px;
}
.el-pagination__jump{
margin-top: -15px;
}
.el-table__row{
cursor: pointer;
}
.btns{
width: 73px;
height: 30px;
border-radius: 2px;
background-color: white;
border: 1px solid #0096eb;
color: #0096eb;
cursor: pointer;
padding: 4px 10px;
margin-right: 7px;
outline: 0;
}
.btns:hover{
background: #0096eb;
color: #fff;
}
.el-col-4{
margin-top:20px
}
.div-search{
border: 1px solid #cac8c8;
border-radius: 2px;
float: left;
margin-right: 10px;
width: 280px;
height: 30px;
margin-left: 10px;
margin-left: -40px;
margin-top: 18px;
}
.div-search input{
border: none;
height: 27px;
padding-left: 15px;
border-radius: 2px;
outline: 0;
}
</style>
</head>
<body>
<div id="app">
<div class='contanier'>
<el-row :gutter="20">
<!-- <el-col :span="4">-->
<!-- <button class="btns" @click="openHandleJumpUrl('t1001_8a8610d86117e3b401611848a8690000')">添加</button>-->
<!-- <button class="btns">删除</button>-->
<!-- <button class="btns">导出</button>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <div class="div-search">-->
<!-- <input id="searchInput" type="text" placeholder="搜索待办项目" style="width: 82%;" v-model="search">-->
<!-- <img id="searchBtn" src="../../../../image/projecttask/search.png" style="margin-right: 10px; margin-top: 4px; width: 20px; height: 20px; float: right;">-->
<!-- </div>-->
<!-- </el-col>-->
<el-upload
class="upload-demo"
action="https://jsonplaceholder.typicode.com/posts/"
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-remove="beforeRemove"
multiple
:limit="3"
:on-exceed="handleExceed"
:file-list="fileList">
<el-button size="small" type="primary">上传文件</el-button>
</el-upload>
</el-row>
<!-- 列表区域-->
<el-table
:data="tabaledata"
style="width: 100%;margin-top:10px;"
height="100%"
border
stripe
@row-click="clickData"
>
<el-table-column
type="selection"
width="60">
</el-table-column>
<el-table-column
prop="wjmc"
width="500"
label="文件名称"
align="center"
></el-table-column>
<el-table-column
prop="scsj"
label="上传时间"
align="center"
width="400"
>
</el-table-column>
<el-table-column
prop="size"
label="大小"
align="center"
width="250"
>
</el-table-column>
<el-table-column
label="操作"
align="center"
width="500"
>
<template slot-scope="scope">
<button class='btns' @click="handlePriview(scope.row)">预览</button>
<button class='btns' @click="handleEdit(scope.row)">下载</button>
<button class='btns' @click="handleDelete(scope.row)">删除</button>
</template>
</el-table-column>
</el-table>
<!-- 分页区域-->
</div>
<div class="block">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="pageNum"
:page-sizes="[2, 5, 8]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
<script src="./js/widget.js"></script>
</body>
</html>
\ No newline at end of file