From f79b37eae7b5242badc64b3079790226c860dde4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Mon, 8 Aug 2022 08:50:12 +0800
Subject: [PATCH] =?UTF-8?q?apk=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/ops.js          |  8 ++++
 src/api/model/system.js       | 16 +++++++
 src/config/index.js           |  2 +-
 src/config/route.js           | 20 +++++++++
 src/layout/index.vue          |  2 +-
 src/views/ops/log_request.vue |  2 +-
 src/views/ops/menu.vue        |  3 --
 src/views/ops/monitor.vue     |  0
 src/views/ops/server.vue      | 84 +++++++++++++++++++++++++++++++++++
 src/views/ops/setting.vue     | 57 ++++++++++++++++++++++++
 src/views/ops/thirdLogs.vue   |  2 +-
 src/views/sys/dept.vue        |  1 -
 src/views/sys/dict.vue        | 21 ++++-----
 13 files changed, 200 insertions(+), 18 deletions(-)
 delete mode 100644 src/views/ops/monitor.vue
 create mode 100644 src/views/ops/server.vue
 create mode 100644 src/views/ops/setting.vue

diff --git a/src/api/model/ops.js b/src/api/model/ops.js
index 0e076a4d..bba0e9a9 100644
--- a/src/api/model/ops.js
+++ b/src/api/model/ops.js
@@ -26,4 +26,12 @@ export default {
 			}
 		}
 	},
+	server: {
+		info: {
+			name: "服务器状态",
+			req: async function(name){
+				return await http.get(`${config.API_URL}/monitor/server/`);
+			}
+		}
+	}
 }
diff --git a/src/api/model/system.js b/src/api/model/system.js
index 4ba6ea12..a83e1b4d 100644
--- a/src/api/model/system.js
+++ b/src/api/model/system.js
@@ -341,6 +341,22 @@ export default {
 			}
 		},
 	},
+	apk:{
+		read: {
+			url: `${config.API_URL}/system/apk/`,
+			name: "apk信息",
+			req: async function(data){
+				return await http.get(this.url, data);
+			}
+		},
+		create: {
+			url: `${config.API_URL}/system/apk/`,
+			name: "apk创建",
+			req: async function(data){
+				return await http.post(this.url, data);
+			}
+		}
+	},
 	userPost:{
 		list: {
 			url: `${config.API_URL}/system/user_post/`,
diff --git a/src/config/index.js b/src/config/index.js
index 50478b33..378556b9 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -46,7 +46,7 @@ const DEFAULT_CONFIG = {
 	LANG: 'zh-cn',
 
 	//主题颜色
-	COLOR: '',
+	COLOR: '#536DFE',
 
 	//是否加密localStorage, 为空不加密，可填写AES(模式ECB,移位Pkcs7)加密
 	LS_ENCRYPTION: '',
diff --git a/src/config/route.js b/src/config/route.js
index b7fcc813..daf30c5b 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -755,6 +755,26 @@ const routes = [
         },
         "component": "ops/fileLogs"
       },
+      {
+        "name": "server",
+        "path": "/ops/server",
+        "meta": {
+          "title": "服务器",
+          "icon": "el-icon-document",
+          "perms": ["ops"]
+        },
+        "component": "ops/server"
+      },
+      {
+        "name": "setting",
+        "path": "/ops/setting",
+        "meta": {
+          "title": "配置",
+          "icon": "el-icon-document",
+          "perms": ["ops"]
+        },
+        "component": "ops/setting"
+      },
     ]
   },
 ]
diff --git a/src/layout/index.vue b/src/layout/index.vue
index f98e8c7a..616c3411 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -182,7 +182,7 @@
 
 	<div class="main-maximize-exit" @click="exitMaximize"><el-icon><el-icon-close /></el-icon></div>
 
-	<div class="layout-setting" @click="openSetting"><el-icon><el-icon-brush-filled /></el-icon></div>
+	<!-- <div class="layout-setting" @click="openSetting"><el-icon><el-icon-brush-filled /></el-icon></div> -->
 
 	<el-drawer title="布局实时演示" v-model="settingDialog" :size="400" append-to-body destroy-on-close>
 		<setting></setting>
