From 0f8707d9a54ef4981b35b10378b286d42c7d4792 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Mon, 9 Dec 2019 19:23:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/alarm/config.vue      | 15 ++--
 .../src/components/page/config/account.vue    | 69 ++++++++++++-------
 .../src/components/page/config/promServer.vue | 64 +++++++++++++++--
 nezha-fronted/src/http.js                     | 24 +++++++
 nezha-fronted/src/main.js                     |  4 +-
 5 files changed, 137 insertions(+), 39 deletions(-)

diff --git a/nezha-fronted/src/components/page/alarm/config.vue b/nezha-fronted/src/components/page/alarm/config.vue
index 62e074345..210b33078 100644
--- a/nezha-fronted/src/components/page/alarm/config.vue
+++ b/nezha-fronted/src/components/page/alarm/config.vue
@@ -202,15 +202,14 @@
 </style>
 <template>
     <div class="account">
-      <div class="content-left">
-        <div class="sidebar-title">
-          <div>Config</div>
-          <div class="sidebar-info">
-            <div class="sidebar-info-footer" v-if="sidebarState">
+        <div class="content-left">
+            <div class="sidebar-title">
+                <div>Config</div>
+                <div class="sidebar-info">
+                    <div class="sidebar-info-footer" v-if="sidebarState"></div>
+                </div>
             </div>
-          </div>
         </div>
-      </div>
         <div class="account-list">
             <el-input
               class="account-list-search"
