Skip to content

R
rongtong-pc
Commit a4aa1936 authored by p-wanping.song's avatar p-wanping.song
Browse files
Options

Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-ui into swp-develop

parents 17699257 ee16aa03
Expand all Show whitespace changes
Inline Side-by-side
Showing with 659 additions and 521 deletions
src/router/index.js
View file @ a4aa1936
...@@ -144,7 +144,21 @@ export const dynamicRoutes = [ ...@@ -144,7 +144,21 @@ export const dynamicRoutes = [
path: 'index/:id(\\d+)', path: 'index/:id(\\d+)',
component: () => import('@/views/risk/plan/ledgerdata'), component: () => import('@/views/risk/plan/ledgerdata'),
name: 'ledgerdata', name: 'ledgerdata',
meta: { title: '台账数据', activeMenu: '/risk/plan/ledgerdata' } meta: { title: '任务详情', activeMenu: '/risk/plan/ledgerdata' }
}
]
},
{
path: '/risk/drawCanvas/index',
component: Layout,
hidden: true,
permissions: ['system:ledgerRoom:list'],
children: [
{
path: 'index/:id(\\d+)',
component: () => import('@/views/risk/drawCanvas/index'),
name: 'drawCanvas',
meta: { title: '四色图', activeMenu: '/risk/drawCanvas/index' }
} }
] ]
}, },
......
src/views/risk/drawCanvas/index.vue
View file @ a4aa1936
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<img src="../../assets/imgs/north.png" alt="" /> <img src="../../assets/imgs/north.png" alt="" />
</div> --> </div> -->
<grid-layout <grid-layout
id="gridView"
:layout.sync="layout" :layout.sync="layout"
:col-num="colNum" :col-num="colNum"
:row-height="30" :row-height="30"
...@@ -27,7 +28,7 @@ ...@@ -27,7 +28,7 @@
@moved="movedEvent" @moved="movedEvent"
:style="{ :style="{
backgroundColor: item.c, backgroundColor: item.c,
border: item.type == 'thorough' ? 'none !important' : '' border: item.type == 'thorough' ? 'none !important' : '',
}" }"
> >
<span class="text" :class="item.w > item.h * 5 ? '' : 'rowText'">{{ <span class="text" :class="item.w > item.h * 5 ? '' : 'rowText'">{{
...@@ -36,19 +37,25 @@ ...@@ -36,19 +37,25 @@
<!-- <span class="remove" @click="removeItem(item.i)" v-if="item.i && isEdit">x</span> --> <!-- <span class="remove" @click="removeItem(item.i)" v-if="item.i && isEdit">x</span> -->
</grid-item> </grid-item>
</grid-layout> </grid-layout>
<el-row style="margin-top: 20px; margin-left: 20px">
<el-button type="primary" @click="getPdf">导 出</el-button>
<el-button @click="cancelDraw">取 消</el-button>
</el-row>
</div> </div>
</template> </template>
<script> <script>
import html2Canvas from "html2canvas";
import JsPDF from "jspdf";
import { GridLayout, GridItem } from "vue-grid-layout"; import { GridLayout, GridItem } from "vue-grid-layout";
import { ledgerRoomList ,getDictList} from "@/api/risk/draw"; import { ledgerRoomList, getDictList } from "@/api/risk/draw";
// 动态添加/删除 // 动态添加/删除
export default { export default {
name: "riskView", name: "riskView",
components: { components: {
GridLayout, GridLayout,
GridItem GridItem,
}, },
data() { data() {
return { return {
...@@ -78,14 +85,14 @@ export default { ...@@ -78,14 +85,14 @@ export default {
isBase: false, isBase: false,
baseName: "", baseName: "",
baseArr: [], baseArr: [],
layoutData: [] layoutData: [],
}; };
}, },
props: { props: {
isView: { isView: {
type: Boolean, type: Boolean,
default: false default: false,
} },
}, },
mounted() { mounted() {
// screenfull.toggle(this.$refs.mapbox); // screenfull.toggle(this.$refs.mapbox);
...@@ -110,6 +117,53 @@ export default { ...@@ -110,6 +117,53 @@ export default {
this.getRoomInfo(); this.getRoomInfo();
}, },
methods: { methods: {
getPdf() {
var title = "四色图";
// html2Canvas(document.querySelector('#pdfDom'), { //这是在界面上设置一个id
//只下载id为pdfDom的内容
html2Canvas(document.querySelector("#gridView"), {
//body是下载整个界面
useCORS: true, //是否尝试使用CORS从服务器加载图像
allowTaint: true,
dpi: 300, //解决生产图片模糊
// width: 490, //canvas宽度
// height: 240, //canvas高度
// x: 0, //x坐标
// y: 0, //y坐标
async: false, //是否异步解析和呈现元素
foreignObjectRendering: true, //是否在浏览器支持的情况下使用ForeignObject渲染
}).then(function (canvas) {
console.log(canvas);
let contentWidth = canvas.width;
let contentHeight = canvas.height;
let pageHeight = (contentWidth / 592.28) * 841.89; // 一页pdf显示html页面生成的canvas高度;
let leftHeight = contentHeight; //未生成pdf的html页面高度
let position = 0; //pdf页面偏移
//a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的宽高
let imgWidth = 595.28;
let imgHeight = (592.28 / contentWidth) * contentHeight;
let pageData = canvas.toDataURL("image/jpeg", 1.0);
let PDF = new JsPDF("", "pt", "a4");
// 有两个高度需要区分，一个是html页面的实际高度，和生成pdf的页面高度(841.89)
//当内容未超过pdf一页显示的范围，无需分页
if (leftHeight < pageHeight) {
PDF.addImage(pageData, "JPEG", 0, 0, imgWidth, imgHeight);
} else {
while (leftHeight > 0) {
PDF.addImage(pageData, "JPEG", 20, position, imgWidth, imgHeight);
leftHeight -= pageHeight;
position -= 841.89;
if (leftHeight > 0) {
PDF.addPage();
}
}
}
PDF.save(title + ".pdf");
});
},
cancelDraw() {
this.$router.go(-1);
},
orientationChange() { orientationChange() {
if (window.orientation === 180 || window.orientation === 0) { if (window.orientation === 180 || window.orientation === 0) {
console.log("竖屏状态！"); console.log("竖屏状态！");
...@@ -179,14 +233,14 @@ export default { ...@@ -179,14 +233,14 @@ export default {
}, },
getRoomInfo() { getRoomInfo() {
let data = { let data = {
floorId: this.$route.params.floorId ? this.$route.params.floorId : "4" floorId: this.$route.params.floorId ? this.$route.params.floorId : "4",
}; };
ledgerRoomList(data) ledgerRoomList(data)
.then(res => { .then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.layout = []; this.layout = [];
this.layoutData = res.data; this.layoutData = res.data;
res.data.forEach(item => { res.data.forEach((item) => {
item.position = JSON.parse(item.position); item.position = JSON.parse(item.position);
item.position.i = item.id; item.position.i = item.id;
item.position.id = item.id; item.position.id = item.id;
...@@ -219,7 +273,7 @@ export default { ...@@ -219,7 +273,7 @@ export default {
// console.log('layout==>>',this.layout) // console.log('layout==>>',this.layout)
} }
}) })
.catch(err => { .catch((err) => {
console.log("err==>>", err); console.log("err==>>", err);
}); });
...@@ -236,11 +290,11 @@ export default { ...@@ -236,11 +290,11 @@ export default {
}, },
// 增加 // 增加
addItem() { addItem() {
if (this.layout.find(item => item.i == "")) { if (this.layout.find((item) => item.i == "")) {
Toast.fail({ Toast.fail({
title: "提示", title: "提示",
forbidClick: true, forbidClick: true,
message: "请先点击确定，保存当前房间信息" message: "请先点击确定，保存当前房间信息",
}); });
return; return;
} }
...@@ -253,11 +307,11 @@ export default { ...@@ -253,11 +307,11 @@ export default {
}, },
// 添加其他 // 添加其他
addOther() { addOther() {
if (this.layout.find(item => item.i == "")) { if (this.layout.find((item) => item.i == "")) {
Toast.fail({ Toast.fail({
title: "提示", title: "提示",
forbidClick: true, forbidClick: true,
message: "请先点击确定，保存当前房间信息" message: "请先点击确定，保存当前房间信息",
}); });
return; return;
} }
...@@ -271,11 +325,11 @@ export default { ...@@ -271,11 +325,11 @@ export default {
//添加基础设施 //添加基础设施
addBase() { addBase() {
if (this.layout.find(item => item.i == "")) { if (this.layout.find((item) => item.i == "")) {
Toast.fail({ Toast.fail({
title: "提示", title: "提示",
forbidClick: true, forbidClick: true,
message: "请先点击确定，保存当前房间信息" message: "请先点击确定，保存当前房间信息",
}); });
return; return;
} }
...@@ -294,7 +348,7 @@ export default { ...@@ -294,7 +348,7 @@ export default {
// console.log('this.layout==>>',this.layout) // console.log('this.layout==>>',this.layout)
}, },
// 调整大小后的事件 // 调整大小后的事件
resizedEvent: function(i, newH, newW) { resizedEvent: function (i, newH, newW) {
this.layOutItem.w = newW; this.layOutItem.w = newW;
this.layOutItem.h = newH; this.layOutItem.h = newH;
// console.log('layOutItem==>>',this.layOutItem) // console.log('layOutItem==>>',this.layOutItem)
...@@ -342,8 +396,8 @@ export default { ...@@ -342,8 +396,8 @@ export default {
this.roomName = value.dictValue; this.roomName = value.dictValue;
} }
this.showPicker = false; this.showPicker = false;
} },
} },
}; };
</script> </script>
...@@ -353,7 +407,7 @@ export default { ...@@ -353,7 +407,7 @@ export default {
} }
.wrap { .wrap {
/* height: 100vh; */ /* height: 100vh; */
width: 100vw; width: 100%;
position: relative; position: relative;
} }
.north { .north {
......
src/views/risk/plan/ledger.vue
View file @ a4aa1936
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="任务名称" prop="name"> <el-form-item label="任务名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<!-- <el-form-item label="任务编号" prop="no">
<el-input
v-model="queryParams.no"
placeholder="请输入任务编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="项目id" prop="projectId">
<el-input
v-model="queryParams.projectId"
placeholder="请输入项目id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="楼栋ids" prop="buildingIds">
<el-input
v-model="queryParams.buildingIds"
placeholder="请输入楼栋ids"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建人员id" prop="createUserId">
<el-input
v-model="queryParams.createUserId"
placeholder="请输入创建人员id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建单位" prop="createDeptId">
<el-input
v-model="queryParams.createDeptId"
placeholder="请输入创建单位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="负责人id" prop="leaderUserId">
<el-input
v-model="queryParams.leaderUserId"
placeholder="请输入负责人id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="执行人员ids" prop="workUserIds">
<el-input <el-input
v-model="queryParams.workUserIds" v-model="queryParams.name"
placeholder="请输入执行人员ids" placeholder="请输入任务名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker clearable
v-model="queryParams.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间">
</el-date-picker>
</el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="planList"
@selection-change="handleSelectionChange"
>
<el-table-column label="序号" align="center"> <el-table-column label="序号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
...@@ -96,29 +48,52 @@ ...@@ -96,29 +48,52 @@
<el-table-column label="创建单位" align="center" prop="createDeptName" /> <el-table-column label="创建单位" align="center" prop="createDeptName" />
<el-table-column label="负责人" align="center" prop="leaderUserName" /> <el-table-column label="负责人" align="center" prop="leaderUserName" />
<el-table-column label="执行人员" align="center" prop="workUserNames" /> <el-table-column label="执行人员" align="center" prop="workUserNames" />
<el-table-column label="开始时间" align="center" prop="startTime" width="180"> <el-table-column
label="开始时间"
align="center"
prop="startTime"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结束时间" align="center" prop="endTime" width="180"> <el-table-column
label="结束时间"
align="center"
prop="endTime"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="status" /> <el-table-column label="状态" align="center" prop="status" />
<el-table-column label="操作" align="center" :show-overflow-tooltip="true"> <el-table-column
label="操作"
align="center"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/risk/plan/ledgerdata/index/' + scope.row.id" class="link-type"> <router-link
<el-button size="mini" type="text" icon="el-icon-view">详情</el-button> :to="'/risk/plan/ledgerdata/index/' + scope.row.id"
class="link-type"
>
<el-button size="mini" type="text" icon="el-icon-view"
>详情</el-button
>
</router-link> </router-link>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <pagination
@pagination="getList" /> v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div> </div>
</template> </template>
...@@ -166,8 +141,7 @@ export default { ...@@ -166,8 +141,7 @@ export default {
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {},
}
}; };
}, },
created() { created() {
...@@ -177,7 +151,7 @@ export default { ...@@ -177,7 +151,7 @@ export default {
/** 查询风险计划列表 */ /** 查询风险计划列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listPlan(this.queryParams).then(response => { listPlan(this.queryParams).then((response) => {
this.planList = response.rows; this.planList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
...@@ -207,7 +181,7 @@ export default { ...@@ -207,7 +181,7 @@ export default {
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null updateTime: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -223,11 +197,10 @@ export default { ...@@ -223,11 +197,10 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1 this.single = selection.length !== 1;
this.multiple = !selection.length this.multiple = !selection.length;
},
}, },
}
}; };
</script> </script>
\ No newline at end of file
src/views/risk/plan/ledgerdata.vue
View file @ a4aa1936
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment