From 653f68cdc278005b958b2ed93f6d867740ce54c7 Mon Sep 17 00:00:00 2001 From: Surpriseplus <845948745@qq.com> Date: 星期二, 20 九月 2022 14:17:43 +0800 Subject: [PATCH] 1 --- src/views/maintenance/databaseMonitoring.vue | 82 +------------ src/assets/lang/zh.js | 15 ++ public/config/config.js | 11 + src/assets/lang/en.js | 41 ++++-- src/components/navMenu.vue | 4 src/views/maintenance/logLog.vue | 180 +++++++---------------------- 6 files changed, 105 insertions(+), 228 deletions(-) diff --git a/public/config/config.js b/public/config/config.js index 6911dc1..7eaad62 100644 --- a/public/config/config.js +++ b/public/config/config.js @@ -1,7 +1,8 @@ -var baseUrl = "http://192.168.20.53:8062"; -var gisUrl = "http://183.162.245.49:3301"; -var ifreamUrl = "http://192.168.20.39:12306/"; +var baseUrl = 'http://192.168.20.53:8062'; +var gisUrl = 'http://183.162.245.49:3301'; +var ifreamUrl = 'http://192.168.20.39:12306/'; -var serverUrl = "http://192.168.20.106/LFServer/"; +var serverUrl = 'http://192.168.20.106/LFServer/'; -var api_Url = "http://192.168.20.106/"; +var api_Url = 'http://192.168.20.106/'; +var sql_Url = 'http://192.168.20.39:8081/admin/druid/sql.html'; //鏁版嵁搴撶洃鎺у湴鍧� diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js index a06997d..33c450a 100644 --- a/src/assets/lang/en.js +++ b/src/assets/lang/en.js @@ -1,13 +1,18 @@ const en = { common: { confirm: 'confirm', - choose: 'choose', + choose: 'Please choose', name: 'name', edit: 'edit', delete: 'delete', + username: 'UserName', + empty: 'Empty', + iquery: 'IQuery', + selectdate: 'Please select a date', + pleaseInput: 'Please input', }, dataManage: { - dataManage: 'dataManage', + dataManage: 'Data Manage', catalogueManage: 'catalogueManage', dataUpdata: 'dataUpdata', metadataManage: 'metadataManage', @@ -18,18 +23,19 @@ styleManage: 'styleManage', }, operatManage: { - operatManage: 'operatManage', - userManagement: 'userManagement', - systemLayout: 'systemLayout', - menuSettings: 'menuSettings', + operatManage: 'Operat Manage', + userManagement: 'User Management', + systemLayout: 'System Layout', + menuSettings: 'Menu Settings', parameterConfiguration: 'parameterConfiguration', - rests: 'rests', - authorityManagement: 'authorityManagement', - safetyManagement: 'safetyManagement', - operationMonitoring: 'operationMonitoring', - systemMonitoring: 'systemMonitoring', - logLog: 'logLog', - operationLog: 'operationLog', + rests: 'Rests', + authorityManagement: 'Authority Management', + safetyManagement: 'Safety Management', + operationMonitoring: 'Operation Monitoring', + systemMonitoring: 'System Monitoring', + logLog: 'ConLog', + operationLog: 'Operation Log', + databaseMonitoring: 'Database Monitoring', }, synthesis: { synthesis: 'Comprehensive Display', @@ -89,6 +95,15 @@ terrainexcavation: 'Terrain Excavation', removepaint: 'Remove Paint', }, + loglog: { + serialnumber: 'Serial Number', + coverage: 'Coverage', + systematic: 'Systematic', + ipadress: 'IP Adress', + operationtime: 'Operation Time', + operationtype: 'Operation Type', + operationStatus: 'Operation Status', + }, }; export default en; diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js index f9a03f8..1e094e9 100644 --- a/src/assets/lang/zh.js +++ b/src/assets/lang/zh.js @@ -5,6 +5,11 @@ name: '鍚嶇О', edit: '缂栬緫', delete: '鍒犻櫎', + username: '鐢ㄦ埛鍚嶇О', + empty: '娓呯┖', + iquery: '鏌ヨ', + selectdate: '璇烽�夋嫨鏃ユ湡', + pleaseInput: '璇疯緭鍏�', }, dataManage: { dataManage: '鏁版嵁绠$悊', @@ -30,6 +35,7 @@ systemMonitoring: '绯荤粺鐩戞帶', logLog: '鐧诲綍鏃ュ織', operationLog: '鎿嶄綔鏃ュ織', + databaseMonitoring: '鏁版嵁搴撶洃鎺�', }, synthesis: { synthesis: '缁煎悎灞曠ず', @@ -89,6 +95,15 @@ terrainexcavation: '鍦板舰寮�鎸�', removepaint: '娓呴櫎缁樺埗', }, + loglog: { + serialnumber: '搴忓彿', + coverage: '鍥惧眰', + systematic: '鎵�灞炵郴缁�', + ipadress: 'IP 鍦板潃', + operationtime: '鎿嶄綔鏃堕棿', + operationtype: '鎿嶄綔绫诲瀷', + operationStatus: '鎿嶄綔鐘舵��', + }, }; export default zh; diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue index 1dee242..02a8e8f 100644 --- a/src/components/navMenu.vue +++ b/src/components/navMenu.vue @@ -85,7 +85,9 @@ <el-menu-item index="operationLog">{{ $t("operatManage.operationLog") }}</el-menu-item> - <!-- <el-menu-item index="databaseMonitoring">鏁版嵁搴撶洃鎺�</el-menu-item> --> + <el-menu-item index="databaseMonitoring">{{ + $t("operatManage.databaseMonitoring") + }}</el-menu-item> </el-submenu> </el-submenu> <el-submenu index="3" class="faSub"> diff --git a/src/views/maintenance/databaseMonitoring.vue b/src/views/maintenance/databaseMonitoring.vue index a6d8478..32c7252 100644 --- a/src/views/maintenance/databaseMonitoring.vue +++ b/src/views/maintenance/databaseMonitoring.vue @@ -3,35 +3,12 @@ <My-bread :list="['杩愮淮绠$悊', '鏁版嵁搴撶洃鎺�']"></My-bread> <el-divider /> <div class="table_box"> - <p class="title_box">鏈嶅姟鍒楄〃</p> - <el-table - ref="multipleTable" - stripe - :data="tableData" - tooltip-effect="dark" - style="width: 100%" - @selection-change="handleSelectionChange" - > - <el-table-column type="selection" width="55"> </el-table-column> - <el-table-column prop="name" label="鏈嶅姟鍚嶇О"> </el-table-column> - <el-table-column prop="name" label="鏈嶅姟鐩綍"> </el-table-column> - <el-table-column prop="address" label="璁块棶娆℃暟" show-overflow-tooltip> - </el-table-column> - <el-table-column prop="address" label="鍒涘缓鏃堕棿" show-overflow-tooltip> - </el-table-column> - <el-table-column prop="name" fixed="right" label="杩愯鐘舵��" width="280"> - </el-table-column> - </el-table> - <div style="margin-top: 40px" class="pagination_box"> - <el-pagination background layout="prev, pager, next" :total="10" /> - </div> - </div> - <div class="chart_box"> <iframe - src="https://element.eleme.cn/#/zh-CN/component/pagination" + id="iframe" + :src="sql_Url" + style="height: 100%" + width="100%" frameborder="0" - height="100%" - style="width: 100%" ></iframe> </div> </div> @@ -47,37 +24,15 @@ data() { //杩欓噷瀛樻斁鏁版嵁 return { - currentPage4: 4, - tableData: [ - { - date: "2016-05-03", - name: "鐜嬪皬铏�", - address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�", - }, - { - date: "2016-05-02", - name: "鐜嬪皬铏�", - address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�", - }, - { - date: "2016-05-04", - name: "鐜嬪皬铏�", - address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�", - }, - { - date: "2016-05-01", - name: "鐜嬪皬铏�", - address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�", - }, - ], + sql_Url: sql_Url }; }, //鏂规硶闆嗗悎 methods: { - handleSelectionChange() {}, + handleSelectionChange() { }, }, - created() {}, - mounted() {}, + created() { }, + mounted() { }, }; </script> <style lang="less" scoped> @@ -89,29 +44,12 @@ padding: 10px; box-sizing: border-box; .table_box { - height: 40%; + height: 90%; padding: 10px; background: #fff; border-radius: 5px; border: 1px solid rgb(202, 201, 204); - overflow: auto; - } - .title_box { - font-weight: 800; - } - .pagination_box { - text-align: center; - } - .chart_box { - height: calc(60% - 100px); - margin-top: 20px; - display: flex; - justify-content: space-between; - background: #fff; - border-radius: 5px; - padding: 10px; - box-sizing: border-box; - border: 1px solid rgb(202, 201, 204); + overflow: hidden; } } </style> diff --git a/src/views/maintenance/logLog.vue b/src/views/maintenance/logLog.vue index f500c4b..9e39d67 100644 --- a/src/views/maintenance/logLog.vue +++ b/src/views/maintenance/logLog.vue @@ -4,66 +4,69 @@ <el-divider /> <div class="inquire"> <el-form ref="formData1" :model="form" :inline="true"> - <el-form-item label="鐧诲綍鍦板潃" prop="name"> - <el-input v-model="form.name" placeholder="璇疯緭鍏�" /> + <!-- 鐢ㄦ埛鍚� --> + <el-form-item :label="$t('common.username')" prop="name"> + <el-input + style="width: 300px" + v-model="form.name" + :placeholder="$t('common.pleaseInput')" + /> </el-form-item> - <el-form-item label="鐧诲綍鍚嶇О" prop="jurisdiction"> - <el-input v-model="form.jurisdiction" placeholder="璇疯緭鍏�" /> - </el-form-item> - <el-form-item label="鐧诲綍鐘舵��" prop="region"> - <el-select v-model="form.region" placeholder="璇烽�夋嫨"> + <!-- 鎵�灞炵郴缁� --> + <el-form-item :label="$t('loglog.systematic')" prop="region"> + <el-select v-model="form.region" :placeholder="$t('common.choose')"> <el-option label="Zone one" value="shanghai" /> <el-option label="Zone two" value="beijing" /> </el-select> </el-form-item> - <el-form-item label="鐧诲綍鏃堕棿"> + <!-- 鎿嶄綔鏃堕棿 --> + <el-form-item :label="$t('loglog.operationtime')"> <el-col :span="11"> <el-date-picker type="date" - placeholder="閫夋嫨鏃ユ湡" + :placeholder="$t('common.selectdate')" v-model="form.date1" style="width: 100%" ></el-date-picker> </el-col> <el-col class="line text-center" :span="2">-</el-col> <el-col :span="11"> - <el-time-picker - placeholder="閫夋嫨鏃堕棿" + <el-date-picker + type="date" + :placeholder="$t('common.selectdate')" v-model="form.date2" style="width: 100%" - ></el-time-picker> + ></el-date-picker> </el-col> </el-form-item> + <!-- 鏌ヨ 娓呯┖ --> <el-form-item> - <el-button @click="onSubmit">鏌ヨ</el-button> + <el-button @click="onSubmit">{{ $t("common.iquery") }}</el-button> + <el-button @click="onEmpty('formData1')">{{ + $t("common.empty") + }}</el-button> </el-form-item> </el-form> - <div class="btn_box"> - <el-button>娣诲姞</el-button> - <el-button>淇敼</el-button> - <el-button>瀵煎嚭</el-button> - <el-button>娓呯┖</el-button> - - </div> </div> + <!-- 琛ㄦ牸鏄剧ず --> <div class="table_box"> <el-table :data="tableData" stripe style="width: 100%"> - <el-table-column type="selection" width="55" /> - <el-table-column prop="Accessnumber" label="璁块棶缂栧彿" /> - <el-table-column prop="name" label="鐧诲綍鍚嶇О" /> - <el-table-column prop="ip" label="鐧诲綍鍦板潃" /> - <el-table-column prop="loginaddress" label="鐧诲綍鍦扮偣" /> - <el-table-column prop="browser" label="娴忚鍣�" /> - <el-table-column prop="operatingsystem" label="鎿嶄綔绯荤粺" /> - <el-table-column prop="state" label="鎿嶄綔鐘舵��" /> - <el-table-column prop="operatinginformation" label="鎿嶄綔淇℃伅" /> - <el-table-column prop="date" label="鐧诲綍鏃堕棿" /> - <el-table-column fixed="right" label="鎿嶄綔" width="100"> - <template #default> - <el-button type="primary" size="small">鍒犻櫎</el-button> - </template> - </el-table-column> + <el-table-column + width="150" + type="index" + :label="$t('loglog.serialnumber')" + /> + <el-table-column prop="name" :label="$t('loglog.coverage')" /> + <el-table-column prop="ip" :label="$t('loglog.systematic')" /> + <el-table-column prop="loginaddress" :label="$t('loglog.ipadress')" /> + <el-table-column prop="browser" :label="$t('loglog.operationtime')" /> + <el-table-column + prop="operatingsystem" + :label="$t('loglog.operationtype')" + /> + <el-table-column prop="state" :label="$t('loglog.operationStatus')" /> </el-table> + <!-- 鍒嗛〉 --> <div style="margin-top: 40px" class="pagination_box"> <el-pagination @size-change="handleSizeChange" @@ -97,107 +100,7 @@ region: "", jurisdiction: "", }, - tableData: [ - { - date: "2022-08-05", - name: "admin", - Accessnumber: "1", - loginaddress: "鍖椾含甯�", - browser: "chrome", - operatingsystem: "windows10", - state: "鎴愬姛", - operatinginformation: "鐧诲綍鎴愬姛", - ip: "221.182.31.12", - }, - { - date: "2022-08-05", - name: "admin", - Accessnumber: "1", - loginaddress: "鍖椾含甯�", - browser: "IE11", - operatingsystem: "windows10", - state: "鎴愬姛", - operatinginformation: "鐧诲綍鎴愬姛", - ip: "221.182.31.12", - }, - { - date: "2022-08-05", - name: "admin", - Accessnumber: "1", - loginaddress: "鍖椾含甯�", - browser: "chrome", - operatingsystem: "windows10", - state: "鎴愬姛", - operatinginformation: "鐧诲綍鎴愬姛", - ip: "221.182.31.12", - }, - { - date: "2022-08-05", - name: "admin", - Accessnumber: "1", - loginaddress: "鍖椾含甯�", - browser: "chrome", - operatingsystem: "windows10", - state: "鎴愬姛", - operatinginformation: "鐧诲綍鎴愬姛", - ip: "221.182.31.12", - }, - { - date: "2022-08-05", - name: "admin", - Accessnumber: "1", - loginaddress: "鍖椾含甯�", - browser: "chrome", - operatingsystem: "windows10", - state: "鎴愬姛", - operatinginformation: "鐧诲綍鎴愬姛", - ip: "221.182.31.12", - }, - { - date: "2022-08-05", - name: "admin", - Accessnumber: "1", - loginaddress: "鍖椾含甯�", - browser: "IE11", - operatingsystem: "windows10", - state: "鎴愬姛", - operatinginformation: "鐧诲綍鎴愬姛", - ip: "221.182.31.12", - }, - { - date: "2022-08-05", - name: "admin", - Accessnumber: "1", - loginaddress: "鍖椾含甯�", - browser: "chrome", - operatingsystem: "windows10", - state: "鎴愬姛", - operatinginformation: "鐧诲綍鎴愬姛", - ip: "221.182.31.12", - }, - { - date: "2022-08-05", - name: "admin", - Accessnumber: "1", - loginaddress: "鍖椾含甯�", - browser: "chrome", - operatingsystem: "windows10", - state: "鎴愬姛", - operatinginformation: "鐧诲綍鎴愬姛", - ip: "221.182.31.12", - }, - { - date: "2022-08-05", - name: "admin", - Accessnumber: "1", - loginaddress: "鍖椾含甯�", - browser: "IE11", - operatingsystem: "windows10", - state: "鎴愬姛", - operatinginformation: "鐧诲綍鎴愬姛", - ip: "221.182.31.12", - }, - ], + tableData: [], }; }, methods: { @@ -210,8 +113,11 @@ onSubmit() { console.log("submit!"); }, + onEmpty(formData1) { + this.$refs[formData1].resetFields()//閲嶇疆琛ㄥ崟鏁版嵁 + } }, - created() {}, + created() { }, }; </script> <style lang="less" scoped> -- Gitblit v1.9.3