@@ -442,7 +441,7 @@ export default {
       pageObj: {
         pageNo: 1,
         pageSize: 20,
-        total:9
+        total:0
       },
       tableTitle: [
         {
diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue
index 736a951d7..93527cea5 100644
--- a/nezha-fronted/src/components/page/config/account.vue
+++ b/nezha-fronted/src/components/page/config/account.vue
@@ -246,7 +246,7 @@
                         </span>
                         <span v-else-if="item.prop == 'status'">
                             <el-switch
-                              v-model="scope.row[item.prop]"
+                              v-model="scope.row.status"
                               active-value="1"
                               inactive-value="0">
                             </el-switch>
@@ -413,12 +413,12 @@ export default {
       pageObj: {
         pageNo: 1,
         pageSize: 20,
-        total:13
+        total:0
       },
       tableTitle: [
         {
           label: 'ID',
-          prop: 'id',
+          prop: 'userId',
           show: true,
           width: 80
         }, {
@@ -457,8 +457,9 @@ export default {
           show: true,
         }
       ],
-      tableData: [{
-        id: '1',
+      tableData: [],
+      /*tableData: [{
+        userId: '1',
         username: '王小虎1',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -472,7 +473,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '1'
       }, {
-        id: '2',
+        userId: '2',
         username: '王小虎2',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -486,7 +487,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '0'
       }, {
-        id: '3',
+        userId: '3',
         username: '王小虎3',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -500,7 +501,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '1'
       }, {
-        id: '4',
+        userId: '4',
         username: '王小虎4',
         email: 'c92c@qq.com',
         lang: 'zh',
@@ -514,7 +515,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '1'
       }, {
-        id: '5',
+        userId: '5',
         username: '王小虎5',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -528,7 +529,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '1'
       }, {
-        id: '6',
+        userId: '6',
         username: '王小虎6',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -542,7 +543,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '1'
       }, {
-        id: '7',
+        userId: '7',
         username: '王小虎7',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -556,7 +557,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '1'
       }, {
-        id: '8',
+        userId: '8',
         username: '王小虎8',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -574,7 +575,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '1'
       }, {
-        id: '9',
+        userId: '9',
         username: '王小虎9',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -588,7 +589,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '1'
       }, {
-        id: '10',
+        userId: '10',
         username: '王小虎',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -602,7 +603,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '1'
       }, {
-        id: '222',
+        userId: '222',
         username: '王小虎',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -616,7 +617,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '1'
       }, {
-        id: '223',
+        userId: '223',
         username: '王小虎',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -630,7 +631,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '1'
       }, {
-        id: '224',
+        userId: '224',
         username: '王小虎',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -644,7 +645,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '1'
       }, {
-        id: '226',
+        userId: '226',
         username: '王小虎',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -658,7 +659,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '1'
       }, {
-        id: '225',
+        userId: '225',
         username: '王小虎',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -672,7 +673,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '1'
       }, {
-        id: '2',
+        userId: '2',
         username: '王小虎',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -686,7 +687,7 @@ export default {
         createTime: '2019-11-28  21:39:05',
         status: '1'
       }, {
-        id: '2',
+        userId: '2',
         username: '王小虎',
         email: 'c92c@qq.com',
         lang: 'en',
@@ -702,7 +703,7 @@ export default {
         }],
         createTime: '2019-11-28  21:39:05',
         status: '1'
-      }],
+      }],*/
       receiverData: [{
         id: '1',
         name: 'group1',
@@ -745,6 +746,17 @@ export default {
       this.rightBox.title = this.$t("config.account.account") + "  ID：" + u.userId;
       this.rightBox.show = true;
     },
+    getTableData: function() {
+      this.$get('sys/user/list', this.pageObj).then(response => {
+        if (response.code === 200) {
+          for (var i = 0; i < response.data.list.length; i++) {
+            response.data.list[i].status = response.data.list[i].status + "";
+          }
+          this.tableData = response.data.list;
+          this.pageObj.total = response.data.total
+        }
+      })
+    },
     add: function() {
       this.cleanUser();
       this.rightBox.isEdit = true;
@@ -755,6 +767,8 @@ export default {
       if (!this.rightBox.isEdit) {
         this.rightBox.isEdit = true;
         this.rightBox.title = this.$t("config.account.editAccount") + "  ID：" + this.user.userId;
+      } else {
+
       }
     },
     toEditReceiver: function(item) {
@@ -786,7 +800,7 @@ export default {
     },
     toDelReceiver: function(item) {
       this.blurEditReceiver();
-      //TODO 请求后台，删除组
+      //TODO 请求后台，删除用户组
     },
     initReceiverData: function() {
       for (var i = 0; i < this.receiverData.length; i++) {
@@ -818,9 +832,18 @@ export default {
         receiver: [],
         lang: 'en'
       }
+    },
+    pageNo(val) {
+      this.pageObj.pageNo = val;
+      this.getTableData();
+    },
+    pageSize(val) {
+      this.pageObj.pageSize = val;
+      this.getTableData();
     }
   },
   mounted() {
+    this.getTableData();
     this.initReceiverData();
   }
 }
diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue
index 4b599bb5b..da272603f 100644
--- a/nezha-fronted/src/components/page/config/promServer.vue
+++ b/nezha-fronted/src/components/page/config/promServer.vue
@@ -357,7 +357,7 @@ export default {
       pageObj: {
         pageNo: 1,
         pageSize: 20,
-        total:6
+        total:0
       },
       tableTitle: [
         {
@@ -375,7 +375,8 @@ export default {
           show: true,
         }
       ],
-      tableData: [
+      tableData: [],
+      /*tableData: [
         {
           id: '1',
           host: '192.168.40.241',
@@ -406,8 +407,9 @@ export default {
           host: '192.168.40.246',
           idc: {id: '9', name: 'idc151657', location: 'fj'}
         },
-      ],
-      idcData: [
+      ],*/
+      idcData: []
+      /*idcData: [
         {id: '1', name: 'idc151656', location: 'gd'},
         {id: '2', name: 'idc151656', location: 'gd'},
         {id: '3', name: 'aerareqarew', location: 'zhaertaewr'},
@@ -417,7 +419,7 @@ export default {
         {id: '7', name: 'idc151656', location: 'gd'},
         {id: '8', name: 'idc151656', location: 'gd'},
         {id: '9', name: 'idc151657', location: 'fj'},
-      ]
+      ]*/
     }
   },
   methods: {
@@ -429,6 +431,14 @@ export default {
     },
     del: function(u) {
     },
+    getTableData: function() {
+      this.$get('promServer', this.pageObj).then(response => {
+        if (response.code === 200) {
+          this.tableData = response.data.list;
+          this.pageObj.total = response.data.total
+        }
+      })
+    },
     detail: function(u) {
       this.promServer = Object.assign({}, u);
       this.rightBox.isEdit = false;
@@ -445,6 +455,14 @@ export default {
       if (!this.rightBox.isEdit) {
         this.rightBox.isEdit = true;
         this.rightBox.title = this.$t("config.promServer.editProm") + "  ID：" + this.promServer.id;
+      } else {
+        this.$put('promServer', this.promServer).then(response => {
+          if (response.code === 200) {
+            this.getTableData();
+            this.rightBox.isEdit = false;
+
+          }
+        })
       }
     },
     toEditIdc: function(item) {
@@ -478,7 +496,12 @@ export default {
       this.blurEditIdc();
       //TODO 请求后台，删除
     },
-    initIdcData: function() {
+    getIdcData: function() {
+      this.$get('idc', this.pageObj).then(response => {
+        if (response.code === 200) {
+          this.idcData = response.data.list;
+        }
+      })
       for (var i = 0; i < this.idcData.length; i++) {
         this.$set(this.idcData[i], 'oldName', this.idcData[i].name);
         this.$set(this.idcData[i], 'isEdit', false);
@@ -489,6 +512,23 @@ export default {
     },
     stopFun: function() {
 
+    },
+    getTableData: function() {
+      this.$get('promServer', this.pageObj).then(response => {
+        if (response.code === 200) {
+          console.info(this.idcData)
+          for (var i = 0; i < response.data.list.length; i++) {
+            for (var j = 0; j < this.idcData.length; j++) {
+              if (response.data.list[i].idcId == this.idcData[j].id) {
+                response.data.list[i].idc = this.idcData[j];
+                break;
+              }
+            }
+          }
+          this.tableData = response.data.list;
+          this.pageObj.total = response.data.total
+        }
+      })
     },
     updateIdcName: function(item) {
       //TODO 请求接口改名
@@ -502,12 +542,22 @@ export default {
       this.promServer = {
         id: '',
         host: '',
+        idcId: '',
         idc: {id: '', name: '', location: ''}
       }
+    },
+    pageNo(val) {
+      this.pageObj.pageNo = val;
+      this.getTableData();
+    },
+    pageSize(val) {
+      this.pageObj.pageSize = val;
+      this.getTableData();
     }
   },
   mounted() {
-    this.initIdcData();
+    this.getIdcData();
+    this.getTableData();
   }
 }
 </script>
diff --git a/nezha-fronted/src/http.js b/nezha-fronted/src/http.js
index aacd343e9..fe9d97450 100644
--- a/nezha-fronted/src/http.js
+++ b/nezha-fronted/src/http.js
@@ -36,3 +36,27 @@ export function post(url, params) {
     })
   })
 }
+
+export function put(url, params) {
+  return new Promise((resolve, reject) => {
+    //params = qs.stringify(Object.assign(params));
+    //console.info(params);
+    axios.put(url, params).then(response => {
+      resolve(response.data)
+    }).catch(err => {
+      console.info(err)
+      reject(err.response.data)
+    })
+  })
+}
+
+export function del(url, params) {
+  return new Promise((resolve, reject) => {
+    axios.delete(url, params).then(response => {
+      resolve(response.data)
+    }).catch(err => {
+      console.info(err)
+      reject(err.response.data)
+    })
+  })
+}
diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js
index 994dc0b88..9c78dd12c 100644
--- a/nezha-fronted/src/main.js
+++ b/nezha-fronted/src/main.js
@@ -12,7 +12,7 @@ import router from './router'
 
 
 import axios from 'axios';
-import {post, get} from './http.js'
+import {post, get, put, del} from './http.js'
 
 import Pagination from "./components/common/pagination"; //引入全局分页组件
 Vue.component("Pagination", Pagination);
@@ -20,6 +20,8 @@ Vue.component("Pagination", Pagination);
 Vue.prototype.$axios = axios
 Vue.prototype.$post = post;
 Vue.prototype.$get = get;
+Vue.prototype.$put = put;
+Vue.prototype.$delete = del;
 
 Vue.config.productionTip = false
 Vue.use(ElementUI)