devicelist

liudf0716 · Aug 3, 2018 · 8fa3a8d · 8fa3a8d
1 parent 0fde05f
commit 8fa3a8d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/config/index.js b/config/index.js
@@ -20,7 +20,7 @@ module.exports = {
         // `npm run build --report`
         // Set to `true` or `false` to always turn it on or off
         bundleAnalyzerReport: process.env.npm_config_report,
-        //webServer: 'https://api.rom.kunteng.org.cn:443'
+        //webServer: 'http://wechat.kunteng.org.cn:8001'
         webServer: 'http://192.168.158.18:8001'
     },
     dev: {
@@ -31,7 +31,7 @@ module.exports = {
         assetsPublicPath: '/',
         proxyTable: {
             '/api':{
-                target:'http://192.168.158.18:8001',
+                target:'http://wechat.kunteng.org.cn:8001',
                 changeOrigin:true,
                 pathRewrite:{
                     '/api':''

diff --git a/src/components/page/DevStatus.vue b/src/components/page/DevStatus.vue
@@ -23,22 +23,26 @@
         </div>
 
         <el-table :data="listData" border style="width: 100%" ref="multipleTable" v-loading="loading">
-            <el-table-column prop="update_time" label="设备ID" width="180"></el-table-column>
-            <el-table-column prop="status" label="状态" width="100">
+            <el-table-column prop="gwId" label="设备ID" width="180"></el-table-column>
+            <el-table-column prop="deviceStatus" label="状态" width="100">
                 <template slot-scope="scope">
-                    <el-tag :type="scope.row.status == 'offline' ? 'warning' : 'success'" close-transition>{{scope.row.status == 'online'?'在线':(scope.row.status == 'inactive'?'未激活':'离线')}}</el-tag>
+                    <el-tag :type="scope.row.deviceStatus == '0' ? 'warning':'success'" close-transition>{{scope.row.deviceStatus == '1'?'在线':'离线'}}</el-tag>
                 </template>
             </el-table-column>
-            <el-table-column prop="mac" label="无线名称" width="180"></el-table-column>
-            <el-table-column prop="dev_type" label="渠道" width="140"></el-table-column>
-            <el-table-column prop="rom_version" label="wifidog运行时长" width="140"></el-table-column>
-            <el-table-column prop="user_name" label="认证平台"></el-table-column>
-            <el-table-column label="操作" width="400">
+            <el-table-column prop="ssid" label="无线名称" width="180"></el-table-column>
+            <el-table-column prop="channelPath" label="渠道" width="140"></el-table-column>
+            <el-table-column prop="name" label="设备名称" width="140"></el-table-column>
+            <el-table-column prop="type" label="设备类型" width="140"></el-table-column>
+            <el-table-column prop="remoteAddress" label="设备IP" width="160"></el-table-column>
+            <el-table-column prop="auth" label="认证平台" width="100">
                 <template slot-scope="scope">
-                    <!--<el-button class="btn1" size="small" type="text" @click="reset(scope.row.mac)">重启路由</el-button>-->
-                    <!--<el-button class="btn1" type="success" @click="clickDialogWifiName(scope.row.mac)">修改无线名称</el-button>-->
-                    <el-button class="btn1" size="small" type="info" @click="clickDialogPwd(scope.row.mac)">修改无线密码</el-button>
-                    <el-button class="btn1" v-if="curUser=='0' && scope.row.user_name" size="small" type="danger" @click="del(scope.row._id,scope.row.mac,scope.row.user_name)">删除路由</el-button>
+                    <el-tag :type="scope.row.auth == '0' ? 'warning':'success'" close-transition>{{scope.row.auth == '1'?'已认证':'未认证'}}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" width="150">
+                <template slot-scope="scope">
+                    <!--<el-button class="btn1" size="small" type="info" @click="clickDialogPwd(scope.row.mac)">修改无线密码</el-button>-->
+                    <!--<el-button class="btn1" v-if="curUser=='0' && scope.row.user_name" size="small" type="danger" @click="del(scope.row._id,scope.row.mac,scope.row.user_name)">删除路由</el-button>-->
                 </template>
             </el-table-column>
         </el-table>

diff --git a/src/router/index.js b/src/router/index.js
@@ -24,6 +24,10 @@ export default new Router({
                 {
                     path: '/devstatus',
                         component: resolve => require(['../components/page/DevStatus.vue'], resolve)     // vue-datasource组件
+                },
+                {
+                    path: '/approve',
+                    component: resolve => require(['../components/page/Approve.vue'], resolve)     // vue-datasource组件
                 }
             ]
         },