Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sample-form-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
sample-form-platform
Commits
077ad723
Commit
077ad723
authored
Sep 11, 2023
by
“yiyousong”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf:优化样表查看报表参数
parent
845a5cd2
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
2 deletions
+26
-2
sample-form-client-ui/admin/src/App.vue
sample-form-client-ui/admin/src/App.vue
+1
-1
sample-form-client-ui/admin/src/pages/home/Home.vue
sample-form-client-ui/admin/src/pages/home/Home.vue
+5
-1
sample-form-client-ui/admin/src/pages/searchpage/SearchPage.vue
...-form-client-ui/admin/src/pages/searchpage/SearchPage.vue
+4
-0
sample-form-client-ui/admin/src/pages/showpage/MatterList.vue
...le-form-client-ui/admin/src/pages/showpage/MatterList.vue
+4
-0
sample-form-client-ui/admin/src/pages/showpage/ShowMaterials.vue
...form-client-ui/admin/src/pages/showpage/ShowMaterials.vue
+5
-0
sample-form-client-ui/admin/src/store/index.js
sample-form-client-ui/admin/src/store/index.js
+7
-0
No files found.
sample-form-client-ui/admin/src/App.vue
View file @
077ad723
...
@@ -64,7 +64,7 @@ export default {
...
@@ -64,7 +64,7 @@ export default {
},
},
serviceInfo
:
{
serviceInfo
:
{
homeUrl
:
"
http://192.168.0.24:8080/#/
"
,
homeUrl
:
"
http://192.168.0.24:8080/#/
"
,
serverUrl
:
"
http://1
12.19.80.237
:11078/
"
,
serverUrl
:
"
http://1
92.168.0.98
:11078/
"
,
},
},
devicenum
:
"
18-93-7F-C0-AD-B5
"
,
devicenum
:
"
18-93-7F-C0-AD-B5
"
,
// devicenum: "B8-13-32-86-9F-04",
// devicenum: "B8-13-32-86-9F-04",
...
...
sample-form-client-ui/admin/src/pages/home/Home.vue
View file @
077ad723
...
@@ -187,7 +187,7 @@
...
@@ -187,7 +187,7 @@
<
script
>
<
script
>
// import { getHomeInfo } from "@/api";
// import { getHomeInfo } from "@/api";
import
MateralsList
from
"
@/components/MateralsList.vue
"
;
import
MateralsList
from
"
@/components/MateralsList.vue
"
;
import
{
mapState
}
from
"
vuex
"
;
import
{
mapState
,
mapMutations
}
from
"
vuex
"
;
export
default
{
export
default
{
components
:
{
components
:
{
MateralsList
,
MateralsList
,
...
@@ -237,6 +237,7 @@ export default {
...
@@ -237,6 +237,7 @@ export default {
},
},
},
},
methods
:
{
methods
:
{
...
mapMutations
([
"
SET_operTime
"
]),
// 获取首页数据展示
// 获取首页数据展示
// async getHomeInfo() {
// async getHomeInfo() {
// let res = await getHomeInfo({});
// let res = await getHomeInfo({});
...
@@ -285,11 +286,14 @@ export default {
...
@@ -285,11 +286,14 @@ export default {
},
},
// 查看材料列表
// 查看材料列表
checkMatter
(
row
)
{
checkMatter
(
row
)
{
let
time
=
this
.
$moment
().
format
(
"
YYYY-MM-DD HH:mm:ss
"
);
this
.
SET_operTime
(
time
);
this
.
matterInfo
=
row
;
this
.
matterInfo
=
row
;
this
.
visible
=
true
;
this
.
visible
=
true
;
},
},
// 查看材料
// 查看材料
checkMaterial
(
row
)
{
checkMaterial
(
row
)
{
this
.
SET_operTime
(
""
);
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
"
/showmaterials
"
,
path
:
"
/showmaterials
"
,
query
:
{
query
:
{
...
...
sample-form-client-ui/admin/src/pages/searchpage/SearchPage.vue
View file @
077ad723
...
@@ -106,6 +106,7 @@ import SearchBox from "@/components/SearchBox.vue";
...
@@ -106,6 +106,7 @@ import SearchBox from "@/components/SearchBox.vue";
import
MateralsList
from
"
@/components/MateralsList.vue
"
;
import
MateralsList
from
"
@/components/MateralsList.vue
"
;
import
YEmpty
from
"
@/components/YEmpty.vue
"
;
import
YEmpty
from
"
@/components/YEmpty.vue
"
;
import
{
getSampleformMatterList
,
getMatterForFlownum
}
from
"
@/api
"
;
import
{
getSampleformMatterList
,
getMatterForFlownum
}
from
"
@/api
"
;
import
{
mapMutations
}
from
"
vuex
"
;
export
default
{
export
default
{
components
:
{
components
:
{
Header
,
Header
,
...
@@ -142,6 +143,7 @@ export default {
...
@@ -142,6 +143,7 @@ export default {
}
,
}
,
}
,
}
,
methods
:
{
methods
:
{
...
mapMutations
([
"
SET_operTime
"
]),
// 区分搜索
// 区分搜索
async
typeSearch
()
{
async
typeSearch
()
{
let
reg
=
/^
[\u
4e00-
\u
9fa5
]
+$/
;
let
reg
=
/^
[\u
4e00-
\u
9fa5
]
+$/
;
...
@@ -188,6 +190,8 @@ export default {
...
@@ -188,6 +190,8 @@ export default {
}
,
}
,
// 查看
// 查看
handleCheck
(
row
)
{
handleCheck
(
row
)
{
let
time
=
this
.
$moment
().
format
(
"
YYYY-MM-DD HH:mm:ss
"
);
this
.
SET_operTime
(
time
);
this
.
matterInfo
=
row
;
this
.
matterInfo
=
row
;
this
.
visible
=
true
;
this
.
visible
=
true
;
}
,
}
,
...
...
sample-form-client-ui/admin/src/pages/showpage/MatterList.vue
View file @
077ad723
...
@@ -83,6 +83,7 @@ import SearchBox from "@/components/SearchBox.vue";
...
@@ -83,6 +83,7 @@ import SearchBox from "@/components/SearchBox.vue";
import
MateralsList
from
"
../../components/MateralsList.vue
"
;
import
MateralsList
from
"
../../components/MateralsList.vue
"
;
import
YEmpty
from
"
@/components/YEmpty.vue
"
;
import
YEmpty
from
"
@/components/YEmpty.vue
"
;
import
{
getDeviceMatterList
}
from
"
@/api
"
;
import
{
getDeviceMatterList
}
from
"
@/api
"
;
import
{
mapMutations
}
from
"
vuex
"
;
export
default
{
export
default
{
components
:
{
components
:
{
Header
,
Header
,
...
@@ -117,6 +118,7 @@ export default {
...
@@ -117,6 +118,7 @@ export default {
},
},
},
},
methods
:
{
methods
:
{
...
mapMutations
([
"
SET_operTime
"
]),
// 获取事项列表
// 获取事项列表
async
getDeviceMatterList
()
{
async
getDeviceMatterList
()
{
let
res
=
await
getDeviceMatterList
({
let
res
=
await
getDeviceMatterList
({
...
@@ -147,6 +149,8 @@ export default {
...
@@ -147,6 +149,8 @@ export default {
this
.
getDeviceMatterList
();
this
.
getDeviceMatterList
();
},
},
handleCheck
(
row
)
{
handleCheck
(
row
)
{
let
time
=
this
.
$moment
().
format
(
"
YYYY-MM-DD HH:mm:ss
"
);
this
.
SET_operTime
(
time
);
this
.
matterInfo
=
row
;
this
.
matterInfo
=
row
;
this
.
visible
=
true
;
this
.
visible
=
true
;
},
},
...
...
sample-form-client-ui/admin/src/pages/showpage/ShowMaterials.vue
View file @
077ad723
...
@@ -107,6 +107,7 @@
...
@@ -107,6 +107,7 @@
import
Header
from
"
@/components/Header.vue
"
;
import
Header
from
"
@/components/Header.vue
"
;
import
{
getMaterialsList
,
checkMaterials
}
from
"
@/api
"
;
import
{
getMaterialsList
,
checkMaterials
}
from
"
@/api
"
;
import
local
from
"
@/utils/local
"
;
import
local
from
"
@/utils/local
"
;
import
{
mapGetters
}
from
"
vuex
"
;
// import Hammer from "hammerjs";
// import Hammer from "hammerjs";
export
default
{
export
default
{
components
:
{
components
:
{
...
@@ -126,6 +127,9 @@ export default {
...
@@ -126,6 +127,9 @@ export default {
width
:
800
,
width
:
800
,
};
};
},
},
computed
:
{
...
mapGetters
([
"
operTime
"
]),
},
created
()
{
created
()
{
this
.
getMaterialsList
();
this
.
getMaterialsList
();
// this.materailsList=this.matterInfo.matterDatumList;
// this.materailsList=this.matterInfo.matterDatumList;
...
@@ -202,6 +206,7 @@ export default {
...
@@ -202,6 +206,7 @@ export default {
matterFullName
,
matterFullName
,
materialName
,
materialName
,
materialFullName
,
materialFullName
,
operTime
:
this
.
operTime
?
this
.
operTime
:
null
,
});
});
},
},
// 切换材料
// 切换材料
...
...
sample-form-client-ui/admin/src/store/index.js
View file @
077ad723
...
@@ -14,6 +14,7 @@ export default new Vuex.Store({
...
@@ -14,6 +14,7 @@ export default new Vuex.Store({
deviceCode
:
""
,
// 设备编码
deviceCode
:
""
,
// 设备编码
times
:
300
,
// 倒计时时间
times
:
300
,
// 倒计时时间
defaultTimes
:
300
,
// 倒计时时间
defaultTimes
:
300
,
// 倒计时时间
operTime
:
""
,
// 样表打开时间
},
},
getters
:
{
getters
:
{
deviceCode
(
state
)
{
deviceCode
(
state
)
{
...
@@ -25,8 +26,14 @@ export default new Vuex.Store({
...
@@ -25,8 +26,14 @@ export default new Vuex.Store({
defaultTimes
(
state
)
{
defaultTimes
(
state
)
{
return
state
.
defaultTimes
;
return
state
.
defaultTimes
;
},
},
operTime
(
state
)
{
return
state
.
operTime
;
},
},
},
mutations
:
{
mutations
:
{
SET_operTime
(
state
,
operTime
)
{
state
.
operTime
=
operTime
;
},
SET_devicenum
(
state
,
devicenum
)
{
SET_devicenum
(
state
,
devicenum
)
{
state
.
devicenum
=
devicenum
;
state
.
devicenum
=
devicenum
;
},
},
...
...
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