Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
web-project
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
海康威视
web-project
Commits
272867cc
Commit
272867cc
authored
Aug 05, 2024
by
王亚晖
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改远程写入状态页
parent
100c3983
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
74 additions
and
33 deletions
+74
-33
http.js
src/api/http.js
+1
-1
TransferStatusControl.vue
src/components/Remote/TransferStatusControl.vue
+71
-30
login.vue
src/views/login/login.vue
+2
-2
No files found.
src/api/http.js
View file @
272867cc
...
...
@@ -22,7 +22,7 @@ if (!axios.defaults.baseURL.endsWith('/')) {
let
ipAddress
=
axios
.
defaults
.
baseURL
;
axios
.
interceptors
.
request
.
use
((
config
)
=>
{
config
.
baseURL
=
store
.
getters
.
getSERVEICE
();
console
.
log
(
config
.
baseURL
);
//
console.log(config.baseURL);
return
config
;
},
(
error
)
=>
{
return
Promise
.
reject
(
error
);
...
...
src/components/Remote/TransferStatusControl.vue
View file @
272867cc
...
...
@@ -202,7 +202,7 @@
<el-table-column
fixed=
"right"
label=
"操作"
width=
"100"
>
<
template
#
default=
"{ row }"
>
<el-button
link
type=
"primary"
:isLoading=
"isLoading"
size=
"small"
@
click=
"ReadStatus(row)"
>
读取
</el-button>
<el-button
link
type=
"primary"
size=
"small"
@
click=
"WriteStatus(row)"
>
写入
</el-button>
<el-button
link
type=
"primary"
:isLoading=
"isLoading"
:disabled=
"row.isDisabled"
size=
"small"
@
click=
"WriteStatus(row)"
>
写入
</el-button>
</
template
>
</el-table-column>
</el-table>
...
...
@@ -230,7 +230,7 @@
const
progress
=
ref
(
0
);
const
progressStatus
=
ref
(
''
);
const
myIndeterminate
=
ref
(
false
);
onMounted
(()
=>
{
setContentHeight
();
window
.
addEventListener
(
'resize'
,
setContentHeight
);
...
...
@@ -333,6 +333,7 @@
element
.
criclePump3AutoOrManual
=
jobj
.
criclePump3AutoOrManual
;
element
.
criclePump4AutoOrManual
=
jobj
.
criclePump4AutoOrManual
;
element
.
secCriclePumpAutoOrManual
=
jobj
.
secCriclePumpAutoOrManual
;
element
.
isDisabled
=
jobj
.
isDisabled
;
//console.log("gainMode:"+jobj.gainMode);
break
;
}
...
...
@@ -343,35 +344,75 @@
}
}
async
function
WriteStation
(
element
){
console
.
log
(
"write row:"
+
element
);
var
writeValue
=
""
;
writeValue
+=
"jdValue:"
+
element
.
jdValue
element
.
jdValue
=
jobj
.;
elejdValuement
.
gainMode
=
jobj
.
gainMode
;
element
.
weatherMode
=
jobj
.
weatherMode
;
element
.
curveMode
=
jobj
.
curveMode
;
element
.
criclePump1
=
jobj
.
criclePump1
;
element
.
criclePump2
=
jobj
.
criclePump2
;
element
.
pump3
=
jobj
.
pump3
;
element
.
pump4
=
jobj
.
pump4
;
element
.
replenishingPump
=
jobj
.
replenishingPump
;
element
.
secPump1
=
jobj
.
secPump1
;
element
.
secPump2
=
jobj
.
secPump2
;
element
.
evc1AutoOrManual
=
jobj
.
evc1AutoOrManual
;
element
.
evc2AutoOrManual
=
jobj
.
evc2AutoOrManual
;
element
.
evc3AutoOrManual
=
jobj
.
evc3AutoOrManual
;
element
.
evc4AutoOrManual
=
jobj
.
evc4AutoOrManual
;
element
.
criclePump1AutoOrManual
=
jobj
.
criclePump1AutoOrManual
;
element
.
criclePump2AutoOrManual
=
jobj
.
criclePump2AutoOrManual
;
element
.
criclePump3AutoOrManual
=
jobj
.
criclePump3AutoOrManual
;
element
.
criclePump4AutoOrManual
=
jobj
.
criclePump4AutoOrManual
;
element
.
secCriclePumpAutoOrManual
=
jobj
.
secCriclePumpAutoOrManual
;
try
{
console
.
log
(
"write row:"
+
element
);
var
writeValue
=
""
;
if
(
element
.
jdValue
!=
null
){
writeValue
+=
"jdValue:"
+
element
.
jdValue
+
";"
;
}
if
(
element
.
gainMode
!=
null
){
writeValue
+=
"gainMode:"
+
element
.
gainMode
+
";"
;
}
if
(
element
.
curveMode
!=
null
){
writeValue
+=
"curveMode:"
+
element
.
curveMode
+
";"
;
}
if
(
element
.
criclePump1
!=
null
){
writeValue
+=
"criclePump1:"
+
element
.
criclePump1
+
";"
;
}
if
(
element
.
criclePump2
!=
null
){
writeValue
+=
"criclePump2:"
+
element
.
criclePump2
+
";"
;
}
if
(
element
.
pump3
!=
null
){
writeValue
+=
"pump3:"
+
element
.
pump3
+
";"
;
}
if
(
element
.
pump4
!=
null
){
writeValue
+=
"pump4:"
+
element
.
pump4
+
";"
;
}
if
(
element
.
replenishingPump
!=
null
){
writeValue
+=
"replenishingPump:"
+
element
.
replenishingPump
+
";"
;
}
if
(
element
.
replenishingPump
!=
null
){
writeValue
+=
"secPump1:"
+
element
.
secPump1
+
";"
;
}
if
(
element
.
replenishingPump
!=
null
){
writeValue
+=
"secPump2:"
+
element
.
secPump2
+
";"
;
}
if
(
element
.
replenishingPump
!=
null
){
writeValue
+=
"evc1AutoOrManual:"
+
element
.
evc1AutoOrManual
+
";"
;
}
if
(
element
.
replenishingPump
!=
null
){
writeValue
+=
"evc2AutoOrManual:"
+
element
.
evc2AutoOrManual
+
";"
;
}
if
(
element
.
replenishingPump
!=
null
){
writeValue
+=
"evc3AutoOrManual:"
+
element
.
evc3AutoOrManual
+
";"
;
}
if
(
element
.
replenishingPump
!=
null
){
writeValue
+=
"evc4AutoOrManual:"
+
element
.
evc4AutoOrManual
+
";"
;
}
if
(
element
.
replenishingPump
!=
null
){
writeValue
+=
"criclePump1AutoOrManual:"
+
element
.
criclePump1AutoOrManual
+
";"
;
}
if
(
element
.
replenishingPump
!=
null
){
writeValue
+=
"criclePump2AutoOrManual:"
+
element
.
criclePump2AutoOrManual
+
";"
;
}
if
(
element
.
replenishingPump
!=
null
){
writeValue
+=
"criclePump3AutoOrManual:"
+
element
.
criclePump3AutoOrManual
+
";"
;
}
if
(
element
.
replenishingPump
!=
null
){
writeValue
+=
"criclePump4AutoOrManual:"
+
element
.
criclePump4AutoOrManual
+
";"
;
}
if
(
element
.
replenishingPump
!=
null
){
writeValue
+=
"secCriclePumpAutoOrManual:"
+
element
.
secCriclePumpAutoOrManual
+
";"
;
}
var
result
=
await
http
.
post
(
'/api/remote/WriteTransferStatus'
,
value
);
if
(
result
.
success
){
ElMessage
.
success
(
result
.
message
);
}
else
{
ElMessage
.
error
(
result
.
message
);
var
result
=
await
http
.
post
(
'/api/remote/WriteTransferStatus'
,
{
"TransferId"
:
element
.
transferId
,
"WriteValues"
:
writeValue
});
if
(
result
.
success
){
ElMessage
.
success
(
result
.
message
);
}
else
{
ElMessage
.
error
(
result
.
message
);
}
}
catch
(
error
){
ElMessage
.
error
(
error
.
message
);
}
}
function
setCellStyle
({
row
,
column
,
rowIndex
,
columnIndex
})
{
...
...
src/views/login/login.vue
View file @
272867cc
...
...
@@ -247,7 +247,7 @@ async function fetchClientIp() {
store
.
commit
(
'setSERVEICE'
,
data
.
ip
);
//http.ipAddress = store.getters.getSERVEICE;
console
.
log
(
"changeip:"
+
clientIp
.
value
+
" "
);
//
console.log("changeip:" + clientIp.value + " ");
getPicture
();
}
catch
(
error
)
{
clientIp
.
value
=
'获取失败'
;
...
...
@@ -258,7 +258,7 @@ async function fetchClientIp() {
async
function
getPicture
()
{
try
{
var
serverIP
=
localStorage
.
getItem
(
"SERVEICE"
);
console
.
log
(
clientIp
.
value
+
" "
+
serverIP
);
//
console.log(clientIp.value + " " + serverIP);
if
(
!
serverIP
||
serverIP
==
null
||
serverIP
==
""
)
{
await
fetchClientIp
();
}
...
...
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