Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
X
xgdlapp
Project
Project
Details
Activity
Releases
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
李苏
xgdlapp
Commits
af6bf88b
Commit
af6bf88b
authored
May 10, 2023
by
李苏
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化卡顿
parent
afb1922b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
13 deletions
+15
-13
index.js
common/router/index.js
+0
-1
config.service.js
common/service/config.service.js
+1
-1
appUpdate.js
common/util/appUpdate.js
+5
-2
index.vue
pages/dl_cmaterial/index.vue
+9
-9
No files found.
common/router/index.js
View file @
af6bf88b
...
@@ -28,7 +28,6 @@ router.beforeEach((to, from, next) => {
...
@@ -28,7 +28,6 @@ router.beforeEach((to, from, next) => {
}
else
{
}
else
{
next
({
path
:
'/pages/login/login'
})
next
({
path
:
'/pages/login/login'
})
}
}
next
()
}
}
})
})
// 全局路由后置守卫
// 全局路由后置守卫
...
...
common/service/config.service.js
View file @
af6bf88b
...
@@ -9,7 +9,7 @@ try {
...
@@ -9,7 +9,7 @@ try {
}
}
let
newUrl
=
'http://'
+
fwq
let
newUrl
=
'http://'
+
fwq
if
(
process
.
env
.
NODE_ENV
==
'development'
)
{
if
(
process
.
env
.
NODE_ENV
==
'development'
)
{
BASE_URL
=
"http://1
0.2.175.100:8
080/xgwcs"
BASE_URL
=
"http://1
92.168.30.16:9
080/xgwcs"
}
else
{
}
else
{
BASE_URL
=
"http://10.2.175.100:8080/xgwcs"
BASE_URL
=
"http://10.2.175.100:8080/xgwcs"
...
...
common/util/appUpdate.js
View file @
af6bf88b
...
@@ -45,6 +45,7 @@ export default function appUpdate(loginApp) {
...
@@ -45,6 +45,7 @@ export default function appUpdate(loginApp) {
apptype
:
appType
,
apptype
:
appType
,
appid
:
'__UNI__79C58F0'
,
appid
:
'__UNI__79C58F0'
,
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
console
.
log
(
res
,
'res'
)
if
(
res
)
{
if
(
res
)
{
plus
.
runtime
.
getProperty
(
plus
.
runtime
.
appid
,
function
(
wgtinfo
)
{
plus
.
runtime
.
getProperty
(
plus
.
runtime
.
appid
,
function
(
wgtinfo
)
{
let
client_version
=
parseInt
(
wgtinfo
.
version
);
let
client_version
=
parseInt
(
wgtinfo
.
version
);
...
@@ -56,6 +57,7 @@ export default function appUpdate(loginApp) {
...
@@ -56,6 +57,7 @@ export default function appUpdate(loginApp) {
var
flag_hot
=
true
;
var
flag_hot
=
true
;
console
.
log
(
verC
)
console
.
log
(
verC
)
if
(
verC
>=
0
)
{
if
(
verC
>=
0
)
{
console
.
log
(
'无更新'
)
loginApp
.
showProcess
(
'无版本更新,欢迎使用'
,
100
)
loginApp
.
showProcess
(
'无版本更新,欢迎使用'
,
100
)
uni
.
hideLoading
()
uni
.
hideLoading
()
loginApp
.
$Router
.
replaceAll
({
loginApp
.
$Router
.
replaceAll
({
...
@@ -159,6 +161,7 @@ export default function appUpdate(loginApp) {
...
@@ -159,6 +161,7 @@ export default function appUpdate(loginApp) {
})
})
}
catch
(
e
)
{
}
catch
(
e
)
{
console
.
log
(
e
,
'err'
)
uni
.
hideLoading
()
uni
.
hideLoading
()
if
(
!
hasLogin
){
if
(
!
hasLogin
){
loginApp
.
$Router
.
replaceAll
({
loginApp
.
$Router
.
replaceAll
({
...
@@ -185,7 +188,7 @@ export default function appUpdate(loginApp) {
...
@@ -185,7 +188,7 @@ export default function appUpdate(loginApp) {
let
verC
=
versionStringCompare
(
wgtinfo
.
version
,
res
.
data
.
version
+
''
);
let
verC
=
versionStringCompare
(
wgtinfo
.
version
,
res
.
data
.
version
+
''
);
var
flag_hot
=
true
;
var
flag_hot
=
true
;
if
(
verC
>=
0
)
{
if
(
verC
>=
0
)
{
loginApp
.
showProcess
(
'无版本更新,欢迎使用
金属科技安全云
'
,
100
)
loginApp
.
showProcess
(
'无版本更新,欢迎使用'
,
100
)
// if(!hasLogin){
// if(!hasLogin){
// }
// }
...
...
pages/dl_cmaterial/index.vue
View file @
af6bf88b
...
@@ -549,14 +549,14 @@
...
@@ -549,14 +549,14 @@
},
},
onLoad
(
e
)
{
onLoad
(
e
)
{
this
.
f5Gw
()
this
.
f5Gw
()
eventBus
.
$on
(
'sendInfo'
,
function
(
data
)
{
/* 配盘单号无法选中,暂时取消 */
// this.wlinfor = data.wlinfor
// eventBus.$on('sendInfo', function(data) {
if
(
data
.
type
==
'xzppdh'
){
//
if(data.type=='xzppdh'){
this
.
ppdInfo
.
djid
=
data
.
data
.
djid
//
this.ppdInfo.djid=data.data.djid
this
.
ppdInfo
.
pptzdid
=
data
.
data
.
id
//
this.ppdInfo.pptzdid=data.data.id
}
//
}
console
.
log
(
data
,
'bySendInfo'
)
//
console.log(data,'bySendInfo')
}.
bind
(
this
));
//
}.bind(this));
if
(
!
e
.
query
)
{
if
(
!
e
.
query
)
{
return
return
}
}
...
...
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