Skip to content

R
rongtong-pc
Commit c1bafa08 authored by kaitly205422@163.com's avatar kaitly205422@163.com
Browse files
Options

新增下载附件填写意见接口

parent 1064ba1a
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 28 deletions
src/api/risk/plan.js
View file @ c1bafa08
......@@ -25,7 +25,14 @@ export function addPlan(data) {
data: data
})
}
// 下载风险计划模板添加意见
export function addAdvise(data) {
return request({
url: '/app-api/risk/advise',
method: 'post',
data: data
})
}
// 修改风险计划
export function updatePlan(data) {
return request({
......@@ -60,7 +67,7 @@ export function riskList(query) {
export function exportRiskList(inherentId) {
return request({
url: '/system/risk/plan/exportWord/riskNotification/'+inherentId,
url: '/system/risk/plan/exportWord/riskNotification/' + inherentId,
method: 'get',
})
}
......@@ -68,7 +75,7 @@ export function exportRiskList(inherentId) {
//项目列表
export function getProjectList(projectName) {
return request({
url: '/system/ledger/project/listByQuery/'+projectName,
url: '/system/ledger/project/listByQuery/' + projectName,
method: 'get',
})
}
......@@ -76,7 +83,7 @@ export function getProjectList(projectName) {
//楼栋列表
export function getBuildingList(projectId) {
return request({
url: '/app-api/risk/plan/building/list/'+projectId,
url: '/app-api/risk/plan/building/list/' + projectId,
method: 'get',
})
}
......@@ -84,7 +91,7 @@ export function getBuildingList(projectId) {
//根据单位id查询用户列表
export function getUserListByDeptId(deptId) {
return request({
url: '/app-api/risk/plan/user/list/'+deptId,
url: '/app-api/risk/plan/user/list/' + deptId,
method: 'get',
})
}
......@@ -93,7 +100,7 @@ export function getUserListByDeptId(deptId) {
export function getInherentById(inherentId) {
return request({
url: '/app-api/risk/plan/inherent/details/'+inherentId,
url: '/app-api/risk/plan/inherent/details/' + inherentId,
method: 'get',
})
}
......@@ -111,7 +118,7 @@ export function getExsitingList(query) {
export function getExistingById(exsitingId) {
return request({
url: '/app-api/risk/plan/existing/details/'+exsitingId,
url: '/app-api/risk/plan/existing/details/' + exsitingId,
method: 'get',
})
}
......
src/assets/map/low.png
View replaced file @ 1064ba1a View file @ c1bafa08
src/assets/map/low.png

5.61 KB | W: | H:

src/assets/map/low.png

5.61 KB | W: | H:

src/assets/map/low.png
src/assets/map/low.png
src/assets/map/low.png
src/assets/map/low.png
  • 2-up
  • Swipe
  • Onion skin
src/views/map/components/map-table.vue
View file @ c1bafa08
......@@ -10,6 +10,16 @@ export default {
default: () => []
}
},
watch: {
tableList(newVal) {
if (newVal.length > 0) {
setTimeout(() => {
this.getHeight();
this.compareH();
}, 500);
}
}
},
data() {
return {
mapTableListHeight: 0,
......@@ -17,12 +27,7 @@ export default {
h: 0,
};
},
mounted() {
setTimeout(() => {
this.getHeight();
this.compareH();
}, 700);
},
methods: {
// 获取map-table-list的高度
getHeight() {
......@@ -36,6 +41,7 @@ export default {
},
// 比较map-table-list高度
compareH() {
console.log(this.mapTableContainerHeight, this.mapTableListHeight);
if (this.mapTableContainerHeight < this.mapTableListHeight) {
// 添加定时器滚动map-table-list-item
setInterval(() => {
......@@ -70,7 +76,7 @@ export default {
}}>
{key.props == 'index' && <div class="serial">{index + 1}</div>}
{key.render && key.render()}
{<span>{item[key.props]}</span>}
{<span title={item[key.props]}>{item[key.props]}</span>}
</div>
})
}
......@@ -102,6 +108,7 @@ export default {
padding: 0;
&-item {
cursor: pointer;
display: flex;
height: 30px;
margin-bottom: 5px;
......@@ -137,12 +144,14 @@ export default {
}
}
.map-table-list-item-value {
width: 30%;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
margin-right: 18px;
margin-right: 12px;
font-weight: bold;
}
......
src/views/map/map-detail.vue
View file @ c1bafa08
......@@ -126,7 +126,6 @@ export default {
components: { mapItemContainer, mapDetailTab, mapTable, drawCanvas },
data() {
return {
formInline: {
position: '地上',
buildingId: '',
......@@ -186,11 +185,12 @@ export default {
{
props: 'riskName',
color: "#fff",
width: '40%'
},
{
props: 'typeName',
color: "rgb(0, 255, 186)",
width: "30%",
width: "20%",
},
{
props: 'levelName',
......@@ -568,13 +568,14 @@ li {
}
.map-detail-draw {
transform: scale(0.55);
transform: scale(0.8);
transform-origin: 0 0;
}
::v-deep .vue-grid-layout {
min-height: auto !important;
padding: 0 !important;
border: none;
}
.map-detail-info-img {
......
src/views/map/map-index.vue
View file @ c1bafa08
......@@ -239,6 +239,11 @@ export default {
accidentEchartsList: [],
// 风险级别统计
levelStaticOptions: {
tooltip: {
formatter: function (params) {
return this.key + ':' + '<br/>' + this.y + '(条)';
}
},
chart: {
type: 'pie',
options3d: {
......@@ -279,6 +284,7 @@ export default {
}
},
series: [{
name: '条',
data: []
}]
},
......@@ -777,6 +783,7 @@ export default {
});
}
});
// var iconUrl = require(`@/assets/map/low.png`);
let boxWidth = 84, setCodeArr = [340000, 140000, 610000, 370300, 371600, 320900, 320900]
if (code != 100000) {
if (setCodeArr.includes(code - '')) { //山西省和陕西省
......@@ -795,8 +802,30 @@ export default {
value: [x.lng - '', x.lat - '', 0],
// symbol: "image://" + require('@/assets/login/user.png'),
itemStyle: {
color: x.riskColor,
color: (x.riskSumNum == 0 && !x.riskColor) ? '#00a0ea' : x.riskColor,
},
// 可在地图展示图片
// label: {
// show: true,
// position: "top",
// distance: -20,
// textStyle: {
// padding: [6, 6],
// backgroundColor: {
// image: iconUrl,
// },
// },
// },
// emphasis: {
// label: {
// show: true,
// textStyle: {
// backgroundColor: {
// image: iconUrl,
// },
// },
// },
// },
borderWidth: 5,
info: x,
tooltip: {
......@@ -881,12 +910,12 @@ export default {
},
{
type: "scatter3D",
symbol: 'circle',
// symbol: 'image://' + require('@/assets/map/circle.jpg'),
symbolSize: 8,
// symbol: 'image://' + require('@/assets/map/circle.jpg'),
coordinateSystem: "geo3D",
data: scatters,
zlevel: 1,
}
],
},
......
src/views/risk/plan/ledgerdata.vue
View file @ c1bafa08
......@@ -168,7 +168,7 @@
<el-table-column label="操作" align="center" prop="describe">
<template slot-scope="scope">
<div>
<el-button size="mini" type="text" icon="el-icon-download" @click="toDown">下载</el-button>
<el-button size="mini" type="text" icon="el-icon-download" @click="toDown(scope.row)">下载</el-button>
</div>
</template>
</el-table-column>
......@@ -184,6 +184,7 @@ import {
riskListInfo,
riskList,
exportRiskList,
addAdvise
} from "@/api/risk/plan";
export default {
data() {
......@@ -236,7 +237,6 @@ export default {
reportList: [{
id: "FXPGBG202403071748JF",
inherentId: "2024-03-07",
}],
InfoList: {},
};
......@@ -248,12 +248,28 @@ export default {
}
},
mounted() {
// console.log(this.$route.params, 'lll')
this.getInfo(this.$route.params.id);
},
methods: {
toDown() {
window.open('http://rongtongpc.censoft.com.cn/dev-api/profile/upload/report/风险评估报告模板.docx');
toDown({ id }) {
this.$prompt('风险管控建议', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputValidator: (value) => {
if (!value) {
return "不能为空";
}
},
inputType: "textarea"
}).then(({ value }) => {
addAdvise({
value,
id
}).then(res => {
window.open('http://rongtongpc.censoft.com.cn/dev-api/profile/upload/report/风险评估报告模板.docx');
})
})
},
downList(planId) {
this.download("/system/risk/plan/exportExcel/InherentList/" + planId, {});
......
vue.config.js
View file @ c1bafa08
......@@ -37,8 +37,8 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: "http://192.168.10.137:8080/",
target: `http://192.168.4.232:8080`, //服务器地址
// target: `http://192.168.15.230:8080`, //晓晋本地地址
// target: `http://192.168.4.232:8080`, //服务器地址
target: `http://192.168.15.230:8080`, //晓晋本地地址
// target: `http://192.168.15.152:8081`, //鲍德本地地址
// target: `http://127.0.0.1:8080`, //本地地址
changeOrigin: true,
......
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