Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
patzn-cloud-web-back-soil
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
wangweidong
patzn-cloud-web-back-soil
Commits
2e92d9e1
Commit
2e92d9e1
authored
Nov 19, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了开土制备拖拽
parent
93840e39
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
17 additions
and
13 deletions
+17
-13
SelEquip.vue
components/select-equip/SelEquip.vue
+1
-1
SoilSampleItemManageHis.vue
pages/soil-sample-manage/SoilSampleItemManageHis.vue
+1
-1
SoilSampleManageHis.vue
pages/soil-sample-manage/SoilSampleManageHis.vue
+8
-4
CollectFileManage.vue
...il-sample-manage/sample-preparation/CollectFileManage.vue
+2
-2
CollectManage.vue
...s/soil-sample-manage/sample-preparation/CollectManage.vue
+1
-1
EquipManage.vue
pages/soil-sample-manage/sample-preparation/EquipManage.vue
+1
-1
IndexManage.vue
pages/soil-sample-manage/sample-preparation/IndexManage.vue
+1
-1
IndexManageEdit.vue
...soil-sample-manage/sample-preparation/IndexManageEdit.vue
+1
-1
PreparationHis.vue
.../soil-sample-manage/sample-preparation/PreparationHis.vue
+1
-1
No files found.
components/select-equip/SelEquip.vue
View file @
2e92d9e1
<
template
>
<div>
<Modal
v-model=
"showModal"
width=
"100"
class=
"full-screen zIndex-1200"
>
<Modal
v-model=
"showModal"
v-drag
width=
"100"
class=
"full-screen zIndex-1200"
>
<div
slot=
"header"
>
设备管理
</div>
<div>
<Collapse
@
on-result-change=
"_optionResult"
left-title=
"仪器类别"
right-title=
"已选仪器"
left-width=
"15"
>
...
...
pages/soil-sample-manage/SoilSampleItemManageHis.vue
View file @
2e92d9e1
<
template
>
<div>
<Modal
v-model=
"showModal"
width=
"1200"
>
<Modal
v-model=
"showModal"
v-drag
width=
"1200"
>
<p
slot=
"header"
>
{{
modalTitle
}}
</p>
...
...
pages/soil-sample-manage/SoilSampleManageHis.vue
View file @
2e92d9e1
<
template
>
<div>
<Modal
v-model=
"showModal"
width=
"1180"
class=
"modal-footer-none"
>
<Modal
v-model=
"showModal"
v-drag
width=
"1180"
class=
"modal-footer-none"
>
<p
slot=
"header"
>
{{
modalTitle
}}
</p>
...
...
@@ -28,7 +28,7 @@
<!-- 表格 -->
<Col
span=
"24"
>
<PTVXETableHeight
ref=
"pageTable"
:table-height=
"tableHeight"
:form-id=
"formId"
:loading=
"true"
:get-page=
"getPage"
:icon-msg=
"iconMsg"
select-data
@
on-result-change=
"_tableResultChange"
>
:get-page=
"getPage"
:icon-msg=
"iconMsg"
select-data
is-edit
@
on-result-change=
"_tableResultChange"
>
<vxe-table-column
v-for=
"item in pageColumns"
:key=
"item.key"
...
...
@@ -37,14 +37,18 @@
:width=
"item.width?item.width:200"
:fixed=
"item.fixed?item.fixed:undefined"
:edit-render=
"item.editCell?
{autofocus: 'input'}:null" sortable>
<template
slot-scope
=
"scope"
>
<template
v-slot:edit
=
"scope"
>
<div
v-if=
"item.key==='describeDetail'"
@
click
.
stop=
"_handleRow(scope)"
>
<!--
<el-input
v-model=
"scope.row.describeDetail"
@
change=
"_inputChange(scope.row)"
placeholder=
"请输入土质描述详情"
>
-->
<!--
</el-input>
-->
<Input
:value=
"scope.row.describeDetail"
@
change
.
native=
"_inputChange($event.target.value,scope.row)"
></Input>
</div>
<div
v-else-if=
"item.key==='remark'"
@
click
.
stop=
"_handleRow(scope)"
>
<el-input
v-model=
"scope.row.remark"
@
change=
"_remarkChange(scope.row)"
></el-input>
</div>
<div
v-else
>
</
template
>
<
template
slot-scope=
"scope"
>
<div
v-if
>
{{
scope
.
row
[
item
.
key
]
}}
</div>
</
template
>
...
...
pages/soil-sample-manage/sample-preparation/CollectFileManage.vue
View file @
2e92d9e1
<
template
>
<div>
<Modal
v-model=
"showModal"
width=
"800"
class=
"modal-footer-none full-screen"
>
<Modal
v-model=
"showModal"
v-drag
width=
"800"
class=
"modal-footer-none full-screen"
>
<div
slot=
"header"
>
{{
modalTitle
}}
</div>
<div>
<Form
id=
"index-right-form"
:label-width=
"80"
inline
onsubmit=
"return false"
>
...
...
@@ -77,7 +77,7 @@ export default {
this
.
aptitudeItemInfo
=
data
this
.
formObj
=
this
.
$resetFields
(
this
.
formObj
)
this
.
id
=
data
.
id
this
.
modalTitle
=
data
.
name
+
' 查看采集
数据
'
this
.
modalTitle
=
data
.
name
+
' 查看采集
文件
'
this
.
showModal
=
true
this
.
_page
()
},
...
...
pages/soil-sample-manage/sample-preparation/CollectManage.vue
View file @
2e92d9e1
<
template
>
<div>
<Modal
v-model=
"showModal"
width=
"100"
class=
"modal-footer-none full-screen"
>
<Modal
v-model=
"showModal"
v-drag
width=
"100"
class=
"modal-footer-none full-screen"
>
<div
slot=
"header"
>
{{
modalTitle
}}
</div>
<div>
<Form
id=
"index-right-form"
:label-width=
"80"
inline
onsubmit=
"return false"
>
...
...
pages/soil-sample-manage/sample-preparation/EquipManage.vue
View file @
2e92d9e1
<
template
>
<div>
<Modal
v-model=
"showModal"
width=
"800"
class=
"modal-footer-none full-screen"
>
<Modal
v-model=
"showModal"
v-drag
width=
"800"
class=
"modal-footer-none full-screen"
>
<div
slot=
"header"
>
{{
modalTitle
}}
</div>
<div>
<Form
id=
"index-right-form"
:label-width=
"80"
inline
onsubmit=
"return false"
>
...
...
pages/soil-sample-manage/sample-preparation/IndexManage.vue
View file @
2e92d9e1
<
template
>
<div>
<Modal
v-model=
"showModal"
width=
"100"
class=
"modal-footer-none full-screen"
>
<Modal
v-model=
"showModal"
v-drag
width=
"100"
class=
"modal-footer-none full-screen"
>
<div
slot=
"header"
>
{{
modalTitle
}}
</div>
<div>
<Form
id=
"index-right-form"
:label-width=
"80"
inline
onsubmit=
"return false"
>
...
...
pages/soil-sample-manage/sample-preparation/IndexManageEdit.vue
View file @
2e92d9e1
<
template
>
<div>
<Modal
v-model=
"showModal"
:mask-closable=
"false"
@
on-visible-change=
"_visibleChange"
width=
"900"
>
<Modal
v-model=
"showModal"
v-drag
:mask-closable=
"false"
@
on-visible-change=
"_visibleChange"
width=
"900"
>
<p
slot=
"header"
>
{{
modalTitle
}}
</p>
<div>
<Form
ref=
"formObj"
:id=
"formId"
:model=
"formObj"
:rules=
"ruleValidate"
:label-width=
"100"
inline
>
...
...
pages/soil-sample-manage/sample-preparation/PreparationHis.vue
View file @
2e92d9e1
<
template
>
<div>
<Modal
v-model=
"showModal"
:mask-closable=
"false"
width=
"90"
class=
"zIndex-1000 full-screen"
>
<Modal
v-model=
"showModal"
v-drag
:mask-closable=
"false"
width=
"90"
class=
"zIndex-1000 full-screen"
>
<p
slot=
"header"
>
制备详情
</p>
<Row>
<!--操作-->
...
...
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