Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
edge
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to JiHu GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
成恩 伍
edge
Commits
ed9e3ae7
Commit
ed9e3ae7
authored
2 years ago
by
wce
Browse files
Options
Downloads
Patches
Plain Diff
修改了数据格式
parent
1a8a896a
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.idea/workspace.xml
+23
-4
23 additions, 4 deletions
.idea/workspace.xml
README.md
+1
-0
1 addition, 0 deletions
README.md
app.py
+1
-1
1 addition, 1 deletion
app.py
with
25 additions
and
5 deletions
.idea/workspace.xml
+
23
−
4
View file @
ed9e3ae7
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"568b48a6-ca7f-4dc8-b0ca-a3d09f437fa9"
name=
"Default Changelist"
comment=
""
>
<list
default=
"true"
id=
"568b48a6-ca7f-4dc8-b0ca-a3d09f437fa9"
name=
"Default Changelist"
comment=
"
修改了dockerfile
"
>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/Dockerfile"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/Dockerfile"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/README.md"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/README.md"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/app.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/app.py"
afterDir=
"false"
/>
</list>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
...
...
@@ -77,13 +77,32 @@
<option
name=
"presentableId"
value=
"Default"
/>
<updated>
1656170531021
</updated>
</task>
<task
id=
"LOCAL-00001"
summary=
"修改了dockerfile"
>
<created>
1656173903142
</created>
<option
name=
"number"
value=
"00001"
/>
<option
name=
"presentableId"
value=
"LOCAL-00001"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1656173903142
</updated>
</task>
<task
id=
"LOCAL-00002"
summary=
"修改了dockerfile"
>
<created>
1656174046943
</created>
<option
name=
"number"
value=
"00002"
/>
<option
name=
"presentableId"
value=
"LOCAL-00002"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1656174046943
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"3"
/>
<servers
/>
</component>
<component
name=
"VcsManagerConfiguration"
>
<MESSAGE
value=
"修改了dockerfile"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"修改了dockerfile"
/>
</component>
<component
name=
"WindowStateProjectService"
>
<state
x=
"409"
y=
"6"
key=
"CommitChangelistDialog2"
timestamp=
"165617
3902460
"
>
<state
x=
"409"
y=
"6"
key=
"CommitChangelistDialog2"
timestamp=
"165617
4274885
"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
<state
x=
"409"
y=
"6"
key=
"CommitChangelistDialog2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"165617
3902460
"
/>
<state
x=
"409"
y=
"6"
key=
"CommitChangelistDialog2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"165617
4274885
"
/>
<state
x=
"549"
y=
"167"
key=
"FileChooserDialogImpl"
timestamp=
"1656170973860"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
...
...
This diff is collapsed.
Click to expand it.
README.md
+
1
−
0
View file @
ed9e3ae7
### 部署操作
+
docker stop edge
+
docker rm edge
+
docker rmi edge
+
docker build -t edge .
+
docker run -d -p 7001:7001 --name edge edge
\ No newline at end of file
This diff is collapsed.
Click to expand it.
app.py
+
1
−
1
View file @
ed9e3ae7
...
...
@@ -14,7 +14,7 @@ def getDoorStatus():
message
=
"
识别异常不可进入
"
else
:
message
=
"
识别正常可以进入
"
Data
=
'
[
{status:
"'
+
str
(
status
)
+
'"
,
"
text
"
:
"'
+
str
(
message
)
+
'
}
]
'
Data
=
'
{status:
"'
+
str
(
status
)
+
'"
,
"
text
"
:
"'
+
str
(
message
)
+
'
}
'
return
Data
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment