Skip to content

R
rongtong-app
Commit bb4eb4aa authored by yf's avatar yf
Browse files
Options

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

parents 81d1958b c8c956fe
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 621 additions and 1266 deletions
src/views/login.vue
View file @ bb4eb4aa
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<div class="login" :style="{ backgroundImage: `url(${bg})` }"> <div class="login" :style="{ backgroundImage: `url(${bg})` }">
<div class="title"> <div class="title">
<div class="login-logo"> <div class="login-logo">
融通危险源辨识系统 <van-image width="48" height="48" :src="require('@/assets/imgs/logo.png')" />
<span style="margin-left: 6px;">融通危险源辨识系统</span>
</div> </div>
<!-- <div class="login-name">Enterprise Business Data Monitoring</div> --> <!-- <div class="login-name">Enterprise Business Data Monitoring</div> -->
</div> </div>
...@@ -18,30 +19,18 @@ ...@@ -18,30 +19,18 @@
<div class="username-icon"> <div class="username-icon">
<van-image :src="require('@/assets/login/login-username.png')" /> <van-image :src="require('@/assets/login/login-username.png')" />
</div> </div>
<van-field <van-field v-model="username" name="username" label="" placeholder="账号"
v-model="username" :rules="[{ required: true, message: '请填写账号' }]" />
name="username"
label=""
placeholder="账号"
:rules="[{ required: true, message: '请填写账号' }]"
/>
</div> </div>
<div class="passworld-wrap"> <div class="passworld-wrap">
<div class="passworld-icon"> <div class="passworld-icon">
<van-image :src="require('@/assets/login/login-passworld.png')" /> <van-image :src="require('@/assets/login/login-passworld.png')" />
</div> </div>
<van-field <van-field v-model="password" type="password" name="password" placeholder="密码"
v-model="password" :rules="[{ required: true, message: '请填写密码' }]" />
type="password"
name="password"
placeholder="密码"
:rules="[{ required: true, message: '请填写密码' }]"
/>
</div> </div>
<div style="margin: 16px;"> <div style="margin: 16px;">
<van-button round block type="info" native-type="submit" <van-button round block type="info" native-type="submit">登录</van-button>
>登录</van-button
>
</div> </div>
</van-form> </van-form>
</div> </div>
...@@ -50,9 +39,9 @@ ...@@ -50,9 +39,9 @@
</template> </template>
<script> <script>
import { getFun,postFun } from '@/service/table' import { getFun, postFun } from '@/service/table'
import { setToken } from '@/utils/auth' import { setToken } from '@/utils/auth'
import { setUserInfo ,getUserInfo, getLocalUserInfo, setLocalUserInfo} from '@/utils/userInfo' import { setUserInfo, getUserInfo, getLocalUserInfo, setLocalUserInfo } from '@/utils/userInfo'
//引入 //引入
const Base64 = require("js-base64").Base64 const Base64 = require("js-base64").Base64
export default { export default {
...@@ -64,54 +53,54 @@ export default { ...@@ -64,54 +53,54 @@ export default {
password: "" password: ""
}; };
}, },
mounted(){ mounted() {
let height= document.documentElement.clientHeight; //获取当前可视区域的高度 let height = document.documentElement.clientHeight; //获取当前可视区域的高度
document.getElementsByClassName('login')[0].style.height= height + 'px'//给根布局设置高度 document.getElementsByClassName('login')[0].style.height = height + 'px'//给根布局设置高度
// 判断localStorage中是否有用户信息 // 判断localStorage中是否有用户信息
if(getLocalUserInfo()){ if (getLocalUserInfo()) {
this.username = getLocalUserInfo().loginName this.username = getLocalUserInfo().loginName
// 获取解密后的密码 // 获取解密后的密码
// console.log(Base64.decode(getLocalUserInfo().loginPassword)); // base64解密 // console.log(Base64.decode(getLocalUserInfo().loginPassword)); // base64解密
} }
}, },
methods: { methods: {
onSubmit(values) { onSubmit(values) {
this.$toast.loading({ this.$toast.loading({
message:'登录中...', message: '登录中...',
forbidClick: true, forbidClick: true,
loadingType: 'spinner', loadingType: 'spinner',
duration: 0 duration: 0
}) })
postFun('/login',values).then((Response)=>{ postFun('/login', values).then((Response) => {
if(Response.code==200){ if (Response.code == 200) {
this.$toast.clear() this.$toast.clear()
// setLocalUserInfo(user) // setLocalUserInfo(user)
setToken(Response.token) setToken(Response.token)
getFun('/getInfo').then((Response2)=>{ getFun('/getInfo').then((Response2) => {
console.log('%c [ Response2 ]-89', 'font-size:13px; background:pink; color:#bf2c9f;', Response2) console.log('%c [ Response2 ]-89', 'font-size:13px; background:pink; color:#bf2c9f;', Response2)
var userInfo={ var userInfo = {
...Response2.user ...Response2.user
}
/* 存储用户信息 */
setUserInfo(userInfo)
// if(!Response2.data.initializePassword){
// this.$router.push('/save-workbench')
// }else{
// this.$router.push('/reset-pas-two')
// }
this.$router.push('/save-workbench')
})
/* 存储用户信息 */
}else{
this.$toast.clear()
this.$toast.fail({
message:Response.msg,
duration: 2000
})
} }
}) /* 存储用户信息 */
setUserInfo(userInfo)
// if(!Response2.data.initializePassword){
// this.$router.push('/save-workbench')
// }else{
// this.$router.push('/reset-pas-two')
// }
this.$router.push('/save-workbench')
})
/* 存储用户信息 */
} else {
this.$toast.clear()
this.$toast.fail({
message: Response.msg,
duration: 2000
})
}
})
} }
} }
}; };
...@@ -120,28 +109,34 @@ export default { ...@@ -120,28 +109,34 @@ export default {
/* @import url(); 引入css类 */ /* @import url(); 引入css类 */
.login { .login {
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
background-attachment: fixed; background-attachment: fixed;
height: 100vh; height: 100vh;
overflow: hidden; overflow: hidden;
.title{
.title {
padding-top: 22%; padding-top: 22%;
.login-logo {
margin: 0 auto; .login-logo {
font-size: 27px; margin: 0 auto;
text-align: center; font-size: 26px;
color: white; text-align: center;
font-weight: bolder; color: white;
} font-weight: bolder;
.login-name { display: flex;
width: 100%; justify-content: center;
text-align: center; align-items: center;
margin-top: 20px; }
color: #fafbfe;
font-size: 18px; .login-name {
} width: 100%;
text-align: center;
margin-top: 20px;
color: #fafbfe;
font-size: 18px;
}
} }
.con { .con {
width: 345px; width: 345px;
height: 340px; height: 340px;
...@@ -150,22 +145,27 @@ export default { ...@@ -150,22 +145,27 @@ export default {
box-sizing: border-box; box-sizing: border-box;
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
.hello { .hello {
color: #004fb1; color: #004fb1;
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;
} }
.welcome { .welcome {
margin: 15px 0; margin: 15px 0;
color: #7795e0; color: #7795e0;
span { span {
color: #71aaf2; color: #71aaf2;
} }
} }
.login-form { .login-form {
.username-wrap { .username-wrap {
position: relative; position: relative;
border-bottom: 1px solid #d2dcf5; border-bottom: 1px solid #d2dcf5;
.username-icon { .username-icon {
width: 20px; width: 20px;
position: absolute; position: absolute;
...@@ -173,17 +173,21 @@ export default { ...@@ -173,17 +173,21 @@ export default {
top: 9px; top: 9px;
z-index: 100; z-index: 100;
} }
/deep/ .van-field__body { /deep/ .van-field__body {
padding-left: 20px; padding-left: 20px;
box-sizing: border-box; box-sizing: border-box;
} }
/deep/ .van-field__error-message { /deep/ .van-field__error-message {
padding-left: 20px; padding-left: 20px;
} }
} }
.passworld-wrap { .passworld-wrap {
position: relative; position: relative;
border-bottom: 1px solid #d2dcf5; border-bottom: 1px solid #d2dcf5;
.passworld-icon { .passworld-icon {
width: 20px; width: 20px;
position: absolute; position: absolute;
...@@ -191,10 +195,12 @@ export default { ...@@ -191,10 +195,12 @@ export default {
top: 9px; top: 9px;
z-index: 100; z-index: 100;
} }
/deep/ .van-field__body { /deep/ .van-field__body {
padding-left: 20px; padding-left: 20px;
box-sizing: border-box; box-sizing: border-box;
} }
/deep/ .van-field__error-message { /deep/ .van-field__error-message {
padding-left: 20px; padding-left: 20px;
} }
......
src/views/riskProject/add/addCurrent.vue
View file @ bb4eb4aa
...@@ -24,6 +24,10 @@ ...@@ -24,6 +24,10 @@
<van-field readonly required name="name" v-model="form.name" label="风险源名称" placeholder="请输入" <van-field readonly required name="name" v-model="form.name" label="风险源名称" placeholder="请输入"
:rules="[{ required: true, message: '风险源名称不能为空' }]" @click="seletSource()" /> :rules="[{ required: true, message: '风险源名称不能为空' }]" @click="seletSource()" />
<van-field readonly required name="name" v-model="form.name" label="风险点类型" placeholder="请输入"
:rules="[{ required: true, message: '风险点类型不能为空' }]" @click="seletSource()" />
<van-field readonly required name="name" v-model="form.name" label="安全警示标志" placeholder="请输入"
:rules="[{ required: true, message: '安全警示标志不能为空' }]" @click="seletSource()" />
<van-field v-model="form.factor" required name="factor" label="风险因素" placeholder="请选择" <van-field v-model="form.factor" required name="factor" label="风险因素" placeholder="请选择"
@click="seletFactor('factor')" :rules="[{ required: true, message: '风险因素不能为空' }]" /> @click="seletFactor('factor')" :rules="[{ required: true, message: '风险因素不能为空' }]" />
...@@ -48,7 +52,6 @@ ...@@ -48,7 +52,6 @@
<van-uploader @delete="deleteFile(...arguments, 'uploaderImg')" multiple :max-count="5" <van-uploader @delete="deleteFile(...arguments, 'uploaderImg')" multiple :max-count="5"
upload-text="最多上传五个" v-model="uploaderImg"> upload-text="最多上传五个" v-model="uploaderImg">
<template slot="default"> <template slot="default">
<!-- 11111111111 -->
<div style=" <div style="
width: 2.13333rem; width: 2.13333rem;
height: 2.13333rem; height: 2.13333rem;
...@@ -78,7 +81,6 @@ ...@@ -78,7 +81,6 @@
<van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="measuresProjectFile" <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="measuresProjectFile"
accept="file" result-type="file" @delete="deleteFile(...arguments, 'measuresProjectFile')"> accept="file" result-type="file" @delete="deleteFile(...arguments, 'measuresProjectFile')">
<template slot="default"> <template slot="default">
<!-- 11111111111 -->
<div style=" <div style="
width: 2.13333rem; width: 2.13333rem;
height: 2.13333rem; height: 2.13333rem;
...@@ -96,21 +98,32 @@ ...@@ -96,21 +98,32 @@
</van-uploader> </van-uploader>
</template> </template>
</van-field> </van-field>
<!-- <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>
<van-field v-model="form.measuresAdministration" name="measuresAdministration" label="" type="textarea"
rows="3" autosize placeholder="请输入" /> -->
<div <div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"> style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;">
<img src="@/assets/accidentIcon/bookmark.svg" alt="" <img src="@/assets/accidentIcon/bookmark.svg" alt=""
style="position: relative;top: 32%;transform: translateY(-50%);" /> style="position: relative;top: 32%;transform: translateY(-50%);" />
管理措施 应采取的管控措施
</div> </div>
<van-field v-model="form.measuresAdministration" name="measuresAdministration" label="管理措施" <van-field v-model="form.takenMeasuresAdministration" name="takenMeasuresAdministration" label=""
type="textarea" rows="1" autosize placeholder="请输入" /> type="textarea" rows="3" autosize placeholder="请输入" />
<van-field required v-model="form.measuresDeptId" name="measuresDeptId" label="管控责任单位 " type="textarea"
rows="1" autosize placeholder="请输入" />
<van-field required v-model="form.measuresUserId" name="measuresUserId" label="管控责任人 " type="textarea"
rows="1" autosize placeholder="请输入" />
<van-field name="measuresAdministrationFile[]" label=" "> <van-field name="measuresAdministrationFile[]" label=" ">
<template #input> <template #input>
<van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="measuresAdministrationFile" <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="measuresAdministrationFile"
accept="file" result-type="file" accept="file" result-type="file"
@delete="deleteFile(...arguments, 'measuresAdministrationFile')"> @delete="deleteFile(...arguments, 'measuresAdministrationFile')">
<template slot="default"> <template slot="default">
<!-- 11111111111 -->
<div style=" <div style="
width: 2.13333rem; width: 2.13333rem;
height: 2.13333rem; height: 2.13333rem;
...@@ -128,6 +141,44 @@ ...@@ -128,6 +141,44 @@
</van-uploader> </van-uploader>
</template> </template>
</van-field> </van-field>
<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>
<van-field required v-model="form.hazardSourceName" name="hazardSourceName" label="危险源名称 "
type="textarea" rows="1" autosize placeholder="请输入" />
<van-field required v-model="form.majorHazardSource" name="majorHazardSource" label="是否存在重大危险源 "
type="textarea" rows="1" autosize placeholder="请输入" />
<van-field required v-model="form.measuresUserId" name="measuresUserId" label="重大危险源描述" type="textarea"
rows="3" autosize placeholder="请输入" />
<van-field v-model="form.majorHazardSourceDescription" name="majorHazardSourceDescription" label="应急措施"
type="textarea" rows="1" autosize placeholder="请输入" />
<van-field name="measuresEmergencyFile[]" label=" ">
<template #input>
<van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="measuresEmergencyFile"
accept="file" result-type="file"
@delete="deleteFile(...arguments, 'measuresEmergencyFile')">
<template slot="default">
<div style="
width: 2.13333rem;
height: 2.13333rem;
background: #f7f8fa;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
">
<img src="@/assets/upload/file.png" alt=""
style="width: 0.64rem; height: 0.64rem" />
<span class="van-uploader__upload-text">最多上传五个</span>
</div>
</template>
</van-uploader>
</template>
</van-field>
<div <div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"> style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;">
<img src="@/assets/accidentIcon/bookmark.svg" alt="" <img src="@/assets/accidentIcon/bookmark.svg" alt=""
...@@ -166,17 +217,8 @@ ...@@ -166,17 +217,8 @@
style="position: relative;top: 32%;transform: translateY(-50%);" /> style="position: relative;top: 32%;transform: translateY(-50%);" />
参考依据 参考依据
</div> </div>
<!-- <van-field <van-field readonly required clickable name="trouble" :value="form.trouble" label="参考依据"
readonly placeholder="请选择" @click="showTrouble = true" :rules="[{ required: true, message: '事故类型不能为空' }]" />
required
clickable
name="trouble"
:value="form.trouble"
label="参考依据"
placeholder="请选择"
@click="showTrouble = true"
:rules="[{ required: true, message: '事故类型不能为空' }]"
/> -->
<div style="margin: 16px 16px 0"> <div style="margin: 16px 16px 0">
<van-button round block type="info" native-type="submit">提交</van-button> <van-button round block type="info" native-type="submit">提交</van-button>
...@@ -382,8 +424,8 @@ export default { ...@@ -382,8 +424,8 @@ export default {
}, },
methods: { methods: {
timestampToTimes(time) { timestampToTimes(time) {
return timestampToTime(new Date(time), "DT2", true); return timestampToTime(new Date(time), "DT2", true);
}, },
tabList(value) { tabList(value) {
console.log( console.log(
"%c [ value ]-527", "%c [ value ]-527",
...@@ -485,9 +527,9 @@ export default { ...@@ -485,9 +527,9 @@ export default {
buildingId: this.buildingId, buildingId: this.buildingId,
planId: this.inherentId, planId: this.inherentId,
floorId: this.form.floorId, floorId: this.form.floorId,
floorName:this.form.floorName, floorName: this.form.floorName,
projectName:this.form.projectName, projectName: this.form.projectName,
projectId:this.form.projectId, projectId: this.form.projectId,
roomName: this.form.roomName, roomName: this.form.roomName,
roomId: this.form.roomId roomId: this.form.roomId
} }
......
src/views/riskProject/add/addInherent.vue
View file @ bb4eb4aa
This diff is collapsed.
src/views/riskProject/add/addPresent.vue
View file @ bb4eb4aa
This diff is collapsed.
src/views/riskProject/add/index.vue
View file @ bb4eb4aa
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
<van-field <van-field
required required
clickable
name="projectName" name="projectName"
:value="form.projectName" :value="form.projectName"
label="关联项目" label="关联项目"
...@@ -85,7 +84,6 @@ ...@@ -85,7 +84,6 @@
</div> </div>
<van-field <van-field
required required
clickable
name="deptName" name="deptName"
:value="form.deptName" :value="form.deptName"
label="评估小组选择" label="评估小组选择"
...@@ -96,7 +94,6 @@ ...@@ -96,7 +94,6 @@
<van-field <van-field
required required
clickable
name="leaderUserName" name="leaderUserName"
:value="form.leaderUserName" :value="form.leaderUserName"
label="评估小组组长" label="评估小组组长"
...@@ -106,7 +103,6 @@ ...@@ -106,7 +103,6 @@
/> />
<van-field <van-field
clickable
required required
name="workUserNames" name="workUserNames"
:value="form.workUserNames" :value="form.workUserNames"
...@@ -127,7 +123,6 @@ ...@@ -127,7 +123,6 @@
/> />
<van-field <van-field
clickable
:value="form.endTime" :value="form.endTime"
required required
name="endTime" name="endTime"
......
src/views/riskProject/add/taskList.vue
View file @ bb4eb4aa
...@@ -178,9 +178,9 @@ ...@@ -178,9 +178,9 @@
<van-col span="20"> <van-col span="20">
<van-col span="5"> <van-col span="5">
<van-image <van-image
width="46" width="58"
height="74" height="58"
src="http://rongtongpc.censoft.com.cn/dev-api/profile/upload/2023/07/08/guyou.png" :src="require('@/assets/imgs/inherentOrange.png')"
/> />
<!-- <van-image width="46" height="46" :src="item.avatar" /> --> <!-- <van-image width="46" height="46" :src="item.avatar" /> -->
</van-col> </van-col>
......
src/views/riskProject/taskLedger/taskDetail.vue
View file @ bb4eb4aa
...@@ -104,13 +104,13 @@ export default { ...@@ -104,13 +104,13 @@ export default {
return timestampToTime(new Date(time), "DT1", true); return timestampToTime(new Date(time), "DT1", true);
}, },
goDetail(item){ goDetail(item){
// sessionStorage.setItem('inherntId',this.inherentId) sessionStorage.setItem('inherntId',this.inherentId)
// this.$router.push({ this.$router.push({
// name:'presentDetail', name:'presentDetail',
// params:{ params:{
// isView:false, isView:false,
// } }
// }) })
}, },
onClick(name){ onClick(name){
if(name==='a'){ if(name==='a'){
......
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