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
0de58315
Commit
0de58315
authored
Mar 14, 2024
by
kaitly205422@163.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复fix
parent
28e9ec0d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
10 deletions
+14
-10
src/views/drawCanvas/riskView.vue
src/views/drawCanvas/riskView.vue
+13
-10
src/views/riskProject/add/addInherent.vue
src/views/riskProject/add/addInherent.vue
+1
-0
No files found.
src/views/drawCanvas/riskView.vue
View file @
0de58315
...
...
@@ -28,13 +28,13 @@
:w=
"(W / 12) * item.w"
:h=
"item.h * 30"
:i=
"item.i"
:key=
"item.i"
:z=
"item.zIndex"
:draggable=
"item.isDraggable"
:resizable=
"item.isResizable"
@
resizestop=
"(x, y, w, h) => resizedEvent(item, x, y, w, h)"
@
dragging=
"(x, y) => onDrag(item, x, y)"
@
dragstop=
"(x, y) =>
{
movedEvent(item, x, y);
}
" @resizing="(x, y, w, h) => onResize(item, x, y, w, h)" @activated="onActivated(item)"
movedEvent(item, x, y);
}
" @resizing="(x, y, w, h) => onResize(item, x, y, w, h)" @activated="onActivated(item)"
@click.native="dbClickEvent($event, item)" :style="{
backgroundColor: item.c,
border: item.type == 'thorough' ? 'none !important' : '',
}">
backgroundColor: item.c,
border: item.type == 'thorough' ? 'none !important' : '',
}">
<!--
<grid-item
v-for=
"item in layout"
:x=
"item.x"
...
...
@@ -53,8 +53,8 @@
}"
> -->
<span
class=
"text"
:class=
"item.w > item.h * 5 ? '' : 'rowText'"
>
{{
item
.
name
}}
</span>
item
.
name
}}
</span>
<span
class=
"remove"
@
click.stop=
"removeItem(item.i)"
v-if=
"showHeader"
>
x
</span>
<!--
<span
class=
"remove"
@
click=
"removeItem(item.i)"
v-if=
"item.i && isEdit"
>
x
</span>
-->
<!--
</grid-item>
-->
...
...
@@ -95,8 +95,8 @@
</van-cell-group>
</van-dialog>
<van-popup
v-model=
"showPicker"
round
position=
"bottom"
>
<van-picker
v-if=
"!copyRoom.isCopy"
show-toolbar
:columns=
"isRoom ? roomArr : baseArr"
@
cancel=
"showPicker = false"
@
confirm=
"onConfirm"
value-key=
"dictLabel"
/>
<van-picker
v-if=
"!copyRoom.isCopy"
show-toolbar
:columns=
"isRoom ? roomArr : baseArr"
@
c
ancel=
"showPicker = false"
@
c
onfirm=
"onConfirm"
value-key=
"dictLabel"
/>
<van-picker
v-else
show-toolbar
:columns=
"copyRoom.copyArr"
@
cancel=
"showPicker = false"
@
confirm=
"onConfirm"
:value-key=
"copyRoom.type != 'type' ? 'name' : 'dictLabel'"
/>
</van-popup>
...
...
@@ -220,6 +220,7 @@ export default {
this
.
copyRoom
.
type
=
"
floor
"
;
this
.
showPicker
=
true
;
this
.
copyRoom
.
roomData
=
[];
debugger
if
(
this
.
copyRoom
.
floorData
.
length
)
{
this
.
copyRoom
.
copyArr
=
this
.
copyRoom
.
floorData
;
return
;
...
...
@@ -465,7 +466,9 @@ export default {
this
.
isRoom
=
false
;
this
.
isBase
=
true
;
this
.
show
=
true
;
this
.
copyRoom
.
isCopy
=
false
;
},
// 更新画布高度
updateLayoutHeight
()
{
const
max
=
Math
.
max
(
...
...
src/views/riskProject/add/addInherent.vue
View file @
0de58315
...
...
@@ -1047,6 +1047,7 @@ export default {
params
:
{
floorId
:
this
.
form
.
floorId
,
isView
:
false
,
buildingId
:
this
.
form
.
buildingIds
},
});
},
...
...
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