Skip to content

R
rongtong-app
Commit 3369fe2a authored by wei's avatar wei
Browse files
Options

字段

parent cc423135
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 54 deletions
src/views/riskProject/add/addInherent.vue
View file @ 3369fe2a
......@@ -96,16 +96,33 @@
<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 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="1"
<van-field v-model="form.measuresAdministration" name="measuresAdministration" label="" type="textarea" rows="3"
autosize placeholder="请输入" />
<van-field name="measuresAdministrationFile[]" label=" ">
<van-field readonly required clickable name="trouble" :value="form.trouble" label="管控责任单位" placeholder="请选择"
@click="showTrouble = true" :rules="[{ required: true, message: '管控责任单位不能为空' }]" />
<van-field readonly required clickable name="trouble" :value="form.trouble" label="管控责任人" placeholder="请选择"
@click="showTrouble = true" :rules="[{ required: true, message: '管控责任人不能为空' }]" />
<!-- <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="1"
autosize placeholder="请输入" />
<!-- <van-field name="measuresAdministrationFile[]" label=" ">
<template #input>
<van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="measuresAdministrationFile" accept="file"
result-type="file" @delete="deleteFile(...arguments, 'measuresAdministrationFile')">
<template slot="default">
<!-- 11111111111 -->
<div style="
width: 2.13333rem;
height: 2.13333rem;
......@@ -121,7 +138,14 @@
</template>
</van-uploader>
</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.measuresEmergency" name="measuresEmergency" label="" type="textarea" rows="3" autosize
placeholder="请输入" />
<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%);" />
......@@ -134,16 +158,15 @@
<van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="measuresEmergencyFile" accept="file"
result-type="file" @delete="deleteFile(...arguments, 'measuresEmergencyFile')">
<template slot="default">
<!-- 11111111111 -->
<div style="
width: 2.13333rem;
height: 2.13333rem;
background: #f7f8fa;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
">
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>
......@@ -156,17 +179,8 @@
style="position: relative;top: 32%;transform: translateY(-50%);" />
参考依据
</div>
<!-- <van-field
readonly
required
clickable
name="trouble"
:value="form.trouble"
label="参考依据"
placeholder="请选择"
@click="showTrouble = true"
:rules="[{ required: true, message: '事故类型不能为空' }]"
/> -->
<van-field readonly required clickable name="trouble" :value="form.trouble" label="参考依据" placeholder="请选择"
@click="showTrouble = true" :rules="[{ required: true, message: '事故类型不能为空' }]" />
<van-dialog v-model="showGradeDialog" title="风险评测配置" :show-cancel-button="false" :show-confirm-button="false">
<div class="dialogContain">
<van-collapse v-model="activeNames">
......@@ -387,12 +401,12 @@ export default {
this.getFloor()
this.getFXYS()
this.getZSGLX()
},
methods: {
renameKeyInTree(data, oldKey, newKey) {
let arr = data.map(item => {
let arr = data.map(item => {
const newItem = { ...item };
if (item.hasOwnProperty(oldKey)) {
......@@ -407,7 +421,7 @@ export default {
}
return newItem;
});
return arr;
},
getFloor() {
......@@ -415,9 +429,9 @@ export default {
.then(res => {
// this.$toast.clear();
// this.showSource = true;
let newArr = this.renameKeyInTree(res.data,'name','text')
let newArr = this.renameKeyInTree(res.data, 'name', 'text')
this.floorSource = newArr;
})
.catch(() => {
this.$toast.fail("加载失败,请稍后再试");
......
src/views/riskProject/add/addPresent.vue
View file @ 3369fe2a
......@@ -19,11 +19,11 @@
<van-field required name="name" v-model="form.name" label="风险源名称" placeholder="请输入"
:rules="[{ required: true, message: '风险源名称不能为空' }]" />
<van-field readonly v-model="form.factor" required name="factor" label="风险因素" placeholder="请选择"
<van-field readonly v-model="form.factor" required name="factor" label="风险因素" placeholder="请选择"
@click="seletFactor('factor')" :rules="[{ required: true, message: '风险因素不能为空' }]" />
<van-field readonly v-model="form.type" required name="type" label="准事故类型" placeholder="请选择" @click="seletType('type')"
:rules="[{ required: true, message: '准事故类型不能为空' }]" />
<van-field readonly v-model="form.type" required name="type" label="准事故类型" placeholder="请选择"
@click="seletType('type')" :rules="[{ required: true, message: '准事故类型不能为空' }]" />
<!-- <van-field
readonly
......@@ -98,12 +98,30 @@
</template>
</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 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="请输入" />
<van-field readonly required clickable name="trouble" :value="form.trouble" label="管控责任单位" placeholder="请选择"
@click="showTrouble = true" :rules="[{ required: true, message: '管控责任单位不能为空' }]" />
<van-field readonly required clickable name="trouble" :value="form.trouble" label="管控责任人" placeholder="请选择"
@click="showTrouble = true" :rules="[{ required: true, message: '管控责任人不能为空' }]" />
<!-- <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="1" autosize placeholder="请输入" />
</div> -->
<!-- <van-field v-model="form.measuresAdministration" name="measuresAdministration" label="管理措施" type="textarea"
rows="1" autosize placeholder="请输入" /> -->
<van-field name="measuresAdministrationFile[]" label=" ">
<template #input>
<van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="measuresAdministrationFile"
......@@ -161,17 +179,16 @@
style="position: relative;top: 32%;transform: translateY(-50%);">
参考依据
</div>
<!-- <van-field
<van-field
readonly
required
clickable
name="trouble"
:value="form.trouble"
label="参考依据"
placeholder="请选择"
@click="showTrouble = true"
:rules="[{ required: true, message: '事故类型不能为空' }]"
/> -->
/>
<van-popup v-model="showTrouble" position="bottom">
<van-picker show-toolbar value-key="name" :columns="columnsTrouble" @confirm="onConTrouble"
@cancel="showTrouble = false" />
......
src/views/riskProject/add/index.vue
View file @ 3369fe2a
......@@ -46,7 +46,6 @@
<van-field
required
clickable
name="projectName"
:value="form.projectName"
label="关联项目"
......@@ -85,7 +84,6 @@
</div>
<van-field
required
clickable
name="deptName"
:value="form.deptName"
label="评估小组选择"
......@@ -96,7 +94,6 @@
<van-field
required
clickable
name="leaderUserName"
:value="form.leaderUserName"
label="评估小组组长"
......@@ -106,7 +103,6 @@
/>
<van-field
clickable
required
name="workUserNames"
:value="form.workUserNames"
......@@ -127,7 +123,6 @@
/>
<van-field
clickable
:value="form.endTime"
required
name="endTime"
......
src/views/riskProject/taskLedger/presentDetail.vue
View file @ 3369fe2a
......@@ -13,14 +13,14 @@
<van-field readonly required label="所属项目" placeholder="请输入" />
<van-field readonly required label="所属建筑物" placeholder="请输入" />
<van-field required clickable name="floorId" label="所属楼层" placeholder="请选择"
<van-field required name="floorId" label="所属楼层" placeholder="请选择"
:rules="[{ required: true, message: '所属楼层不能为空' }]" />
<div style="display: flex;">
<van-field readonly required name="roomName" label="所属房间" placeholder="请输入"
:rules="[{ required: true, message: '所属房间不能为空' }]" />
<!-- <van-button style="color: #cccc;background-color: #f0f1f5;" icon="plus" type="info" /> -->
</div>
<van-field required clickable name="name" label="风险源名称" placeholder="请输入"
<van-field required name="name" label="风险源名称" placeholder="请输入"
:rules="[{ required: true, message: '风险源名称不能为空' }]" />
<van-field required name="factor" label="风险因素" placeholder="请选择"
:rules="[{ required: true, message: '风险因素不能为空' }]" />
......@@ -85,13 +85,31 @@
</template>
</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 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="请输入" />
<van-field readonly required name="trouble" :value="form.trouble" label="管控责任单位" placeholder="请选择"
@click="showTrouble = true" :rules="[{ required: true, message: '管控责任单位不能为空' }]" />
<van-field readonly required name="trouble" :value="form.trouble" label="管控责任人" placeholder="请选择"
@click="showTrouble = true" :rules="[{ required: true, message: '管控责任人不能为空' }]" />
<!-- <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 disabled name="measuresAdministration" label="管理措施" type="textarea" rows="1" autosize
placeholder="请输入" />
<van-field name="measuresAdministrationFile[]" label=" ">
</div> -->
<!-- <van-field disabled name="measuresAdministration" label="管理措施" type="textarea" rows="1" autosize
placeholder="请输入" /> -->
<!-- <van-field name="measuresAdministrationFile[]" label=" ">
<template #input>
<van-uploader disabled multiple :max-count="5" upload-text="最多上传五个" v-model="measuresAdministrationFile"
accept="file" result-type="file" @delete="deleteFile(...arguments, 'measuresAdministrationFile')">
......@@ -111,7 +129,7 @@
</template>
</van-uploader>
</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%);">
......@@ -144,6 +162,8 @@
style="position: relative;top: 32%;transform: translateY(-50%);">
参考依据
</div>
<van-field readonly required clickable name="trouble" :value="form.trouble" label="参考依据" placeholder="请选择"
@click="showTrouble = true" :rules="[{ required: true, message: '事故类型不能为空' }]" />
</van-form>
</div>
......
src/views/riskProject/taskLedger/tabDetail.vue
View file @ 3369fe2a
......@@ -145,6 +145,9 @@
style="position: relative;top: 32%;transform: translateY(-50%);">
参考依据
</div>
<van-field readonly required clickable name="trouble" :value="form.trouble" label="参考依据" placeholder="请选择"
@click="showTrouble = true" :rules="[{ required: true, message: '事故类型不能为空' }]" />
</van-form>
</div>
......
vue.config.js
View file @ 3369fe2a
......@@ -8,9 +8,9 @@ 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.137:8080/', //这里是昊哥的地址
// target: 'http://192.168.10.36:8080/', //这里是昊哥的地址
// target: 'http://localhost:8080/', //这里是后台的地址
ws: 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