Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
rongtong-app
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
融通安全管理系统
rongtong-app
Commits
a31deac3
Commit
a31deac3
authored
Sep 07, 2023
by
p-wanping.song
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
0906问题列表修复
parent
559a46c5
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
414 additions
and
249 deletions
+414
-249
src/views/my/sign.vue
src/views/my/sign.vue
+32
-0
src/views/riskProject/add/addCurrent.vue
src/views/riskProject/add/addCurrent.vue
+14
-6
src/views/riskProject/add/addInherent.vue
src/views/riskProject/add/addInherent.vue
+14
-6
src/views/riskProject/add/addProject.vue
src/views/riskProject/add/addProject.vue
+216
-137
src/views/riskProject/add/inherentTemplate/detail.vue
src/views/riskProject/add/inherentTemplate/detail.vue
+14
-7
src/views/riskProject/taskLedger/tabDetail.vue
src/views/riskProject/taskLedger/tabDetail.vue
+122
-91
vue.config.js
vue.config.js
+2
-2
No files found.
src/views/my/sign.vue
View file @
a31deac3
...
@@ -31,6 +31,17 @@
...
@@ -31,6 +31,17 @@
<div>
{{
form
.
signTime
}}
</div>
<div>
{{
form
.
signTime
}}
</div>
</
template
>
-->
</
template
>
-->
</van-field>
</van-field>
<van-field
required
readonly
name=
"projectName"
:value=
"form.projectName"
label=
"关联项目"
placeholder=
"请选择"
@
click=
"showProject = true"
:rules=
"[{ required: true, message: '关联项目不能为空' }]"
>
</van-field>
<van-field
<van-field
required
required
name=
"remark"
name=
"remark"
...
@@ -62,6 +73,13 @@
...
@@ -62,6 +73,13 @@
>
>
</div>
</div>
</van-form>
</van-form>
<van-popup
v-model=
"showProject"
position=
"bottom"
:style=
"{ height: '100%' }"
>
<selectPeople
@
onClose=
"onClose"
@
onSave=
"onSave"
></selectPeople>
</van-popup>
</div>
</div>
</template>
</template>
...
@@ -69,12 +87,15 @@
...
@@ -69,12 +87,15 @@
import
LHeader
from
"
@/components/header.vue
"
;
import
LHeader
from
"
@/components/header.vue
"
;
import
{
getUserInfo
}
from
"
@/utils/userInfo
"
;
import
{
getUserInfo
}
from
"
@/utils/userInfo
"
;
import
{
getFun
,
postFun
}
from
"
@/service/table.js
"
;
import
{
getFun
,
postFun
}
from
"
@/service/table.js
"
;
import
selectPeople
from
"
@/views/riskProject/add/projectList.vue
"
;
export
default
{
export
default
{
components
:
{
components
:
{
LHeader
,
LHeader
,
selectPeople
,
},
},
data
()
{
data
()
{
return
{
return
{
showProject
:
false
,
timer
:
""
,
timer
:
""
,
userName
:
"
用户名
"
,
userName
:
"
用户名
"
,
form
:
{
form
:
{
...
@@ -82,6 +103,8 @@ export default {
...
@@ -82,6 +103,8 @@ export default {
file
:
[],
file
:
[],
remark
:
""
,
remark
:
""
,
userId
:
""
,
userId
:
""
,
projectName
:
""
,
projectId
:
""
,
},
},
};
};
},
},
...
@@ -94,6 +117,15 @@ export default {
...
@@ -94,6 +117,15 @@ export default {
},
},
methods
:
{
methods
:
{
onClose
()
{
this
.
showProject
=
false
;
},
onSave
(
val
)
{
this
.
onClose
();
console
.
log
(
val
);
this
.
form
.
projectId
=
val
.
id
;
this
.
form
.
projectName
=
val
.
name
;
},
toGetUserInfo
()
{
toGetUserInfo
()
{
this
.
userName
=
getUserInfo
().
userName
;
this
.
userName
=
getUserInfo
().
userName
;
this
.
form
.
userId
=
getUserInfo
().
userId
;
this
.
form
.
userId
=
getUserInfo
().
userId
;
...
...
src/views/riskProject/add/addCurrent.vue
View file @
a31deac3
...
@@ -115,15 +115,23 @@
...
@@ -115,15 +115,23 @@
v-show=
"form.pointType == '设备设施类'"
v-show=
"form.pointType == '设备设施类'"
>
>
<template
#input
>
<template
#input
>
<span
style=
"margin-right: 10px; color: red"
>
否
</span>
<van-radio-group
<van-switch
v-model=
"form.specialEquipment"
v-model=
"form.specialEquipment"
size=
"20"
direction=
"horizontal"
name=
"specialEquipment"
>
/>
<van-radio
:name=
"true"
>
是
</van-radio>
<span
style=
"margin-left: 10px; color: green"
>
是
</span>
<van-radio
:name=
"false"
>
否
</van-radio>
</van-radio-group>
</
template
>
</
template
>
</van-field>
</van-field>
<van-field
v-if=
"form.specialEquipment == true"
clickable
name=
"pointType"
v-model=
"form.equipmentNumber"
label=
"特种设备的证书号码"
placeholder=
"请选择"
/>
<!-- 多选 -->
<!-- 多选 -->
<van-field
<van-field
v-model=
"form.safetyWarningSigns"
v-model=
"form.safetyWarningSigns"
...
...
src/views/riskProject/add/addInherent.vue
View file @
a31deac3
...
@@ -117,15 +117,23 @@
...
@@ -117,15 +117,23 @@
v-show=
"form.pointType == '设备设施类'"
v-show=
"form.pointType == '设备设施类'"
>
>
<template
#input
>
<template
#input
>
<span
style=
"margin-right: 10px; color: red"
>
否
</span>
<van-radio-group
<van-switch
name=
"specialEquipment"
v-model=
"form.specialEquipment"
v-model=
"form.specialEquipment"
size=
"20"
direction=
"horizontal"
/>
>
<span
style=
"margin-left: 10px; color: green"
>
是
</span>
<van-radio
:name=
"true"
>
是
</van-radio>
<van-radio
:name=
"false"
>
否
</van-radio>
</van-radio-group>
</
template
>
</
template
>
</van-field>
</van-field>
<van-field
v-if=
"form.specialEquipment == true"
clickable
name=
"pointType"
v-model=
"form.equipmentNumber"
label=
"特种设备的证书号码"
placeholder=
"请选择"
/>
<!-- 多选 -->
<!-- 多选 -->
<van-field
<van-field
v-model=
"form.safetyWarningSigns"
v-model=
"form.safetyWarningSigns"
...
...
src/views/riskProject/add/addProject.vue
View file @
a31deac3
This diff is collapsed.
Click to expand it.
src/views/riskProject/add/inherentTemplate/detail.vue
View file @
a31deac3
...
@@ -46,16 +46,23 @@
...
@@ -46,16 +46,23 @@
v-show=
"form.pointType == '设备设施类'"
v-show=
"form.pointType == '设备设施类'"
>
>
<template
#input
>
<template
#input
>
<span
style=
"margin-right: 10px; color: red"
>
否
</span>
<van-radio-group
<van-switch
disabled
v-model=
"form.specialEquipment"
v-model=
"form.specialEquipment"
size=
"20"
direction=
"horizontal"
name=
"specialEquipment"
>
/>
<van-radio
:name=
"true"
>
是
</van-radio>
<span
style=
"margin-left: 10px; color: green"
>
是
</span>
<van-radio
:name=
"false"
>
否
</van-radio>
</van-radio-group>
</
template
>
</
template
>
</van-field>
</van-field>
<van-field
v-if=
"form.specialEquipment == true"
clickable
name=
"pointType"
v-model=
"form.equipmentNumber"
label=
"特种设备的证书号码"
placeholder=
"请选择"
/>
<!-- 多选 -->
<!-- 多选 -->
<van-field
<van-field
v-model=
"form.safetyWarningSigns"
v-model=
"form.safetyWarningSigns"
...
...
src/views/riskProject/taskLedger/tabDetail.vue
View file @
a31deac3
This diff is collapsed.
Click to expand it.
vue.config.js
View file @
a31deac3
...
@@ -9,10 +9,10 @@ module.exports = {
...
@@ -9,10 +9,10 @@ module.exports = {
proxy
:
{
proxy
:
{
//配置跨域
//配置跨域
"
/app-api
"
:
{
"
/app-api
"
:
{
//
target: "http://192.168.4.232:8080/", //这里是后台的地址
target
:
"
http://192.168.4.232:8080/
"
,
//这里是后台的地址
// target: "http://192.168.10.137:8080/", //这里是后台的地址
// target: "http://192.168.10.137:8080/", //这里是后台的地址
// target: 'http://192.168.15.124: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.15.230:8080/", //这里是晓静的地址
// target: "http://192.168.15.230:8080/", //这里是晓静的地址
// target: 'http://localhost:8081/', //这里是后台的地址
// target: 'http://localhost:8081/', //这里是后台的地址
ws
:
true
,
ws
:
true
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment