Skip to content

R
rongtong-app
Commit f5d652e4 authored by 杨帆's avatar 杨帆
Browse files
Options

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

parents cf637611 5d4ec285
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1187 additions and 844 deletions
src/router/index.js
View file @ f5d652e4
......@@ -162,7 +162,7 @@ const routes = [{
component: () => import('../views/riskProject/add/addCurrent.vue'),
},
{//新增现状风险
path: '/addPresent ',
path: '/addPresent',
name: 'addPresent',
component: () => import('../views/riskProject/add/addPresent.vue'),
},
......
src/views/drawCanvas/riskView.vue
View file @ f5d652e4
This diff is collapsed.
src/views/riskProject/add/addCurrent.vue
View file @ f5d652e4
......@@ -270,7 +270,7 @@ import { getFun, postFun } from "@/service/table.js";
// postRiskShowMeasures,
// } from "@/service/risk";
export default {
name: "risk-add",
name: "addCurrent",
components: {
LHeader,
},
......@@ -345,9 +345,9 @@ export default {
};
},
created() {
if (this.$route.params.inherentId) {
this.inherentId = this.$route.params.inherentId
this.buildingIds = this.$route.params.buildingId
if (this.$route.params.inherentId || sessionStorage.getItem("inherentId")) {
this.inherentId = this.$route.params.inherentId || sessionStorage.getItem("inherentId")
this.buildingIds = this.$route.params.buildingId || sessionStorage.getItem("buildingId")
this.postReturnEcho();
}
// this.getList();
......
src/views/riskProject/add/addInherent.vue
View file @ f5d652e4
This diff is collapsed.
src/views/riskProject/add/addPresent.vue
View file @ f5d652e4
......@@ -297,7 +297,8 @@
</van-uploader>
</template>
</van-field>
<div v-if="this.$route.params.isView" style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;" >
<!-- v-if="this.$route.params.isView" -->
<div style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;" >
<img src="@/assets/accidentIcon/bookmark.svg" alt="" style="position: relative;top: 32%;transform: translateY(-50%);" >
参考依据
</div>
......@@ -331,8 +332,8 @@
@cancel="showSource = false"
/>
</van-popup>
<div style="margin: 16px 16px 0" v-if="this.$route.params.isView" >
<!-- v-if="this.$route.params.isView" -->
<div style="margin: 16px 16px 0" >
<van-button round block type="info" native-type="submit"
>上报</van-button
>
......@@ -367,7 +368,8 @@
</van-row>
</div>
</van-dialog>
<div v-if="this.$route.params.isView" style="margin: 10px 16px 0px; padding-bottom: 16px">
<!-- v-if="this.$route.params.isView" -->
<div style="margin: 10px 16px 0px; padding-bottom: 16px">
<van-button round block type="warning" @click.native="cancel"
>取消</van-button
>
......@@ -390,35 +392,23 @@ import { getFun, postFun } from "@/service/table.js";
// postRiskShowMeasures,
// } from "@/service/risk";
export default {
name: "risk-add",
name: "addPresent",
components: {
LHeader,
},
activated() {
this.showSetRank = false; // 再次关闭弹出层 以防万一
if (this.$route.params.taskId) {
this.isShowreturnCause = true;
this.text = "风险上报退回";
this.taskId = this.$route.params.taskId;
this.postReturnEcho();
}
this.getList();
this.$bus.$on("riskLevelBus", (res) => {
this.showSetRank = false; // 再次关闭弹出层 以防万一
console.log(Boolean(res));
if (res) {
this.riskRank = res;
} else {
this.setRank = "";
},
beforeRouteEnter(to, from, next){
if(from.name=='addCurrent'){
sessionStorage.setItem('presentForm','')
sessionStorage.setItem('level','')
}
// 销毁一下监听事件 不然会越加越多
this.$bus.$off("riskLevelBus");
});
next()
},
beforeRouteLeave(to, from, next) {
if (to.name != "matrix-grad") {
if (to.name != "riskInherent") {
sessionStorage.setItem('presentForm',JSON.stringify(this.form))
}
next();
},
......@@ -445,15 +435,6 @@ export default {
columnsProjectName: [],
factor: "", //风险因素
showFactor: false,
columnsFactor: [],
messageList: [
{
title:'回显风险源名称',
time:'2022-12-12',
name:'Mr.周',
state:1
}
],
source: "", //风险源
userPrefix: "", //风险源
showSource: false,
......@@ -515,6 +496,12 @@ export default {
this.form.projectId='测试项目'
},
mounted(){
if(sessionStorage.getItem('presentForm')!=''){
this.form=JSON.parse(sessionStorage.getItem('presentForm'))
this.form.level = sessionStorage.getItem('level')
}
},
methods: {
seletFloor(name){
this.$toast.loading({
......@@ -709,27 +696,6 @@ export default {
this.$toast.clear();
},
// 请求表单数据
getList() {
this.$toast.loading({
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0,
});
getFormList("/riskMain/add")
.then((res) => {
this.$toast.clear();
this.columnsProjectName = res.data.projectInformations;
this.columnsFactor = res.data.riskInventories;
this.columnsMainDutyDept = res.data.organizationList;
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试");
});
},
// 请求已退回详情数据
postReturnEcho() {
this.$toast.loading({
......
src/views/riskProject/add/inherentRisks.vue
View file @ f5d652e4
......@@ -33,9 +33,9 @@
<van-col span="15">{{ item.roomName }}</van-col>
</van-row>
</van-col>
<van-col span="7" :style="{ color: item.state == 1 ? '#0069e5' : '#03b615' }">
<!-- <van-col span="7" :style="{ color: item.state == 1 ? '#0069e5' : '#03b615' }">
{{ "●待审批" }}
</van-col>
</van-col> -->
</van-row>
<van-overlay :show="showIndex == index">
<div class="wrapper" @click.stop="showIndex = null">
......@@ -113,8 +113,8 @@ export default {
},
created() {
this.planId = this.$route.params.id || sessionStorage.getItem("planId");
this.buildingId = this.$route.params.buildingId|| sessionStorage.getItem("buildingId");
this.buildingName = this.$route.params.buildingName|| sessionStorage.getItem("buildingName");
this.buildingId = this.$route.params.buildingId || sessionStorage.getItem("buildingId");
this.buildingName = this.$route.params.buildingName || sessionStorage.getItem("buildingName");
this.getRiskList(this.planId);
// this.postList();
},
......@@ -134,36 +134,47 @@ export default {
},
//新增固有风险
performTasks() {
sessionStorage.setItem('buildingId',this.buildingId)
sessionStorage.setItem('planId',this.planId)
sessionStorage.setItem('buildingName',this.buildingName)
sessionStorage.setItem('buildingId', this.buildingId)
sessionStorage.setItem('planId', this.planId)
sessionStorage.setItem('buildingName', this.buildingName)
this.$router.push({
name: "addInherent",
params: {
id: this.active,
planId: this.planId,
buildingId:this.buildingId,
buildingName:this.buildingName
buildingId: this.buildingId,
buildingName: this.buildingName
}
});
},
//任务执行结束
endTasks() {
//toDo
Dialog.confirm({
title: '任务执行结束',
message: '是否任务执行结束',
})
.then(() => {
postFun(
`/risk/plan/submit/${this.planId}/${this.buildingId}`
).then(res => {
console.log(res.msg,'lllll')
Dialog.alert({
title: '任务执行结束',
message: res.msg,
}).then(() => {
// Dialog.alert({
// title: '任务执行结束',
// message: res.msg,
// }).then(() => {
// resolve(res.data);
this.$toast.success(res.msg)
this.$router.push({
name:'riskAssess'
name: 'riskAssess'
})
});
// });
})
})
.catch(() => {
// on cancel
});
},
handadd() {
this.$router.push({
......@@ -240,12 +251,12 @@ export default {
},
async changeFloor() {
let room = await this.roomList(this.value1);
let risk = await this.riskList(this.planId, this.active, this.value1);
let risk = await this.riskList(this.planId, this.buildingId, this.value1, this.value2);
},
async changeRoom() {
let risk = await this.riskList(
this.planId,
this.active,
this.buildingId,
this.value1,
this.value2
);
......@@ -262,16 +273,17 @@ export default {
},
// 详情
goDetail(data) {
sessionStorage.setItem('buildingId',this.buildingId)
sessionStorage.setItem('planId',this.planId)
sessionStorage.setItem('buildingName',this.buildingName)
sessionStorage.setItem('buildingId', this.buildingId)
sessionStorage.setItem('planId', this.planId)
sessionStorage.setItem('buildingName', this.buildingName)
sessionStorage.setItem('inherentId', data.businessId || data.id)
this.$router.push({
name: "addCurrent",
params: {
inherentId: data.businessId || data.id,
planId: this.planId,
buildingId:this.buildingId,
buildingName:this.buildingName
buildingId: this.buildingId,
buildingName: this.buildingName
}
});
this.showIndex = null;
......
src/views/riskProject/add/resultPage.vue
View file @ f5d652e4
......@@ -3,8 +3,8 @@
<LHeader :text="text"></LHeader>
<div class="section">
<p>该次测评风险值为：</p>
<div>
<p style="font-weight: bold;font-size: 20px;">{{ score }}</p>
<div class="resultScore">
<p style="font-weight: bold;font-size: 20px;">{{ this.$route.params.score }}</p>
</div>
<p>本次评估结果评定为：{{ level }}</p>
<van-divider></van-divider>
......@@ -12,10 +12,11 @@
<van-field readonly label="风险发生可能性:" placeholder="一般情况不会发生" />
<van-field readonly label="后果严重程度" placeholder="轻微影响" />
<van-field readonly label="判定标准：" placeholder="见下图" />
<van-image width="90vw" height="auto" :src="require('@/assets/workbench/sst.jpg')" />
</div>
<div style="display: flex;margin: 10px 16px 0px; padding-bottom: 16px">
<van-button block type="info" @click="sureClose">确认本次测评结果</van-button>
<van-button block plain type="info" @click="resetClose">取消</van-button>
<van-button block type="info" @click="sureClose" style="margin-right: 4px;">确认本次测评结果</van-button>
<van-button block plain type="info" @click="resetClose" style="margin-left: 4px;">取消</van-button>
</div>
</div>
......@@ -47,30 +48,30 @@ import LHeader from "@/components/header.vue";
})
},
resetClose(){
this.$router.push({
name:'addInherent',
params:{
level:''
}
})
sessionStorage.setItem('level','')
history.go(-1)
},
sureClose(){
this.$router.push({
name:'addInherent',
params:{
level:this.level
}
})
// this.$emit('',)
sessionStorage.setItem('level',this.level)
history.go(-1)
// this.$router.push({
// name:'addInherent',
// params:{
// level:this.level
// }
// })
}
}
}
</script>
<style lang="less" scoped>
.wrapper{
.wrapper {
width: 100%;
height: 100%;
.section{
.section {
width: 100%;
height: 100%;
padding: 10px;
......@@ -78,5 +79,15 @@ import LHeader from "@/components/header.vue";
background: #fff;
font-size: 14px;
}
.resultScore{
width: 48px;
height: 48px;
background: #ffc600;
text-align: center;
line-height: 48px;
border-radius: 50%;
margin: 0 auto;
}
}
</style>
\ No newline at end of file
src/views/riskProject/add/taskList.vue
View file @ f5d652e4
......@@ -69,8 +69,8 @@
/>
<van-field
readonly
name="projectName"
:value="form.projectName"
name="name"
:value="form.name"
label="任务名称"
input-align="right"
:rules="[{ required: true, message: '任务名称不能为空' }]"
......@@ -113,6 +113,7 @@
/>
<van-field
readonly
clickable
name="workUserNames"
:value="form.workUserNames"
......@@ -169,28 +170,25 @@
justify="space-between"
style="margin-top:10px;"
>
<van-col span="22" @click="toRiskDetail(item)">
<van-col span="20" @click="toRiskDetail(item)">
<van-col span="5">
<van-image
width="46"
height="46"
src="https://img01.yzcdn.cn/vant/cat.jpeg"
src="http://rongtongpc.censoft.com.cn/dev-api/profile/upload/2023/07/08/guyou.png"
/>
<van-image width="46" height="46" :src="item.avatar" />
<!-- <van-image width="46" height="46" :src="item.avatar" /> -->
</van-col>
<van-col span="17">
<van-col span="15">
<van-row gutter="">
<van-col span="9">风险名称：</van-col>
<van-col span="15">{{ item.name }}</van-col>
</van-row>
</van-col>
</van-col>
<van-col span="2">
<van-row
:style="{
color: '#03b615'
}"
>
<van-col span="4">
<van-row type="flex">
详情
<van-icon name="arrow" size="26px" @click="goColorDetail" />
</van-row>
</van-col>
......@@ -561,6 +559,7 @@ export default {
},
//执行任务
performTasks() {
console.log( this.messageList,'LLLL')
sessionStorage.setItem(
"buildingId",
this.messageList.riskBuildingListDtos[0].buildingId
......@@ -642,6 +641,11 @@ export default {
console.log(res.data, "lll");
this.riskList = res.data;
});
}else{
getFun(`/risk/plan/inherent/list/${planId}`).then(res => {
console.log(res.data, "lll");
this.riskList = res.data;
});
}
},
postList(id, buildingId) {
......@@ -744,7 +748,6 @@ export default {
},
//风险清单列表点击
toRiskDetail(item) {
console.log(item, "LLLL");
this.$router.push({
name: "taskDetail",
params: {
......
src/views/riskProject/taskLedger/taskDetail.vue
View file @ f5d652e4
......@@ -39,7 +39,7 @@
</van-row>
<van-row type="flex" style="flex-direction: column;align-items: center;">
<van-col>
<van-image round width="34" height="34" src="https://img01.yzcdn.cn/vant/cat.jpeg" />
<van-image round width="34" height="34" src="http://rongtongpc.censoft.com.cn/dev-api/profile/upload/2023/07/08/guyou.png" />
</van-col>
<van-col>
{{ item.userName }}
......@@ -51,7 +51,7 @@
</div>
</van-tab>
<van-tab title="四色图" name="c">
<drawCanvas />
<drawCanvas :isView="true"/>
</van-tab>
</van-tabs>
</div>
......@@ -104,7 +104,7 @@ export default {
goDetail(item){
console.log(item,'???')
this.$router.push({
name:'addPresent',
name:'taskDetail',
params:{
isView:false,
// buildingId:,
......
vue.config.js
View file @ f5d652e4
......@@ -8,9 +8,10 @@ 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:8080/', //这里是后台的地址
ws: true,
changOrigin: 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