Skip to content

R
rongtong-app
Commit 5a83b0c8 authored by p-wanping.song's avatar p-wanping.song
Browse files
Options

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

parents d11786e8 4a9c431e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2735 additions and 1095 deletions
src/views/drawCanvas/riskView.vue
View file @ 5a83b0c8
......@@ -8,6 +8,9 @@
<span class="iconRight" v-show="isViews"></span>
</header>
</van-sticky>
<div class="north">
<img src="../../assets/imgs/north.png" alt="">
</div>
<grid-layout :layout.sync="layout"
:col-num="colNum"
:row-height="30"
......@@ -16,7 +19,7 @@
:prevent-collision="false"
:preventCollision="true"
>
<grid-item v-for="item in layout"
<grid-item v-for="(item) in layout"
:static="item.static"
:x="item.x"
:y="item.y"
......@@ -31,12 +34,15 @@
:style="{'backgroundColor':item.c,'border':(item.type == 'thorough'? 'none !important':'')}"
>
<span class="text" :class="item.w>(item.h*5) ? '': 'rowText'">{{item.name}}</span>
<span class="remove" @click="removeItem(item.i)" v-if="!item.i">x</span>
<span class="remove" @click="removeItem(item.i)" v-if="showHeader">x</span>
<!-- <span class="remove" @click="removeItem(item.i)" v-if="item.i && isEdit">x</span> -->
</grid-item>
</grid-layout>
<div class="setBtns">
<van-button @click="addItem" type="info" size="mini" v-if="!isViews">添加房间</van-button>
<van-button @click="addOther" type="info" size="mini" v-if="!isViews">添加其他</van-button>
<van-button @click="addBase" type="info" size="mini" v-if="!isViews">添加基础设施</van-button>
<!-- <van-button @click="editItem" type="info" size="mini" v-if="!isViews">修改</van-button> -->
<van-grid direction="horizontal" :column-num="2" class="footer" v-if="isViews">
风险等级图例:
<span class="riskTab type1"></span>重大风险
......@@ -110,6 +116,7 @@ export default {
isViews:false,// true:查看页面； false: 添加页面
showHeader:true,
isRoom:true,//是否为添加房间
layoutData:[]
}
},
props:{
......@@ -123,6 +130,7 @@ export default {
// this.$nextTick(() => {
// this.rotateBox();
// });
console.log('floorId==>>',this.$route.params.floorId )
if (this._props.isView) {
console.log('作为组件传值==>>',)
this.isViews = true
......@@ -210,11 +218,15 @@ export default {
getFun('/ledger/room/list',data).then((res) => {
if (res.code == 200) {
this.layout = []
res.rows.forEach((item) => {
this.layoutData = res.data
res.data.forEach((item) => {
item.position = JSON.parse(item.position)
item.position.i = item.id
item.position.id = item.id
if (!this.showHeader) {
item.position.isDraggable = false
item.position.isResizable = false
}
if (!this.isViews || item.position.type == 'thorough') { //添加页面不显示颜色
item.position.c = '#e6e5e5'
}else{
......@@ -281,6 +293,11 @@ export default {
this.layout.splice(index, 1);
return
}
this.$dialog.confirm({
title: '提示',
message: '是否删除',
})
.then(() => {
postFun('/ledger/room/delete/'+val).then((res) => {
if (res.code == 200) {
Toast.success('删除成功');
......@@ -289,45 +306,53 @@ export default {
}).catch((err) => {
console.log('err==>>',err)
})
})
.catch(() => {
// on cancel
});
},
//添加基础设施
addBase(){
},
// 移动后的事件
movedEvent(i, newX, newY){
this.layOutItem.x = newX
this.layOutItem.y = newY
console.log('layOutItem==>>',this.layOutItem)
// console.log('layOutItem==>>',this.layOutItem)
// console.log('this.layout==>>',this.layout)
},
// 调整大小后的事件
resizedEvent: function(i, newH, newW){
this.layOutItem.w = newW
this.layOutItem.h = newH
console.log('layOutItem==>>',this.layOutItem)
// console.log('layOutItem==>>',this.layOutItem)
// console.log('this.layout==>>',this.layout)
},
//关闭
close(){
history.go(-1)
},
// 确定 保存房间信息
//edger/room/update/batch
// 确定 执行批量编辑保存
confim(){
if (this.roomName == '') {
Toast.fail({
title: '提示',
forbidClick: true,
message: '请先添加房间！',
// if (this.roomName == '') {
// Toast.fail({
// title: '提示',
// forbidClick: true,
// message: '请先添加房间！',
// })
// return
// }
let data = this.layoutData
this.layoutData.forEach((item) => {
item.position = JSON.stringify(item.position)
})
return
}
let data = {
floorId: this.$route.params.floorId ? this.$route.params.floorId : '18',
name:this.roomName,
position: JSON.stringify(this.layOutItem),
roomType: this.isRoom ? this.roomType : '9999',
}
postFun('/ledger/room/save', data).then((res) => {
console.log('data==>>',data)
postFun('/ledger/room/update/batch', data).then((res) => {
if (res.code == 200) {
Toast.success('提交成功');
Toast.success('保存成功');
this.getRoomInfo()
this.roomType = ''
this.roomName = ''
}
}).catch((err) => {
console.log('err==>>',err)
......@@ -350,13 +375,29 @@ export default {
h: 3,
i: '',
name: this.roomName,
c: '#0091EA',
c: '#e6e5e5',
type:this.isRoom ? this.roomType : 'thorough',
isDraggable:true,
isResizable:true
}
this.layout.push(this.layOutItem)
console.log('layOutItem==>>',this.layOutItem)
// console.log('layOutItem==>>',this.layOutItem)
let data = {
floorId: this.$route.params.floorId ? this.$route.params.floorId : '18',
name:this.roomName,
position: JSON.stringify(this.layOutItem),
roomType: this.isRoom ? this.roomType : '9999',
}
postFun('/ledger/room/save', data).then((res) => {
if (res.code == 200) {
// Toast.success('保存成功');
this.getRoomInfo()
this.roomType = ''
this.roomName = ''
}
}).catch((err) => {
console.log('err==>>',err)
})
},
cancelDialog(){
this.roomType = ''
......@@ -379,6 +420,17 @@ export default {
width: 100vw;
position: relative;
}
.north{
position: absolute;
display: inline-block;
top: 1.5rem;
right: 0.5rem;
z-index: 999;
}
.north img{
width: 15px;
height: 30px;
}
.footer{
/* position: fixed; */
/* left: 0; */
......
src/views/riskProject/add/addCurrent.vue
View file @ 5a83b0c8
This diff is collapsed.
src/views/riskProject/add/addInherent.vue
View file @ 5a83b0c8
......@@ -256,8 +256,8 @@
应采取的管控措施
</div>
<van-field
v-model="form.takenMeasuresAdministration"
name="takenMeasuresAdministration"
v-model="form.measuresAdministration"
name="measuresAdministration"
label=""
type="textarea"
rows="3"
......@@ -608,6 +608,7 @@
@cancel="showTrouble = false"
/>
</van-popup>
<div style="margin: 16px 16px 0">
<van-button round block type="info" native-type="submit"
>提交</van-button
......@@ -627,7 +628,6 @@ import LHeader from "@/components/header.vue";
import selectDept from "@/components/selectDept/index.vue";
import SelectList from "@/components/selectList.vue";
import selectFloor from "@/components/selectFloor.vue";
// import selectPeople from "@/views/riskTask/selectPeople/index.vue";
import { getUserInfo, getLocalUserInfo } from "@/utils/userInfo";
import { getFun, postFun } from "@/service/table.js";
......@@ -941,6 +941,13 @@ export default {
}
});
},
//风险点
clickRiskDot(){
},
// //后果严重程度
// getConsequence(){
// getFun(`/risk/plan/matrix/${type}/list`).then(res=>{
closeSlectfloor() {
this.ShowfloorList = false;
......
src/views/riskProject/add/addPresent.vue
View file @ 5a83b0c8
This diff is collapsed.
src/views/riskProject/add/inherentRisks.vue
View file @ 5a83b0c8
......@@ -63,9 +63,13 @@
<van-button round type="primary" @click="goDetail(item)"
>编辑</van-button
>
<!-- <van-button round type="info" @click="goConfirm(item)" v-show="active==0"
>确认</van-button
> -->
<van-button
round
type="danger"
@click="delInherent(item)"
v-show="active == 0"
>删除</van-button
>
</div>
</van-overlay>
</van-cell-group>
......@@ -158,6 +162,18 @@ export default {
// this.postList();
},
methods: {
delInherent() {
Dialog.confirm({
title: "删除固有风险",
message: "是否确认删除？"
})
.then(() => {
// on confirm
})
.catch(() => {
// on cancel
});
},
timestampToTimes(time) {
return timestampToTime(new Date(time), "DT2", true);
},
......
src/views/riskProject/add/taskList.vue
View file @ 5a83b0c8
......@@ -170,40 +170,50 @@
:key="index"
>
<van-row
class="list-row"
type="flex"
justify="space-between"
style="margin-top:10px;"
@click="toRiskDetail(item)"
>
<van-col span="20">
<van-col span="5">
<van-col span="5" style="line-height: 9;">
<van-image
width="58"
height="58"
:src="require('@/assets/imgs/inherentOrange.png')"
:src="(item.level == '较大风险' ?
require('@/assets/imgs/redInherent.png'):item.level == '较小风险'?
require('@/assets/imgs/blueInherent.png'):require('@/assets/imgs/inherentOrange.png')
)"
/>
<!-- <van-image width="46" height="46" :src="item.avatar" /> -->
</van-col>
<van-col span="15">
<van-col span="17">
<van-row gutter="">
<van-col span="9">风险名称：</van-col>
<van-col span="15">{{ item.name }}</van-col>
<van-col span="9" style="font-weight: bold;color:#000;">风险名称：</van-col>
<van-col span="15" style="color: #606266;">{{ item.name }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="9">风险等级：</van-col>
<van-col span="15">{{ item.level }}</van-col>
<van-col span="9" style="font-weight: bold;color:#000;">风险等级：</van-col>
<van-col span="15" style="color: #606266;">{{ item.level }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="9">上报时间：</van-col>
<van-col span="15">{{ timestampToTimes(item.createTime, "DT2") }}</van-col>
<van-col span="9" style="font-weight: bold;color:#000;">上报时间：</van-col>
<van-col span="15" style="color: #606266;">{{ timestampToTimes(item.createTime, "DT2") }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="9" style="font-weight: bold;color:#000;">所属房间：</van-col>
<van-col span="15" style="color: #606266;">{{ item.buildingName + item.floorName + item.roomName }}</van-col>
</van-row>
</van-col>
</van-col>
<van-col span="4">
<van-row type="flex">
<van-col span="4" class="list-right">
<van-tag plain type="primary">详情<van-icon name="arrow" size="12px" /></van-tag>
<!-- <van-row type="flex">
详情
<van-icon name="arrow" size="26px" />
</van-row>
</van-row> -->
</van-col>
</van-row>
</van-cell-group>
......@@ -810,6 +820,13 @@ p {
line-height: 0.64rem;
}
}
.list-row{
position: relative;
}
.list-right{
position: absolute;
right: 0;
}
.journal-wrap {
position: relative;
......
src/views/riskProject/assess/index.vue
View file @ 5a83b0c8
......@@ -26,7 +26,7 @@
<van-col span="17">
<van-row gutter="">
<van-col span="9">创建人：</van-col>
<van-col span="15">{{ item.leaderUserName }}</van-col>
<van-col span="15">{{ item.createUserName }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="9">发起时间：</van-col>
......
vue.config.js
View file @ 5a83b0c8
......@@ -8,11 +8,11 @@ module.exports = {
//以上的ip和端口是我们本机的;下面为需要跨域的
proxy: { //配置跨域
'/app-api': {
// target: 'http://192.168.4.232:8080/', //这里是后台的地址
target: 'http://192.168.4.232:8080/', //这里是后台的地址
// target: 'http://192.168.15.124:8080/', //这里是杨帆的地址
// target: 'http://192.168.10.137:8080/', //这里是昊哥的地址
// target: 'http://192.168.10.36:8080/', //这里是昊哥的地址
target: 'http://localhost:8081/', //这里是后台的地址
// target: 'http://localhost:8081/', //这里是后台的地址
ws: true,
changOrigin: true, //允许跨域
// logLevel: 'debug', // 显示代理调试信息
......
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