diff --git a/src/views/ops/log_request.vue b/src/views/ops/log_request.vue
index cc9998d6..52970228 100644
--- a/src/views/ops/log_request.vue
+++ b/src/views/ops/log_request.vue
@@ -73,7 +73,7 @@
           min-width="100"
         ></el-table-column>
         <el-table-column label="操作" align="center" width="80">
-          <el-button type="text" size="small">查看</el-button>
+          <el-button type="primary" size="small">查看</el-button>
         </el-table-column>
       </scTable>
     </el-main>
diff --git a/src/views/ops/menu.vue b/src/views/ops/menu.vue
index bc282835..6d6a5cfc 100644
--- a/src/views/ops/menu.vue
+++ b/src/views/ops/menu.vue
@@ -44,15 +44,12 @@
         <el-table-column label="操作" fixed="right" align="center" width="200">
           <template #default="scope">
             <el-button
-              link
               type="primary"
               size="small"
               @click="editMenu(scope.row, scope.$index)"
               >编辑</el-button
             >
-            <el-divider direction="vertical"></el-divider>
             <el-button
-              link
               type="danger"
               size="small"
               @click="delMenu(scope.row.id)"
diff --git a/src/views/ops/monitor.vue b/src/views/ops/monitor.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/views/ops/server.vue b/src/views/ops/server.vue
new file mode 100644
index 00000000..3c072a23
--- /dev/null
+++ b/src/views/ops/server.vue
@@ -0,0 +1,84 @@
+<template>
+  <el-container>
+    <el-main>
+      <el-row :gutter="4">
+        <el-col :md="8" :sm="24">
+          <el-card header="CPU" v-loading="loading">
+            <el-descriptions :column="1" border>
+              <el-descriptions-item label="物理核心数">{{
+                cpuData.count
+              }}</el-descriptions-item>
+              <el-descriptions-item label="逻辑核心数">{{
+                cpuData.lcount
+              }}</el-descriptions-item>
+              <el-descriptions-item label="当前使用率"
+                >{{ cpuData.percent }}%</el-descriptions-item
+              >
+            </el-descriptions>
+          </el-card>
+        </el-col>
+        <el-col :md="8" :sm="24">
+          <el-card header="内存" v-loading="loading">
+            <el-descriptions :column="1" border>
+              <el-descriptions-item label="总内存"
+                >{{ memoryData.total }}GB</el-descriptions-item
+              >
+              <el-descriptions-item label="已用内存"
+                >{{ memoryData.used }}GB</el-descriptions-item
+              >
+              <el-descriptions-item label="当前使用率"
+                >{{ memoryData.percent }}%</el-descriptions-item
+              >
+            </el-descriptions>
+          </el-card>
+        </el-col>
+        <el-col :md="8" :sm="24">
+          <el-card header="硬盘" v-loading="loading">
+            <el-descriptions :column="1" border>
+              <el-descriptions-item label="总大小"
+                >{{ diskData.total }}GB</el-descriptions-item
+              >
+              <el-descriptions-item label="已用大小"
+                >{{ diskData.used }}GB</el-descriptions-item
+              >
+              <el-descriptions-item label="当前使用率"
+                >{{ diskData.percent }}GB</el-descriptions-item
+              >
+            </el-descriptions>
+          </el-card>
+        </el-col>
+      </el-row>
+    </el-main>
+  </el-container>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      loading: false,
+      cpuData: {},
+      diskData: {},
+      memoryData: {},
+    };
+  },
+  mounted() {
+    this.serverInfo();
+  },
+  methods: {
+    serverInfo() {
+      this.loading = true;
+      this.$API.ops.server.info
+        .req()
+        .then((res) => {
+          this.loading = false;
+          this.cpuData = res.cpu;
+          this.diskData = res.disk;
+          this.memoryData = res.memory;
+        })
+        .catch((e) => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/ops/setting.vue b/src/views/ops/setting.vue
new file mode 100644
index 00000000..d6fd88ba
--- /dev/null
+++ b/src/views/ops/setting.vue
@@ -0,0 +1,57 @@
+<template>
+  <el-container>
+    <el-main>
+      <el-row :gutter="4">
+        <el-col :md="8" :sm="24">
+          <el-card header="安卓APP" shadow="hover">
+            <el-form >
+              <el-form-item label="版本号">
+                <el-input v-model="apk_form.version" placeholder="版本号"></el-input>
+              </el-form-item>
+              <el-form-item label="文件">
+                <sc-upload-file
+									v-model="apk_form.file"
+									:multiple="false"
+									:limit="1"
+								>
+									<el-button type="primary" icon="el-icon-upload">上传</el-button>
+								</sc-upload-file>
+              </el-form-item>
+              <el-form-item style="float:right">
+                <el-button type="primary" :loading="apkSaveLoading" @click="apkSave">保存</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+        </el-col>
+      </el-row>
+    </el-main>
+  </el-container>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      apkSaveLoading: false,
+      apk_form: {},
+    };
+  },
+  mounted(){
+    this.apkRead()
+  },
+  methods:{
+    apkSave(){
+      this.apkSaveLoading = true
+      this.$API.system.apk.create.req(this.apk_form).then(res=>{
+        this.apkSaveLoading = false
+        this.$message.success("保存成功")
+      }).catch(e=>{this.apkSaveLoading=true})
+
+    },
+    apkRead(){
+      this.$API.system.apk.read.req().then(res=>{
+        this.apk_form = res
+      })
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/src/views/ops/thirdLogs.vue b/src/views/ops/thirdLogs.vue
index 3b207ab2..8cd248c9 100644
--- a/src/views/ops/thirdLogs.vue
+++ b/src/views/ops/thirdLogs.vue
@@ -77,7 +77,7 @@
           min-width="100"
         ></el-table-column>
         <el-table-column label="操作" align="center" width="80">
-          <el-button link size="small">查看</el-button>
+          <el-button type="primary" size="small">查看</el-button>
         </el-table-column>
       </scTable>
     </el-main>
diff --git a/src/views/sys/dept.vue b/src/views/sys/dept.vue
index f15df0b4..b7beebb7 100644
--- a/src/views/sys/dept.vue
+++ b/src/views/sys/dept.vue
@@ -66,7 +66,6 @@
               v-auth="'dept.update'"
               >编辑</el-button
             >
-            <el-divider direction="vertical"></el-divider>
             <el-popconfirm
               title="确定删除吗？"
               @confirm="delDept(scope.row, scope.$index)"
diff --git a/src/views/sys/dict.vue b/src/views/sys/dict.vue
index f49ea7e9..d0de04a4 100644
--- a/src/views/sys/dict.vue
+++ b/src/views/sys/dict.vue
@@ -203,16 +203,16 @@
 				this.showDicloading = false;
 				this.dicList = res;
 				//获取第一个节点,设置选中 & 加载明细列表
-				let firstNode = this.dicList[0];
-				if(firstNode){
-					this.$nextTick(() => {
-						this.$refs.dic.setCurrentKey(firstNode.id)
-					});
-					this.listApiParams = {
-						id: firstNode.id
-					};
-					this.listApi = this.$API.system.dict.list;
-				}
+				// let firstNode = this.dicList[0];
+				// if(firstNode){
+				// 	this.$nextTick(() => {
+				// 		this.$refs.dic.setCurrentKey(firstNode.id)
+				// 	});
+				// 	this.listApiParams = {
+				// 		id: firstNode.id
+				// 	};
+				// 	this.listApi = this.$API.system.dict.list;
+				// }
 				let postList = res;
 				let posts = [];
 				postList.forEach(item => {
@@ -294,6 +294,7 @@
 			},
 			//点击字典类型
 			dicClickType(data){
+				this.listApi = this.$API.system.dict.list;
 				this.$refs.table.queryData({
 					type: data.id
 				})