From 0abbc58f9cb4811ea77d68abdf46c9dd8b370ff8 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 10 一月 2024 08:29:55 +0800
Subject: [PATCH] #
---
zy-asrs-openapi/src/main/webapp/views/generateOrderPakOut.html | 3
zy-asrs-openapi/src/main/webapp/static/images/createMat.png | 0
zy-asrs-openapi/src/main/webapp/views/reportCancel.html | 3
zy-asrs-openapi/src/main/webapp/views/index.html | 49 ++++++--
zy-asrs-openapi/src/main/webapp/views/reportApiManage.html | 7
zy-asrs-openapi/src/main/webapp/views/getOrderList.html | 3
zy-asrs-openapi/src/main/webapp/views/getOrderType.html | 3
zy-asrs-openapi/src/main/webapp/views/default.html | 224 +++++++++++++++++++++++++++++++++++++
zy-asrs-openapi/src/main/webapp/views/generateOrderPakIn.html | 3
zy-asrs-openapi/src/main/webapp/static/images/generateOrderPakIn.png | 0
zy-asrs-openapi/src/main/webapp/views/reportCompleted.html | 3
zy-asrs-openapi/src/main/webapp/static/images/generateOrderPakOut.png | 0
zy-asrs-openapi/src/main/webapp/views/createMat.html | 3
zy-asrs-openapi/src/main/webapp/views/getOrderStatus.html | 3
zy-asrs-openapi/src/main/webapp/views/reportStock.html | 3
zy-asrs-openapi/src/main/webapp/static/css/common.css | 23 +++
16 files changed, 305 insertions(+), 25 deletions(-)
diff --git a/zy-asrs-openapi/src/main/webapp/static/css/common.css b/zy-asrs-openapi/src/main/webapp/static/css/common.css
index 57ea2cb..5d5bf34 100644
--- a/zy-asrs-openapi/src/main/webapp/static/css/common.css
+++ b/zy-asrs-openapi/src/main/webapp/static/css/common.css
@@ -93,3 +93,26 @@
.slider > .el-divider {
margin: 5px 0;
}
+
+.content-header {
+ background: #409EFF;
+ color: #fff;
+ display: flex;
+ align-items: center;
+}
+
+.content-header > .header-logo {
+ width: 150px;
+ height: auto;
+}
+
+.content-body {
+ margin-top: 20px;
+ display: flex;
+ justify-content: space-around;
+ flex-wrap: wrap;
+}
+
+.content-body .content-desc {
+ text-align: center;
+}
\ No newline at end of file
diff --git a/zy-asrs-openapi/src/main/webapp/static/images/createMat.png b/zy-asrs-openapi/src/main/webapp/static/images/createMat.png
new file mode 100644
index 0000000..8009b07
--- /dev/null
+++ b/zy-asrs-openapi/src/main/webapp/static/images/createMat.png
Binary files differ
diff --git a/zy-asrs-openapi/src/main/webapp/static/images/generateOrderPakIn.png b/zy-asrs-openapi/src/main/webapp/static/images/generateOrderPakIn.png
new file mode 100644
index 0000000..d304165
--- /dev/null
+++ b/zy-asrs-openapi/src/main/webapp/static/images/generateOrderPakIn.png
Binary files differ
diff --git a/zy-asrs-openapi/src/main/webapp/static/images/generateOrderPakOut.png b/zy-asrs-openapi/src/main/webapp/static/images/generateOrderPakOut.png
new file mode 100644
index 0000000..0b9083c
--- /dev/null
+++ b/zy-asrs-openapi/src/main/webapp/static/images/generateOrderPakOut.png
Binary files differ
diff --git a/zy-asrs-openapi/src/main/webapp/views/createMat.html b/zy-asrs-openapi/src/main/webapp/views/createMat.html
index 54e1dcd..5e182b9 100644
--- a/zy-asrs-openapi/src/main/webapp/views/createMat.html
+++ b/zy-asrs-openapi/src/main/webapp/views/createMat.html
@@ -15,7 +15,8 @@
<div id="app">
<div id="content"></div>
<div class="slider">
- <div><el-button type="text" @click="switchPage('index.html')">瑙勮寖璇存槑</el-button></div>
+ <div><el-button type="text" @click="switchPage('index.html')">绠�浠�</el-button></div>
+ <div><el-button type="text" @click="switchPage('default.html')">瑙勮寖璇存槑</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('reportCompleted.html')">璁㈠崟瀹屾垚涓婃姤</el-button></div>
<div><el-button type="text" @click="switchPage('reportCancel.html')">璁㈠崟鍙栨秷涓婃姤</el-button></div>
diff --git a/zy-asrs-openapi/src/main/webapp/views/default.html b/zy-asrs-openapi/src/main/webapp/views/default.html
new file mode 100644
index 0000000..6caec88
--- /dev/null
+++ b/zy-asrs-openapi/src/main/webapp/views/default.html
@@ -0,0 +1,224 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>API寮�鏀惧钩鍙�</title>
+ <link rel="stylesheet" href="../static/css/element.css">
+ <link rel="stylesheet" href="../static/css/common.css">
+ <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="../static/js/vue.min.js"></script>
+ <script type="text/javascript" src="../static/js/showdown.min.js"></script>
+ <script type="text/javascript" src="../static/js/common.js"></script>
+ <script type="text/javascript" src="../static/js/element.js"></script>
+</head>
+<body>
+ <div id="app">
+ <div id="content"></div>
+ <div class="slider">
+ <div><el-button type="text" @click="switchPage('index.html')">绠�浠�</el-button></div>
+ <div><el-button type="text" @click="switchPage('default.html')">瑙勮寖璇存槑</el-button></div>
+ <el-divider></el-divider>
+ <div><el-button type="text" @click="switchPage('reportCompleted.html')">璁㈠崟瀹屾垚涓婃姤</el-button></div>
+ <div><el-button type="text" @click="switchPage('reportCancel.html')">璁㈠崟鍙栨秷涓婃姤</el-button></div>
+ <div><el-button type="text" @click="switchPage('reportStock.html')">搴撳瓨涓婃姤</el-button></div>
+ <div><el-button type="text" @click="switchPage('reportApiManage.html')">涓婃姤API绠＄悊</el-button></div>
+ <el-divider></el-divider>
+ <div><el-button type="text" @click="switchPage('getOrderType.html')">鑾峰彇璁㈠崟绫诲瀷</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderStatus.html')">鑾峰彇璁㈠崟鐘舵�佸垪琛�</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderList.html')">鑾峰彇璁㈠崟鍒楄〃</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakOut.html')">鐢熸垚鍑哄簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('createMat.html')">娣诲姞鐗╂枡淇℃伅</el-button></div>
+ <el-divider></el-divider>
+ <div><el-button type="text" @click="keyList()">瀵嗛挜绠＄悊</el-button></div>
+ </div>
+
+ <el-dialog title="瀵嗛挜绠＄悊" :visible.sync="keyTableVisible">
+ <el-table :data="keyTableData" v-loading="loading">
+ <el-table-column property="hostId$" label="浠撳簱"></el-table-column>
+ <el-table-column property="signKey" label="绛惧悕瀵嗛挜" width="150"></el-table-column>
+ <el-table-column property="appKey" label="鎺ュ彛璇锋眰瀵嗛挜" width="250"></el-table-column>
+ <el-table-column property="createTime$" label="鏃堕棿" width="200"></el-table-column>
+ <el-table-column label="鎿嶄綔" width="400">
+ <template slot-scope="scope">
+ <el-button size="mini" @click="generateSignKey(scope.row.hostId)">绛惧悕瀵嗛挜</el-button>
+ <el-button size="mini" @click="generateAppKey(scope.row.hostId)">鎺ュ彛瀵嗛挜</el-button>
+ <el-switch
+ v-model="scope.row.signStatus"
+ @change="switchChange(scope.row.hostId,scope.row.signStatus)"
+ active-text="寮�鍚鍚�"
+ inactive-text="鍏抽棴绛惧悕">
+ </el-switch>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-dialog>
+ </div>
+
+ <script>
+ showdown.setOption('tables', true);
+ var converter = new showdown.Converter()
+
+ var app = new Vue({
+ el: '#app',
+ data: {
+ keyTableVisible: false,
+ keyTableData: [],
+ loading: true,
+ },
+ created() {
+ this.init()
+ },
+ methods: {
+ init() {
+ this.introduceClick()
+ },
+ introduceClick() {
+ $.ajax({
+ url: "md/introduce.md",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ // $("#content").html(marked.parse(res))
+ // console.log(converter.makeHtml(res))
+ $("#content").html(converter.makeHtml(res))
+ }
+ });
+ },
+ keyList() {
+ let that = this
+ this.keyTableVisible = true
+ $.ajax({
+ url: baseUrl + "/hostKey/list/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {},
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ let tmp = []
+ res.data.forEach((item, index) => {
+ item.signStatus = item.signStatus == 1 ? true : false;
+ tmp.push(item)
+ });
+ that.keyTableData = tmp
+ that.loading = false
+ }
+ });
+ },
+ generateSignKey(hostId) {
+ let that = this
+ this.$confirm('姝ゆ搷浣滃皢瑕嗙洊鍘熺鍚嶅瘑閽�, 鏄惁缁х画?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ $.ajax({
+ url: baseUrl + "/hostKey/generateSignKey/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ hostId: hostId
+ },
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ that.$message({
+ type: 'success',
+ message: '鐢熸垚鎴愬姛'
+ });
+
+ that.keyTableData.forEach((item, index) => {
+ if (item.hostId == hostId) {
+ item.signKey = res.data.signKey
+ }
+ });
+ } else {
+ that.$message({
+ type: 'error',
+ message: res.msg
+ });
+ }
+ }
+ });
+ }).catch(() => {
+ //鍙栨秷
+ });
+ },
+ generateAppKey(hostId) {
+ let that = this
+ this.$confirm('姝ゆ搷浣滃皢瑕嗙洊鍘熸帴鍙ｅ瘑閽�, 鏄惁缁х画?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ $.ajax({
+ url: baseUrl + "/hostKey/generateAppKey/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ hostId: hostId
+ },
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ that.$message({
+ type: 'success',
+ message: '鐢熸垚鎴愬姛'
+ });
+
+ that.keyTableData.forEach((item, index) => {
+ if (item.hostId == hostId) {
+ item.appKey = res.data.appKey
+ }
+ });
+ } else {
+ that.$message({
+ type: 'error',
+ message: res.msg
+ });
+ }
+ }
+ });
+ }).catch(() => {
+ //鍙栨秷
+ });
+ },
+ switchChange(hostId, signStatus) {
+ let that = this
+ //绛惧悕鏍￠獙寮�鍏�
+ $.ajax({
+ url: baseUrl + "/hostKey/switchSign/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ hostId: hostId,
+ signStatus: signStatus ? 1 : 0,
+ },
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ that.$message({
+ type: 'success',
+ message: '鍒囨崲鎴愬姛'
+ });
+ } else {
+ that.$message({
+ type: 'error',
+ message: res.msg
+ });
+ }
+ }
+ });
+ },
+ switchPage(url) {
+ location.href = url
+ },
+ }
+ })
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/zy-asrs-openapi/src/main/webapp/views/generateOrderPakIn.html b/zy-asrs-openapi/src/main/webapp/views/generateOrderPakIn.html
index c2ebad0..b1d550d 100644
--- a/zy-asrs-openapi/src/main/webapp/views/generateOrderPakIn.html
+++ b/zy-asrs-openapi/src/main/webapp/views/generateOrderPakIn.html
@@ -15,7 +15,8 @@
<div id="app">
<div id="content"></div>
<div class="slider">
- <div><el-button type="text" @click="switchPage('index.html')">瑙勮寖璇存槑</el-button></div>
+ <div><el-button type="text" @click="switchPage('index.html')">绠�浠�</el-button></div>
+ <div><el-button type="text" @click="switchPage('default.html')">瑙勮寖璇存槑</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('reportCompleted.html')">璁㈠崟瀹屾垚涓婃姤</el-button></div>
<div><el-button type="text" @click="switchPage('reportCancel.html')">璁㈠崟鍙栨秷涓婃姤</el-button></div>
diff --git a/zy-asrs-openapi/src/main/webapp/views/generateOrderPakOut.html b/zy-asrs-openapi/src/main/webapp/views/generateOrderPakOut.html
index c7cb772..a885409 100644
--- a/zy-asrs-openapi/src/main/webapp/views/generateOrderPakOut.html
+++ b/zy-asrs-openapi/src/main/webapp/views/generateOrderPakOut.html
@@ -15,7 +15,8 @@
<div id="app">
<div id="content"></div>
<div class="slider">
- <div><el-button type="text" @click="switchPage('index.html')">瑙勮寖璇存槑</el-button></div>
+ <div><el-button type="text" @click="switchPage('index.html')">绠�浠�</el-button></div>
+ <div><el-button type="text" @click="switchPage('default.html')">瑙勮寖璇存槑</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('reportCompleted.html')">璁㈠崟瀹屾垚涓婃姤</el-button></div>
<div><el-button type="text" @click="switchPage('reportCancel.html')">璁㈠崟鍙栨秷涓婃姤</el-button></div>
diff --git a/zy-asrs-openapi/src/main/webapp/views/getOrderList.html b/zy-asrs-openapi/src/main/webapp/views/getOrderList.html
index aebc2ab..0f47d61 100644
--- a/zy-asrs-openapi/src/main/webapp/views/getOrderList.html
+++ b/zy-asrs-openapi/src/main/webapp/views/getOrderList.html
@@ -15,7 +15,8 @@
<div id="app">
<div id="content"></div>
<div class="slider">
- <div><el-button type="text" @click="switchPage('index.html')">瑙勮寖璇存槑</el-button></div>
+ <div><el-button type="text" @click="switchPage('index.html')">绠�浠�</el-button></div>
+ <div><el-button type="text" @click="switchPage('default.html')">瑙勮寖璇存槑</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('reportCompleted.html')">璁㈠崟瀹屾垚涓婃姤</el-button></div>
<div><el-button type="text" @click="switchPage('reportCancel.html')">璁㈠崟鍙栨秷涓婃姤</el-button></div>
diff --git a/zy-asrs-openapi/src/main/webapp/views/getOrderStatus.html b/zy-asrs-openapi/src/main/webapp/views/getOrderStatus.html
index 20f0d32..5eed730 100644
--- a/zy-asrs-openapi/src/main/webapp/views/getOrderStatus.html
+++ b/zy-asrs-openapi/src/main/webapp/views/getOrderStatus.html
@@ -15,7 +15,8 @@
<div id="app">
<div id="content"></div>
<div class="slider">
- <div><el-button type="text" @click="switchPage('index.html')">瑙勮寖璇存槑</el-button></div>
+ <div><el-button type="text" @click="switchPage('index.html')">绠�浠�</el-button></div>
+ <div><el-button type="text" @click="switchPage('default.html')">瑙勮寖璇存槑</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('reportCompleted.html')">璁㈠崟瀹屾垚涓婃姤</el-button></div>
<div><el-button type="text" @click="switchPage('reportCancel.html')">璁㈠崟鍙栨秷涓婃姤</el-button></div>
diff --git a/zy-asrs-openapi/src/main/webapp/views/getOrderType.html b/zy-asrs-openapi/src/main/webapp/views/getOrderType.html
index 655df7a..0401bb7 100644
--- a/zy-asrs-openapi/src/main/webapp/views/getOrderType.html
+++ b/zy-asrs-openapi/src/main/webapp/views/getOrderType.html
@@ -15,7 +15,8 @@
<div id="app">
<div id="content"></div>
<div class="slider">
- <div><el-button type="text" @click="switchPage('index.html')">瑙勮寖璇存槑</el-button></div>
+ <div><el-button type="text" @click="switchPage('index.html')">绠�浠�</el-button></div>
+ <div><el-button type="text" @click="switchPage('default.html')">瑙勮寖璇存槑</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('reportCompleted.html')">璁㈠崟瀹屾垚涓婃姤</el-button></div>
<div><el-button type="text" @click="switchPage('reportCancel.html')">璁㈠崟鍙栨秷涓婃姤</el-button></div>
diff --git a/zy-asrs-openapi/src/main/webapp/views/index.html b/zy-asrs-openapi/src/main/webapp/views/index.html
index 11fe5c6..0c1c354 100644
--- a/zy-asrs-openapi/src/main/webapp/views/index.html
+++ b/zy-asrs-openapi/src/main/webapp/views/index.html
@@ -13,9 +13,31 @@
</head>
<body>
<div id="app">
- <div id="content"></div>
+ <div id="content">
+ <div class="content-header">
+ <div><img src="../static/images/zy-logo.png" class="header-logo"></div>
+ <h1>API寮�鏀惧钩鍙皏1.0</h1>
+ </div>
+ <div class="content-body">
+ <div>
+ <div>
+ <img src="../static/images/generateOrderPakIn.png" style="width: 640px;height: 740px;">
+ </div>
+ <div class="content-desc">鐢熸垚鍏ュ簱璁㈠崟</div>
+ </div>
+ <div>
+ <img src="../static/images/generateOrderPakOut.png" style="width: 640px;height: 740px;">
+ <div class="content-desc">鐢熸垚鍑哄簱璁㈠崟</div>
+ </div>
+ <div>
+ <img src="../static/images/createMat.png" style="width: 640px;height: 740px;">
+ <div class="content-desc">娣诲姞鐗╂枡</div>
+ </div>
+ </div>
+ </div>
<div class="slider">
- <div><el-button type="text" @click="switchPage('index.html')">瑙勮寖璇存槑</el-button></div>
+ <div><el-button type="text" @click="switchPage('index.html')">绠�浠�</el-button></div>
+ <div><el-button type="text" @click="switchPage('default.html')">瑙勮寖璇存槑</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('reportCompleted.html')">璁㈠崟瀹屾垚涓婃姤</el-button></div>
<div><el-button type="text" @click="switchPage('reportCancel.html')">璁㈠崟鍙栨秷涓婃姤</el-button></div>
@@ -64,6 +86,7 @@
keyTableVisible: false,
keyTableData: [],
loading: true,
+ activeIndex: '1'
},
created() {
this.init()
@@ -73,16 +96,16 @@
this.introduceClick()
},
introduceClick() {
- $.ajax({
- url: "md/introduce.md",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- // $("#content").html(marked.parse(res))
- // console.log(converter.makeHtml(res))
- $("#content").html(converter.makeHtml(res))
- }
- });
+ // $.ajax({
+ // url: "md/introduce.md",
+ // headers: {'token': localStorage.getItem('token')},
+ // method: 'GET',
+ // success: function (res) {
+ // // $("#content").html(marked.parse(res))
+ // // console.log(converter.makeHtml(res))
+ // $("#content").html(converter.makeHtml(res))
+ // }
+ // });
},
keyList() {
let that = this
@@ -215,7 +238,7 @@
},
switchPage(url) {
location.href = url
- },
+ }
}
})
</script>
diff --git a/zy-asrs-openapi/src/main/webapp/views/reportApiManage.html b/zy-asrs-openapi/src/main/webapp/views/reportApiManage.html
index cc5d48a..d194ff1 100644
--- a/zy-asrs-openapi/src/main/webapp/views/reportApiManage.html
+++ b/zy-asrs-openapi/src/main/webapp/views/reportApiManage.html
@@ -73,7 +73,8 @@
</div>
<div class="slider">
- <div><el-button type="text" @click="switchPage('index.html')">瑙勮寖璇存槑</el-button></div>
+ <div><el-button type="text" @click="switchPage('index.html')">绠�浠�</el-button></div>
+ <div><el-button type="text" @click="switchPage('default.html')">瑙勮寖璇存槑</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('reportCompleted.html')">璁㈠崟瀹屾垚涓婃姤</el-button></div>
<div><el-button type="text" @click="switchPage('reportCancel.html')">璁㈠崟鍙栨秷涓婃姤</el-button></div>
@@ -86,8 +87,8 @@
<div><el-button type="text" @click="switchPage('generateOrderPakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
<div><el-button type="text" @click="switchPage('generateOrderPakOut.html')">鐢熸垚鍑哄簱璁㈠崟</el-button></div>
<div><el-button type="text" @click="switchPage('createMat.html')">娣诲姞鐗╂枡淇℃伅</el-button></div>
- <el-divider></el-divider>
- <div><el-button type="text" @click="keyList()">瀵嗛挜绠＄悊</el-button></div>
+<!-- <el-divider></el-divider>-->
+<!-- <div><el-button type="text" @click="keyList()">瀵嗛挜绠＄悊</el-button></div>-->
</div>
<el-dialog title="鎺ュ彛绠＄悊" :visible.sync="formVisible">
diff --git a/zy-asrs-openapi/src/main/webapp/views/reportCancel.html b/zy-asrs-openapi/src/main/webapp/views/reportCancel.html
index f37a1a3..8647242 100644
--- a/zy-asrs-openapi/src/main/webapp/views/reportCancel.html
+++ b/zy-asrs-openapi/src/main/webapp/views/reportCancel.html
@@ -15,7 +15,8 @@
<div id="app">
<div id="content"></div>
<div class="slider">
- <div><el-button type="text" @click="switchPage('index.html')">瑙勮寖璇存槑</el-button></div>
+ <div><el-button type="text" @click="switchPage('index.html')">绠�浠�</el-button></div>
+ <div><el-button type="text" @click="switchPage('default.html')">瑙勮寖璇存槑</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('reportCompleted.html')">璁㈠崟瀹屾垚涓婃姤</el-button></div>
<div><el-button type="text" @click="switchPage('reportCancel.html')">璁㈠崟鍙栨秷涓婃姤</el-button></div>
diff --git a/zy-asrs-openapi/src/main/webapp/views/reportCompleted.html b/zy-asrs-openapi/src/main/webapp/views/reportCompleted.html
index 07a4dc6..5a01b37 100644
--- a/zy-asrs-openapi/src/main/webapp/views/reportCompleted.html
+++ b/zy-asrs-openapi/src/main/webapp/views/reportCompleted.html
@@ -15,7 +15,8 @@
<div id="app">
<div id="content"></div>
<div class="slider">
- <div><el-button type="text" @click="switchPage('index.html')">瑙勮寖璇存槑</el-button></div>
+ <div><el-button type="text" @click="switchPage('index.html')">绠�浠�</el-button></div>
+ <div><el-button type="text" @click="switchPage('default.html')">瑙勮寖璇存槑</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('reportCompleted.html')">璁㈠崟瀹屾垚涓婃姤</el-button></div>
<div><el-button type="text" @click="switchPage('reportCancel.html')">璁㈠崟鍙栨秷涓婃姤</el-button></div>
diff --git a/zy-asrs-openapi/src/main/webapp/views/reportStock.html b/zy-asrs-openapi/src/main/webapp/views/reportStock.html
index 81a239d..6118f89 100644
--- a/zy-asrs-openapi/src/main/webapp/views/reportStock.html
+++ b/zy-asrs-openapi/src/main/webapp/views/reportStock.html
@@ -15,7 +15,8 @@
<div id="app">
<div id="content"></div>
<div class="slider">
- <div><el-button type="text" @click="switchPage('index.html')">瑙勮寖璇存槑</el-button></div>
+ <div><el-button type="text" @click="switchPage('index.html')">绠�浠�</el-button></div>
+ <div><el-button type="text" @click="switchPage('default.html')">瑙勮寖璇存槑</el-button></div>
<el-divider></el-divider>
<div><el-button type="text" @click="switchPage('reportCompleted.html')">璁㈠崟瀹屾垚涓婃姤</el-button></div>
<div><el-button type="text" @click="switchPage('reportCancel.html')">璁㈠崟鍙栨秷涓婃姤</el-button></div>
--
Gitblit v1.9.1