123

sources/client/vrv-platform/src/config/api.js

@@ -23,6 +23,7 @@ const api = {
         },
         project: {
             list: `${root}/project/list`,
+            operatorList: `${root}/project/operatorList`,
             add: `${root}/project/add`,
             update: `${root}/project/update`,
             detail: `${root}/project/detail`,

sources/client/vrv-platform/src/main.js

@@ -16,6 +16,7 @@ Vue.use(ElementUI);
 import  FastbootUI from 'fastboot-ui/src/components';
 import 'fastboot-ui/src/scss/element-theme.scss'
 
+
 Vue.use(FastbootUI);
 
 

sources/client/vrv-platform/src/router/index.js

@@ -15,8 +15,17 @@ export default new Router({
                     path: '/project',
                     name: 'project',
                     meta: {title: '项目管理', tab: true, keepAlive: true},
-                    component: () => import(/* webpackChunkName: "views" */ '../views/project/project'),
+                    component: () => import(/* webpackChunkName: "views" */ '../views/project/list'),
+
                 },
+                {
+                    path: '/operatorList',
+                    name: 'operatorList',
+                    meta: {title: '运营商指定项目', tab: true, keepAlive: true},
+                    component: () => import(/* webpackChunkName: "views" */ '../views/project/operatorList'),
+
+                },
+
                 {
                     path: '/operatorLog',
                     name: 'operatorLog',

sources/client/vrv-platform/src/views/device/list.vue

@@ -3,20 +3,15 @@
     <el-container>
 
       <el-main>
-        <div style="margin-bottom: 20px">
+        <div style="margin-bottom: 10px">
           <el-button size="medium" icon="el-icon-back" type="text">返回</el-button>
-          <span style="margin-left: 20px;margin-bottom: 15px; font-size: 18px">设备列表</span>
+          <span style="margin-left: 20px; font-size: 18px">设备列表</span>
         </div>
 
-        <div>
-          <el-row>
-            <el-button size="medium" icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">
-              查询
-            </el-button>
-            <el-button size="medium" icon="el-icon-plus" @click="showAdd">新增</el-button>
-          </el-row>
-        </div>
+        <el-button size="medium"  icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">查询</el-button>
+        <el-button size="medium" icon="el-icon-plus" @click="showAdd" style="margin-left: 0">新增</el-button>
 
+        <div style="padding: 10px;background-color: white">
         <el-form :inline="true" :model="searchFormData" style="background-color: white;">
           <el-form-item label="设备名称">
             <el-input placeholder="设备名称" size="mini" v-model="searchFormData.name"></el-input>
@@ -114,6 +109,7 @@
 
         </el-table>
 
+
         <el-pagination
             style="margin-top: 15px;text-align: center"
             background
@@ -124,6 +120,7 @@
             @current-change="handleCurrentChange"
         >
         </el-pagination>
+        </div>
       </el-main>
 
     </el-container>
@@ -400,7 +397,6 @@ export default {
                   showClose: true,
                   message: response.data.desc
                 })
-                value:false
               }
               this.loadData();
             })
@@ -425,8 +421,10 @@ export default {
 </script>
 
 <style scoped>
-.el-form-item {
-  margin-left: 15px;
-  margin-top: 10px
+.el-form-item{
+  margin-right: 10px;
+  margin-left: 10px;
+  margin-bottom: 10px;
+  margin-top: 0px;
 }
 </style>

sources/client/vrv-platform/src/views/deviceAlarmRecord/list.vue

@@ -3,127 +3,126 @@
     <el-container>
 
       <el-main>
-        <div style="margin-bottom: 20px">
+        <div style="margin-bottom: 10px">
           <el-button size="medium" icon="el-icon-back" type="text">返回</el-button>
-          <span style="margin-left: 20px;margin-bottom: 15px; font-size: 18px">报警记录列表</span>
+          <span style="margin-left: 20px; font-size: 18px">报警记录列表</span>
         </div>
 
-        <div>
-          <el-row>
-            <el-button size="medium" icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">
-              查询
-            </el-button>
-            <el-button size="medium" icon="el-icon-plus" @click="showAdd">新增</el-button>
-          </el-row>
-        </div>
+        <el-button size="medium" icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">
+          查询
+        </el-button>
+        <el-button size="medium" icon="el-icon-plus" @click="showAdd" style="margin-left: 0">新增</el-button>
+
+
+        <div style="padding: 10px;background-color: white">
+          <el-form :inline="true" :model="searchFormData" style="background-color: white;">
+            <el-form-item label="报警名称">
+              <el-input placeholder="报警名称" size="mini" v-model="searchFormData.alarmName"></el-input>
+            </el-form-item>
+            <el-form-item label="报警类型">
+              <el-input placeholder="设备类型" size="mini" v-model="searchFormData.alarmType"></el-input>
+            </el-form-item>
+            <el-form-item label="设备SN">
+              <el-input placeholder="设备SN" size="mini" v-model="searchFormData.sn"></el-input>
+            </el-form-item>
+            <el-form-item label="运营商编号">
+              <el-input placeholder="运营商编号" size="mini" v-model="searchFormData.operatorNumber"></el-input>
+            </el-form-item>
+            <el-form-item label="项目编号">
+              <el-input placeholder="项目编号" size="mini" v-model="searchFormData.projectNumber"></el-input>
+            </el-form-item>
+            <el-form-item label="网关编号">
+              <el-input placeholder="网关编号" size="mini" v-model="searchFormData.gatewayNumber"></el-input>
+            </el-form-item>
+            <el-form-item label="变量id">
+              <el-input placeholder="变量id" size="mini" v-model="searchFormData.variableId"></el-input>
+            </el-form-item>
+            <el-form-item label="开始时间">
+              <el-input placeholder="开始时间" size="mini" v-model="searchFormData.startTime"></el-input>
+            </el-form-item>
+            <el-form-item label="结束时间">
+              <el-input placeholder="结束时间" size="mini" v-model="searchFormData.endTime"></el-input>
+            </el-form-item>
+
+
+            <el-dialog title="报警" :visible.sync="dialogFormVisible">
+              <el-form label-position="left" :model="formData">
+                <el-form-item label="报警名称">
+                  <el-input v-model="formData.alarmName"></el-input>
+                </el-form-item>
+                <el-form-item label="报警类型">
+                  <el-input v-model="formData.alarmType"></el-input>
+                </el-form-item>
+                <el-form-item label="告警内容">
+                  <el-input v-model="formData.content"></el-input>
+                </el-form-item>
+                <el-form-item label="开始时间">
+                  <el-input v-model="formData.startTime"></el-input>
+                </el-form-item>
+                <el-form-item label="结束时间">
+                  <el-input v-model="formData.endTime"></el-input>
+                </el-form-item>
+
+                <el-form-item label="设备sn">
+                  <el-input v-model="formData.sn"></el-input>
+                </el-form-item>
+                <el-form-item label="变量id">
+                  <el-input v-model="formData.variableId"></el-input>
+                </el-form-item>
+
+                <el-form-item label="运营商编号">
+                  <el-input placeholder="运营商编号" size="small" v-model="searchFormData.operatorNumber"></el-input>
+                </el-form-item>
+                <el-form-item label="项目编号">
+                  <el-input placeholder="项目编号" size="small" v-model="searchFormData.projectNumber"></el-input>
+                </el-form-item>
+                <el-form-item label="网关编号">
+                  <el-input placeholder="网关编号" size="small" v-model="searchFormData.gatewayNumber"></el-input>
+                </el-form-item>
+
+              </el-form>
+
+              <div slot="footer" class="dialog-footer">
+                <el-button @click="cancel()">取 消</el-button>
+                <el-button type="primary" @click="addOrEditMehtond()">确 定</el-button>
+              </div>
+            </el-dialog>
+
+          </el-form>
+
+
+          <el-table :data="tableData">
+            <el-table-column type="selection"></el-table-column>
+            <el-table-column prop="alarmName" label="报警名称"></el-table-column>
+            <el-table-column prop="alarmType" label="报警类型"></el-table-column>
+            <el-table-column prop="content" label="告警内容"></el-table-column>
+            <el-table-column prop="startTime" label="开始时间"></el-table-column>
+            <el-table-column prop="endTime" label="结束时间"></el-table-column>
+
+            <el-table-column label="状态">
+              <template slot-scope="scope">
+                <el-button
+                    type="primary"
+                    size="small"
+                    class="delBut non"
+                    @click="statusHandle(scope.row)"
+                >
+                  {{ scope.row.status == '未处理' ? '已处理' : '未处理' }}
+                </el-button>
+              </template>
+            </el-table-column>
+
+
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button type="text" size="medium" @click="showEdit(scope.row)">编辑</el-button>
+                <el-button type="text" size="medium" @click="manage(scope.row)">查看</el-button>
+                <el-button type="text" size="medium" @click="del(scope.row)" style="color: #c01920">删除</el-button>
+              </template>
+            </el-table-column>
+
+          </el-table>
 
-        <el-form :inline="true" :model="searchFormData" style="background-color: white;">
-          <el-form-item label="报警名称">
-            <el-input placeholder="报警名称" size="mini" v-model="searchFormData.alarmName"></el-input>
-          </el-form-item>
-          <el-form-item label="报警类型">
-            <el-input placeholder="设备类型" size="mini" v-model="searchFormData.alarmType"></el-input>
-          </el-form-item>
-          <el-form-item label="设备SN">
-            <el-input placeholder="设备SN" size="mini" v-model="searchFormData.sn"></el-input>
-          </el-form-item>
-          <el-form-item label="运营商编号">
-            <el-input placeholder="运营商编号" size="mini" v-model="searchFormData.operatorNumber"></el-input>
-          </el-form-item>
-          <el-form-item label="项目编号">
-            <el-input placeholder="项目编号" size="mini" v-model="searchFormData.projectNumber"></el-input>
-          </el-form-item>
-          <el-form-item label="网关编号">
-            <el-input placeholder="网关编号" size="mini" v-model="searchFormData.gatewayNumber"></el-input>
-          </el-form-item>
-          <el-form-item label="变量id">
-            <el-input placeholder="变量id" size="mini" v-model="searchFormData.variableId"></el-input>
-          </el-form-item>
-          <el-form-item label="开始时间">
-            <el-input placeholder="开始时间" size="mini" v-model="searchFormData.startTime"></el-input>
-          </el-form-item>
-          <el-form-item label="结束时间">
-            <el-input placeholder="结束时间" size="mini" v-model="searchFormData.endTime"></el-input>
-          </el-form-item>
-
-
-          <el-dialog title="报警" :visible.sync="dialogFormVisible">
-            <el-form label-position="left" :model="formData">
-              <el-form-item label="报警名称">
-                <el-input v-model="formData.alarmName"></el-input>
-              </el-form-item>
-              <el-form-item label="报警类型">
-                <el-input v-model="formData.alarmType"></el-input>
-              </el-form-item>
-              <el-form-item label="告警内容">
-                <el-input v-model="formData.content"></el-input>
-              </el-form-item>
-              <el-form-item label="开始时间">
-                <el-input v-model="formData.startTime"></el-input>
-              </el-form-item>
-              <el-form-item label="结束时间">
-                <el-input v-model="formData.endTime"></el-input>
-              </el-form-item>
-
-              <el-form-item label="设备sn">
-                <el-input v-model="formData.sn"></el-input>
-              </el-form-item>
-              <el-form-item label="变量id">
-                <el-input v-model="formData.variableId"></el-input>
-              </el-form-item>
-
-              <el-form-item label="运营商编号">
-                <el-input placeholder="运营商编号" size="small" v-model="searchFormData.operatorNumber"></el-input>
-              </el-form-item>
-              <el-form-item label="项目编号">
-                <el-input placeholder="项目编号" size="small" v-model="searchFormData.projectNumber"></el-input>
-              </el-form-item>
-              <el-form-item label="网关编号">
-                <el-input placeholder="网关编号" size="small" v-model="searchFormData.gatewayNumber"></el-input>
-              </el-form-item>
-
-            </el-form>
-
-            <div slot="footer" class="dialog-footer">
-              <el-button @click="cancel()">取 消</el-button>
-              <el-button type="primary" @click="addOrEditMehtond()">确 定</el-button>
-            </div>
-          </el-dialog>
-
-        </el-form>
-
-
-        <el-table :data="tableData">
-          <el-table-column type="selection"></el-table-column>
-          <el-table-column prop="alarmName" label="报警名称"></el-table-column>
-          <el-table-column prop="alarmType" label="报警类型"></el-table-column>
-          <el-table-column prop="content" label="告警内容"></el-table-column>
-          <el-table-column prop="startTime" label="开始时间"></el-table-column>
-          <el-table-column prop="endTime" label="结束时间"></el-table-column>
-
-          <el-table-column label="状态">
-            <template slot-scope="scope">
-              <el-button
-                  type="primary"
-                  size="small"
-                  class="delBut non"
-                  @click="statusHandle(scope.row)"
-              >
-                {{ scope.row.status == '未处理' ? '已处理' : '未处理' }}
-              </el-button>
-            </template>
-          </el-table-column>
-
-
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button type="text" size="medium" @click="showEdit(scope.row)">编辑</el-button>
-              <el-button type="text" size="medium" @click="manage(scope.row)">查看</el-button>
-              <el-button type="text" size="medium" @click="del(scope.row)" style="color: #c01920">删除</el-button>
-            </template>
-          </el-table-column>
-
-        </el-table>
 
         <el-pagination
             style="margin-top: 15px;text-align: center"
@@ -135,6 +134,7 @@
             @current-change="handleCurrentChange"
         >
         </el-pagination>
+        </div>
       </el-main>
 
     </el-container>
@@ -460,8 +460,10 @@ export default {
 </script>
 
 <style scoped>
-.el-form-item {
-  margin-left: 15px;
-  margin-top: 10px
+.el-form-item{
+  margin-right: 10px;
+  margin-left: 10px;
+  margin-bottom: 10px;
+  margin-top: 0px;
 }
 </style>

sources/client/vrv-platform/src/views/gateway/list.vue

@@ -3,18 +3,15 @@
     <el-container>
 
       <el-main>
-        <div style="margin-bottom: 20px">
+        <div style="margin-bottom: 10px">
           <el-button size="medium" icon="el-icon-back" type="text">返回</el-button>
-          <span style="margin-left: 20px;margin-bottom: 15px; font-size: 18px">网关列表</span>
+          <span style="margin-left: 20px; font-size: 18px">网关列表</span>
         </div>
 
-        <div>
-          <el-row>
-            <el-button size="medium"  icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">查询</el-button>
-            <el-button size="medium" icon="el-icon-plus" @click="showAdd">新增</el-button>
-          </el-row>
-        </div>
+        <el-button size="medium"  icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">查询</el-button>
+        <el-button size="medium" icon="el-icon-plus" @click="showAdd" style="margin-left: 0">新增</el-button>
 
+        <div style="padding: 10px;background-color: white">
         <el-form :inline="true" :model="searchFormData" style="background-color: white;">
           <el-form-item label="编号">
             <el-input placeholder="编号" size="mini" v-model="searchFormData.number"></el-input>
@@ -97,6 +94,7 @@
 
         </el-table>
 
+
         <el-pagination
             style="margin-top: 15px;text-align: center"
           background
@@ -107,6 +105,7 @@
           @current-change="handleCurrentChange"
         >
         </el-pagination>
+        </div>
       </el-main>
 
     </el-container>
@@ -390,7 +389,9 @@ export default {
 
 <style scoped>
 .el-form-item{
-  margin-left: 15px;
-  margin-top: 10px
+  margin-right: 10px;
+  margin-left: 10px;
+  margin-bottom: 10px;
+  margin-top: 0px;
 }
 </style>

sources/client/vrv-platform/src/views/menu/menu.vue

@@ -1,103 +1,110 @@
 <template>
   <div id="menu">
 
-    <div style="width: 100%; height: 100%; border:1px #2c3e50; display: flex;flex-direction: row">
-
-
-      <el-menu
-          class="el-menu-vertical-demo"
-          :collapse="isCollapse"
-          background-color="#545c64"
-          text-color="#fff"
-          active-text-color="#993333"
-          :router=true
-          :default-active="$route.name"
-          @open="handleOpen"
-          @close="handleClose">
-
-        <!--          <div class="logo" style="height: 50px;  background-color:rgb(84,92,100)">-->
-        <!--            <div class="img">-->
-        <!--              <img src="" alt="" style="height: 100%">-->
-        <!--            </div>-->
-        <!--          </div>-->
-
-
-        <el-menu-item index="/">
-          <i class="el-icon-location"></i>
-          <span slot="title">数据可视化大屏</span>
-        </el-menu-item>
-
-        <el-menu-item index="/operator">
-          <i class="el-icon-location"></i>
-          <span slot="title">运营商管理</span>
-        </el-menu-item>
-
-        <el-menu-item index="/project">
-          <i class="el-icon-location"></i>
-          <span slot="title">项目管理</span>
-        </el-menu-item>
-
-        <el-menu-item index="/gateway">
-          <i class="el-icon-location"></i>
-          <span slot="title">网关管理</span>
-        </el-menu-item>
-
-        <el-submenu index="3-2" style="display: flex;flex-direction:column">
-          <template slot="title">
+    <div style="width: 100%; height: 100%; display: flex;flex-direction: row">
+
+      <div style="height: 100vh;background-color: rgb(84,92,100); ">
+        <el-menu
+            class="el-menu-vertical-demo"
+            :collapse="isCollapse"
+            background-color="#545c64"
+            text-color="#fff"
+            active-text-color="#993333"
+            :router=true
+            :default-active="$route.name"
+            @open="handleOpen"
+            @close="handleClose">
+
+          <div class="logo" style="height: 50px;  background-color:rgb(84,92,100)">
+            <div class="img">
+              <img src="" alt="" style="height: 100%">
+            </div>
+          </div>
+
+
+          <el-menu-item index="/">
             <i class="el-icon-location"></i>
-            <span @click="device(index)">设备管理</span>
-          </template>
-
-          <el-menu-item-group>
-            <el-menu-item index="/">运行状态</el-menu-item>
-            <el-menu-item index="/">数据曲线</el-menu-item>
-            <el-menu-item index="/">参数设定</el-menu-item>
-            <el-menu-item index="/">系统参数</el-menu-item>
-            <el-menu-item index="/">报警设置</el-menu-item>
-            <el-menu-item index="/">报警记录</el-menu-item>
-            <el-menu-item index="/">维保记录</el-menu-item>
-          </el-menu-item-group>
-
-        </el-submenu>
-
-
-        <el-menu-item index="/deviceAlarmRecord">
-          <i class="el-icon-location"></i>
-          <span slot="title">报警管理</span>
-        </el-menu-item>
-
-        <el-menu-item index="/operatorLog">
-          <i class="el-icon-location"></i>
-          <span slot="title">操作日志</span>
-        </el-menu-item>
-
-        <el-menu-item index="/user">
-          <i class="el-icon-location"></i>
-          <span slot="title">用户管理</span>
-        </el-menu-item>
-
-        <el-submenu index="7" style="display: flex;flex-direction:column">
-          <template slot="title">
+            <span slot="title">数据可视化大屏</span>
+          </el-menu-item>
+
+          <el-menu-item index="/operator">
+            <i class="el-icon-location"></i>
+            <span slot="title">运营商管理</span>
+          </el-menu-item>
+
+          <el-menu-item index="/project">
+            <i class="el-icon-location"></i>
+            <span slot="title">项目管理</span>
+          </el-menu-item>
+
+          <el-menu-item index="/gateway">
+            <i class="el-icon-location"></i>
+            <span slot="title">网关管理</span>
+          </el-menu-item>
+
+          <el-submenu index="3-2" style="display: flex;flex-direction:column">
+            <template slot="title">
+              <i class="el-icon-location"></i>
+              <span @click="device(index)">设备管理</span>
+            </template>
+
+            <el-menu-item-group>
+              <el-menu-item index="/">运行状态</el-menu-item>
+              <el-menu-item index="/">数据曲线</el-menu-item>
+              <el-menu-item index="/">参数设定</el-menu-item>
+              <el-menu-item index="/">系统参数</el-menu-item>
+              <el-menu-item index="/">报警设置</el-menu-item>
+              <el-menu-item index="/">报警记录</el-menu-item>
+              <el-menu-item index="/">维保记录</el-menu-item>
+            </el-menu-item-group>
+
+          </el-submenu>
+
+
+          <el-menu-item index="/deviceAlarmRecord">
             <i class="el-icon-location"></i>
-            <span>权限设置</span>
-          </template>
+            <span slot="title">报警管理</span>
+          </el-menu-item>
 
-          <el-menu-item-group>
-          <el-menu-item index="/role">角色管理</el-menu-item>
-          <el-menu-item index="/power">权限管理</el-menu-item>
-          </el-menu-item-group>
-        </el-submenu>
+          <el-menu-item index="/operatorLog">
+            <i class="el-icon-location"></i>
+            <span slot="title">操作日志</span>
+          </el-menu-item>
 
-      </el-menu>
+          <el-menu-item index="/user">
+            <i class="el-icon-location"></i>
+            <span slot="title">用户管理</span>
+          </el-menu-item>
+
+          <el-submenu index="7" style="display: flex;flex-direction:column">
+            <template slot="title">
+              <i class="el-icon-location"></i>
+              <span>权限设置</span>
+            </template>
+
+            <el-menu-item-group>
+              <el-menu-item index="/role">角色管理</el-menu-item>
+              <el-menu-item index="/power">权限管理</el-menu-item>
+            </el-menu-item-group>
+          </el-submenu>
+
+        </el-menu>
+      </div>
 
 
       <div style="width: 90% ; float: right">
-        <el-header class="header" style="height: 80px">
+        <el-header class="header" style="height: 80px;">
 
-          <el-radio-group v-model="isCollapse" style="margin-top: 15px;">
-            <el-radio-button :label="false">展开</el-radio-button>
-            <el-radio-button :label="true">收起</el-radio-button>
-          </el-radio-group>
+          <!-- 点击展开收起导航和切换对应图标 -->
+
+          <i class="el-icon-s-fold" @click="isC" v-show="block"></i>
+          <i class="el-icon-s-unfold" @click="isC" v-show="toggle"></i>
+
+
+          <!--          <el-radio-group v-model="isCollapse" style="margin-top: 15px;">-->
+          <!--            <el-radio-button :label="false">展开</el-radio-button>-->
+          <!--            <el-radio-button :label="true">收起</el-radio-button>-->
+          <!--          </el-radio-group>-->
 
           <el-dropdown style="margin-right: 20px;float: right;margin-top: 10px">
             <i class="el-icon-setting"></i>
@@ -112,7 +119,7 @@
 
         </el-header>
 
-        <el-main style="background-color: rgb(245,247,249)">
+        <el-main style="background-color: rgb(245,247,249);height: 100vh">
           <router-view></router-view>
         </el-main>
       </div>
@@ -129,9 +136,12 @@ export default {
 
   data() {
     return {
-      isCollapse: false,
       index: '1',
 
+      isCollapse: false,
+      toggle: false,//第二个图标默认隐藏
+      block: true,//默认显示第一个图标
+
     }
   },
 
@@ -142,6 +152,12 @@ export default {
   },
 
   methods: {
+    isC() {
+      this.isCollapse = !this.isCollapse;
+      this.toggle = !this.toggle;
+      this.block = !this.block;
+    },
+
     handleOpen(key, keyPath) {
       console.log(key, keyPath);
     }
@@ -199,5 +215,24 @@ export default {
 
 }
 
+.el-main {
+  padding: 5px 5px 5px 5px
+}
+
+.logo {
+  margin-top: 20px;
+  margin-bottom: 10px;
+}
 
+.el-icon-s-fold {
+  margin-top: 30px;
+  width: 20px;
+  height: 20px;
+}
+
+.el-icon-s-unfold {
+  margin-top: 30px;
+  width: 20px;
+  height: 20px;
+}
 </style>

sources/client/vrv-platform/src/views/operator/list.vue

@@ -3,18 +3,17 @@
     <el-container>
       <el-main>
 
-        <div style="margin-bottom: 20px">
+        <div style="margin-bottom: 10px">
           <el-button size="medium" icon="el-icon-back" type="text">返回</el-button>
-          <span style="margin-left: 20px;margin-bottom: 15px; font-size: 18px">运营商列表</span>
+          <span style="margin-left: 20px; font-size: 18px">运营商列表</span>
         </div>
 
-        <div>
-          <el-row>
+
             <el-button size="medium"  icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">查询</el-button>
-            <el-button size="medium" icon="el-icon-plus" @click="showAdd">新增</el-button>
-          </el-row>
-        </div>
+            <el-button size="medium" icon="el-icon-plus" @click="showAdd" style="margin-left: 0">新增</el-button>
+
 
+        <div style="padding: 10px;background-color: white">
         <el-form :inline="true" :model="searchFormData" style="background-color: white;">
           <el-form-item label="运营商名称">
             <el-input placeholder="运营商名称" size="mini" v-model="searchFormData.name"></el-input>
@@ -28,44 +27,60 @@
           <el-form-item label="联系电话">
             <el-input placeholder="联系电话" size="mini" v-model="searchFormData.tel"></el-input>
           </el-form-item>
-          <el-form-item label="省份">
-            <el-input placeholder="省份" size="mini" v-model="searchFormData.province"></el-input>
+
+          <el-form-item label="省份" size="mini" style="margin-top: 6px">
+            <el-select v-model="searchFormData.province" placeholder="省份" style="width: 180px">
+              <el-option label="上海" value="上海"></el-option>
+              <el-option label="广东" value="广东"></el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="城市">
-            <el-input placeholder="城市" size="mini" v-model="searchFormData.city"></el-input>
+
+          <el-form-item label="城市" style="margin-top: 6px" size="mini">
+            <el-select v-model="searchFormData.city" placeholder="城市" style="width: 180px">
+              <el-option label="广州" value="广州"></el-option>
+              <el-option label="韶关" value="韶关"></el-option>
+            </el-select>
           </el-form-item>
+
           <el-form-item label="具体地址">
             <el-input placeholder="具体地址" size="mini" v-model="searchFormData.address"></el-input>
           </el-form-item>
 
 
-          <el-dialog title="运营商" :visible.sync="dialogFormVisible">
+          <el-dialog title="运营商" :visible.sync="dialogFormVisible" style="width: 70% ; margin-left: 300px ;">
+
             <el-form label-position="left" :model="formData">
-              <el-form-item label="运营商名称">
+              <el-form-item label="运营商名称" style=" text-align: right;margin-right: 20px">
                 <el-input v-model="formData.name"></el-input>
               </el-form-item>
-              <el-form-item label="运营商编号">
+              <el-form-item label="运营商编号" style="">
                 <el-input v-model="formData.number"></el-input>
               </el-form-item>
-              <el-form-item label="联系人">
+              <el-form-item label="联系人" style=" text-align: right;margin-right: 34px;margin-left: 38px">
                 <el-input v-model="formData.contact"></el-input>
               </el-form-item>
-              <el-form-item label="联系电话">
+              <el-form-item label="联系电话" style="">
                 <el-input v-model="formData.tel"></el-input>
               </el-form-item>
-              <el-form-item label="省份">
-                <el-input v-model="formData.province"></el-input>
+              <el-form-item label="省份" style=" text-align: right;margin-right: 62px;margin-left: 52px ;">
+                <el-select v-model="formData.province" placeholder="省份" style="width: 202px">
+                  <el-option label="上海" value="上海"></el-option>
+                  <el-option label="广东" value="广东"></el-option>
+                </el-select>
               </el-form-item>
-              <el-form-item label="城市">
-                <el-input v-model="formData.city"></el-input>
+              <el-form-item label="城市" style="">
+                <el-select v-model="formData.city" placeholder="城市" style="width: 202px">
+                  <el-option label="广州" value="广州"></el-option>
+                  <el-option label="韶关" value="韶关"></el-option>
+                </el-select>
               </el-form-item>
-              <el-form-item label="具体地址">
+              <el-form-item label="具体地址" style=" text-align: right;margin-right: 75px;margin-left: 24px">
                 <el-input v-model="formData.address"></el-input>
               </el-form-item>
 
             </el-form>
 
-            <div slot="footer" class="dialog-footer">
+            <div slot="footer" class="dialog-footer" style="text-align: center">
               <el-button @click="cancel()">取 消</el-button>
               <el-button type="primary" @click="addOrEditMehtond()">确 定</el-button>
             </div>
@@ -95,7 +110,7 @@
           <el-table-column label="操作"  fixed="right">
             <template slot-scope="scope">
               <el-button type="text" size="medium" @click="showEdit(scope.row)">编辑</el-button>
-              <el-button type="text" size="medium" @click="project">项目</el-button>
+              <el-button type="text" size="medium" @click="operatorList(scope.row)">项目</el-button>
               <el-button type="text" size="medium" @click="del(scope.row)" style="color: #c01920">删除</el-button>
 
               <el-button
@@ -110,9 +125,9 @@
 
             </template>
           </el-table-column>
-
         </el-table>
 
+
         <el-pagination
             style="margin-top: 15px;text-align: center"
             background
@@ -123,6 +138,7 @@
             @current-change="handleCurrentChange"
         >
         </el-pagination>
+        </div>
       </el-main>
 
     </el-container>
@@ -252,7 +268,8 @@ export default {
 
       this.dialogFormVisible = true;
 
-      this.formData = row
+      this.editRow = JSON.parse(JSON.stringify(row));
+      this.formData = this.editRow
 
       this.addOrEdit = 2
     },
@@ -409,17 +426,32 @@ export default {
 
     },
 
-    project() {
+    operatorList(row) {
+
       let vm = this;
-      vm.$router.push('/project')
+      vm.$router.push({
+        path:'/operatorList',
+        query:{row:row}
+      })
     }
+
   }
 }
 </script>
 
 <style scoped>
 .el-form-item{
-  margin-left: 15px;
-  margin-top: 10px
+  margin-right: 10px;
+  margin-left: 10px;
+  margin-bottom: 10px;
+  margin-top: 0px;
+}
+
+.el-dialog__header{
+  text-align: center;
 }
+
+
+
+
 </style>

sources/client/vrv-platform/src/views/operatorLog/list.vue

@@ -3,83 +3,83 @@
     <el-container>
 
       <el-main>
-        <div style="margin-bottom: 20px">
+        <div style="margin-bottom: 10px">
           <el-button size="medium" icon="el-icon-back" type="text">返回</el-button>
-          <span style="margin-left: 20px;margin-bottom: 15px; font-size: 18px">操作日志列表</span>
+          <span style="margin-left: 20px; font-size: 18px">操作日志列表</span>
         </div>
 
-        <div>
-          <el-row>
-            <el-button size="medium" icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">
-              查询
-            </el-button>
-            <el-button size="medium" icon="el-icon-plus" @click="showAdd">新增</el-button>
-          </el-row>
-        </div>
+        <el-button size="medium" icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">
+          查询
+        </el-button>
+        <el-button size="medium" icon="el-icon-plus" @click="showAdd" style="margin-left: 0">新增</el-button>
+
+
+        <div style="padding: 10px;background-color: white">
+          <el-form :inline="true" :model="searchFormData" style="background-color: white;">
+            <el-form-item label="用户姓名">
+              <el-input placeholder="用户姓名" size="mini" v-model="searchFormData.userRealname"></el-input>
+            </el-form-item>
+            <el-form-item label="用户账号">
+              <el-input placeholder="用户账号" size="mini" v-model="searchFormData.userAccount"></el-input>
+            </el-form-item>
+            <el-form-item label="运营商编号">
+              <el-input placeholder="运营商编号" size="mini" v-model="searchFormData.operatorNumber"></el-input>
+            </el-form-item>
+
+
+            <el-dialog title="日志" :visible.sync="dialogFormVisible">
+              <el-form label-position="left" :model="formData">
+
+                <el-form-item label="用户姓名">
+                  <el-input v-model="formData.userRealname"></el-input>
+                </el-form-item>
+                <el-form-item label="用户账号">
+                  <el-input v-model="formData.userAccount"></el-input>
+                </el-form-item>
+                <el-form-item label="操作内容">
+                  <el-input v-model="formData.content"></el-input>
+                </el-form-item>
+                <el-form-item label="运营商编号">
+                  <el-input v-model="formData.operatorNumber"></el-input>
+                </el-form-item>
+              </el-form>
+
+              <div slot="footer" class="dialog-footer">
+                <el-button @click="cancel()">取 消</el-button>
+                <el-button type="primary" @click="addOrEditMehtond">确 定</el-button>
+              </div>
+            </el-dialog>
+
+          </el-form>
+
+
+          <el-table :data="tableData">
+            <el-table-column type="selection"></el-table-column>
+            <el-table-column prop="userRealname" label="用户姓名"></el-table-column>
+            <el-table-column prop="userAccount" label="用户账号"></el-table-column>
+            <el-table-column prop="content" label="操作内容"></el-table-column>
+            <el-table-column prop="operatorNumber" label="运营商编号"></el-table-column>
+
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button type="text" size="medium" @click="del(scope.row)" style="color: #c01920">删除</el-button>
+              </template>
+            </el-table-column>
+
+          </el-table>
 
-        <el-form :inline="true" :model="searchFormData" style="background-color: white;">
-          <el-form-item label="用户姓名">
-            <el-input placeholder="用户姓名" size="mini" v-model="searchFormData.userRealname"></el-input>
-          </el-form-item>
-          <el-form-item label="用户账号">
-            <el-input placeholder="用户账号" size="mini" v-model="searchFormData.userAccount"></el-input>
-          </el-form-item>
-          <el-form-item label="运营商编号">
-            <el-input placeholder="运营商编号" size="mini" v-model="searchFormData.operatorNumber"></el-input>
-          </el-form-item>
-
-
-          <el-dialog title="日志" :visible.sync="dialogFormVisible">
-            <el-form label-position="left" :model="formData">
-
-              <el-form-item label="用户姓名">
-                <el-input v-model="formData.userRealname"></el-input>
-              </el-form-item>
-              <el-form-item label="用户账号">
-                <el-input v-model="formData.userAccount"></el-input>
-              </el-form-item>
-              <el-form-item label="操作内容">
-                <el-input v-model="formData.content"></el-input>
-              </el-form-item>
-              <el-form-item label="运营商编号">
-                <el-input v-model="formData.operatorNumber"></el-input>
-              </el-form-item>
-            </el-form>
-
-            <div slot="footer" class="dialog-footer">
-              <el-button @click="cancel()">取 消</el-button>
-              <el-button type="primary" @click="addOrEditMehtond">确 定</el-button>
-            </div>
-          </el-dialog>
-
-        </el-form>
-
-
-        <el-table :data="tableData">
-          <el-table-column  type="selection"></el-table-column>
-          <el-table-column prop="userRealname" label="用户姓名"></el-table-column>
-          <el-table-column prop="userAccount" label="用户账号"></el-table-column>
-          <el-table-column prop="content" label="操作内容"></el-table-column>
-          <el-table-column prop="operatorNumber" label="运营商编号"></el-table-column>
-
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button type="text" size="medium" @click="del(scope.row)" style="color: #c01920">删除</el-button>
-            </template>
-          </el-table-column>
-
-        </el-table>
 
         <el-pagination
             style="margin-top: 15px;text-align: center"
-          background
-          layout="prev, pager, next"
-          :page-size="pager.pageSize"
-          :current-page="pager.pageIndex"
-          :total="pager.itemCount"
-          @current-change="handleCurrentChange"
+            background
+            layout="prev, pager, next"
+            :page-size="pager.pageSize"
+            :current-page="pager.pageIndex"
+            :total="pager.itemCount"
+            @current-change="handleCurrentChange"
         >
         </el-pagination>
+        </div>
       </el-main>
 
     </el-container>
@@ -112,13 +112,13 @@ export default {
       },
 
       tableData:
-        [{
-          userRealname: '1',
-          userAccount: '1',
-          content: '1',
-          operatorNumber: '1',
+          [{
+            userRealname: '1',
+            userAccount: '1',
+            content: '1',
+            operatorNumber: '1',
 
-        }],
+          }],
       formData: {
         userRealname: '1',
         userAccount: '1',
@@ -126,11 +126,11 @@ export default {
         operatorNumber: '1',
       },
       searchFormData:
-        {
-          userRealname: '',
-          userAccount: '',
-          operatorNumber: '',
-        }
+          {
+            userRealname: '',
+            userAccount: '',
+            operatorNumber: '',
+          }
     }
   },
 
@@ -156,14 +156,14 @@ export default {
           userAccount: this.searchFormData.userAccount,
         }
       })
-        .then((response) => {
-          // vm.paper = response.data.data.paper;
-          console.log(response.data.data);
+          .then((response) => {
+            // vm.paper = response.data.data.paper;
+            console.log(response.data.data);
 
-          vm.pager = response.data.data.pager
+            vm.pager = response.data.data.pager
 
-          vm.tableData = response.data.data.operatorLogs;
-        })
+            vm.tableData = response.data.data.operatorLogs;
+          })
     },
     search() {
       //console.log(this.searchFormData)
@@ -173,9 +173,9 @@ export default {
       this.dialogFormVisible = true;
 
       this.formData.operatorNumber = '',
-        this.formData.userAccount = '',
-        this.formData.userRealname = '',
-        this.formData.content = ''
+          this.formData.userAccount = '',
+          this.formData.userRealname = '',
+          this.formData.content = ''
     },
 
     showEdit(row) {
@@ -202,25 +202,25 @@ export default {
 
           }
         })
-          .then((response) => {
-            console.log(response)
+            .then((response) => {
+              console.log(response)
 
-            if (response.data.status == 200) {
+              if (response.data.status == 200) {
 
-              this.$message({
-                type: 'success',
-                showClose: true,
-                message: response.data.desc
-              })
-            }
+                this.$message({
+                  type: 'success',
+                  showClose: true,
+                  message: response.data.desc
+                })
+              }
 
-            this.dialogFormVisible = false;
+              this.dialogFormVisible = false;
 
-            this.loadData();
+              this.loadData();
 
-          })
-          .catch(() => {
-          });
+            })
+            .catch(() => {
+            });
       }
 
       if (this.addOrEdit == 1) {
@@ -232,30 +232,30 @@ export default {
             operatorNumber: this.formData.operatorNumber,
           }
         })
-          .then((response) => {
-            console.log(response)
-            if (response.data.status == 200) {
-
-              this.dialogFormVisible = false;
-
-              this.$message({
-                type: 'success',
-                showClose: true,
-                message: response.data.desc
-              })
-
-              this.loadData();
-            }
-
-            if (response.data.status == 401) {
-
-              this.$message({
-                type: 'info',
-                showClose: true,
-                message: response.data.desc
-              })
-            }
-          })
+            .then((response) => {
+              console.log(response)
+              if (response.data.status == 200) {
+
+                this.dialogFormVisible = false;
+
+                this.$message({
+                  type: 'success',
+                  showClose: true,
+                  message: response.data.desc
+                })
+
+                this.loadData();
+              }
+
+              if (response.data.status == 401) {
+
+                this.$message({
+                  type: 'info',
+                  showClose: true,
+                  message: response.data.desc
+                })
+              }
+            })
       }
     },
 
@@ -269,27 +269,27 @@ export default {
             code: row.code,
           }
         })
-          .then((response) => {
-            console.log(response)
-            if (response.data.status == 200) {
-              this.$message({
-                type: 'success',
-                showClose: true,
-                message: response.data.desc
-              })
+            .then((response) => {
+              console.log(response)
+              if (response.data.status == 200) {
+                this.$message({
+                  type: 'success',
+                  showClose: true,
+                  message: response.data.desc
+                })
 
 
-            }
-            this.loadData();
-          })
+              }
+              this.loadData();
+            })
       })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            showClose: true,
-            message: '取消删除'
-          })
-        });
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              showClose: true,
+              message: '取消删除'
+            })
+          });
     },
     cancel() {
       this.$message({
@@ -309,7 +309,9 @@ export default {
 
 <style scoped>
 .el-form-item {
-  margin-left: 15px;
-  margin-top: 10px
+  margin-right: 10px;
+  margin-left: 10px;
+  margin-bottom: 10px;
+  margin-top: 0px;
 }
 </style>

sources/client/vrv-platform/src/views/power/list.vue

@@ -1,18 +1,15 @@
 <template>
   <div id="power">
     <el-main>
-      <div style="margin-bottom: 20px">
+      <div style="margin-bottom: 10px">
         <el-button size="medium" icon="el-icon-back" type="text">返回</el-button>
-        <span style="margin-left: 20px;margin-bottom: 15px; font-size: 18px">权限列表</span>
+        <span style="margin-left: 20px; font-size: 18px">权限列表</span>
       </div>
 
-      <div>
-        <el-row>
-          <el-button size="medium"  icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">查询</el-button>
-          <el-button size="medium" icon="el-icon-plus" @click="showAdd">新增</el-button>
-        </el-row>
-      </div>
+      <el-button size="medium"  icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">查询</el-button>
+      <el-button size="medium" icon="el-icon-plus" @click="showAdd" style="margin-left: 0">新增</el-button>
 
+      <div style="padding: 10px;background-color: white">
       <el-form :inline="true" :model="searchFormData" style="background-color: white;">
         <el-form-item label="权限名称">
           <el-input placeholder="权限名称" size="small" v-model="searchFormData.name"></el-input>
@@ -70,6 +67,7 @@
 
       </el-table>
 
+
       <el-pagination
           style="margin-top: 15px;text-align: center"
         background
@@ -80,6 +78,7 @@
         @current-change="handleCurrentChange"
       >
       </el-pagination>
+      </div>
 
     </el-main>
   </div>
@@ -297,9 +296,12 @@ export default {
 }
 </script>
 
-<style>
-.el-form-item {
-  margin-left: 15px;
-  margin-top: 10px
+<style scoped>
+.el-form-item{
+  margin-right: 10px;
+  margin-left: 10px;
+  margin-bottom: 10px;
+  margin-top: 0px;
 }
+
 </style>

sources/client/vrv-platform/src/views/project/list.vue

@@ -0,0 +1,472 @@
+
+<template>
+  <div id="project">
+    <el-container>
+
+      <el-main>
+        <div style="margin-bottom: 10px">
+          <el-button size="medium" icon="el-icon-back" type="text">返回</el-button>
+          <span style="margin-left: 20px; font-size: 18px">项目列表</span>
+        </div>
+
+        <el-button size="medium" icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">
+          查询
+        </el-button>
+        <el-button size="medium" icon="el-icon-plus" @click="showAdd" style="margin-left: 0">新增</el-button>
+
+        <div style="padding: 10px;background-color: white">
+          <el-form :inline="true" :model="searchFormData" style="background-color: white;">
+            <el-form-item label="项目名称">
+              <el-input placeholder="项目名称" size="mini" v-model="searchFormData.name"></el-input>
+            </el-form-item>
+            <el-form-item label="项目编号">
+              <el-input placeholder="项目编号" size="mini" v-model="searchFormData.number"></el-input>
+            </el-form-item>
+
+            <el-form-item label="客户名称">
+              <el-input placeholder="客户名称" size="mini" v-model="searchFormData.customer"></el-input>
+            </el-form-item>
+            <el-form-item label="客户电话">
+              <el-input placeholder="客户电话" size="mini" v-model="searchFormData.customerTel"></el-input>
+            </el-form-item>
+
+            <el-form-item label="省份" size="mini" style="margin-top: 6px">
+              <el-select v-model="searchFormData.province" placeholder="省份" style="width: 180px">
+
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="城市" style="margin-top: 6px" size="mini">
+              <el-select v-model="searchFormData.city" placeholder="城市" style="width: 180px">
+                <el-option label="广州" value="广州"></el-option>
+                <el-option label="韶关" value="韶关"></el-option>
+              </el-select>
+            </el-form-item>
+
+
+            <el-form-item label="具体地址">
+              <el-input placeholder="具体地址" size="mini" v-model="searchFormData.address"></el-input>
+            </el-form-item>
+
+            <el-form-item label="运营商编号" style="margin-top: 6px" size="mini">
+              <el-select v-model="formData.operatorNumber" placeholder="运营商编号" style="width: 180px">
+
+                <el-option :value="i.number" v-for="(i,index) in operators" :key="index" :label="i.number"></el-option>
+
+              </el-select>
+            </el-form-item>
+
+            <!--            编辑弹窗-->
+            <el-dialog title="项目" :visible.sync="dialogFormVisible" style="width: 70% ; margin-left: 300px ;">
+              <el-form label-position="left" :model="formData">
+                <el-row style="margin-left: 15px">
+                  <el-form-item label="项目名称">
+                    <el-input v-model="formData.name"></el-input>
+                  </el-form-item>
+                  <el-form-item label="项目编号">
+                    <el-input v-model="formData.number"></el-input>
+                  </el-form-item>
+                </el-row>
+                <el-row style="margin-left: 15px">
+                  <el-form-item label="项目描述">
+                    <el-input v-model="formData.description"></el-input>
+                  </el-form-item>
+                  <el-form-item label="客户名称">
+                    <el-input v-model="formData.customer"></el-input>
+                  </el-form-item>
+                </el-row>
+
+                <el-row style="margin-left: 0px">
+                  <el-form-item label="运营商编号">
+                    <el-select v-model="formData.operatorNumber" placeholder="运营商编号" style="width: 202px">
+
+                      <el-option :value="i.number" v-for="(i,index) in operators" :key="index" :label="i.number"></el-option>
+
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item label="客户电话">
+                    <el-input v-model="formData.customerTel"></el-input>
+                  </el-form-item>
+                </el-row>
+
+                <el-form-item label="省份" style=" text-align: right;margin-right: 40px;margin-left: 52px">
+                  <el-select v-model="formData.province" placeholder="省份" style="width: 202px">
+                    <el-option label="上海" value="上海"></el-option>
+                    <el-option label="广东" value="广东"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="城市" style="margin-right: 2px">
+                  <el-select v-model="formData.city" placeholder="城市" style="width: 202px">
+                    <el-option label="广州" value="广州"></el-option>
+                    <el-option label="韶关" value="韶关"></el-option>
+                  </el-select>
+                </el-form-item>
+
+
+                <el-form-item label="具体地址" style="margin-left: 24px">
+                  <el-input v-model="formData.address"></el-input>
+                </el-form-item>
+              </el-form>
+
+              <div slot="footer" class="dialog-footer" style="text-align: center">
+                <el-button @click="cancel()">取 消</el-button>
+                <el-button type="primary" @click="addOrEditMehtond">确 定</el-button>
+              </div>
+            </el-dialog>
+
+
+          </el-form>
+
+          <el-table :data="tableData">
+            <el-table-column type="selection"></el-table-column>
+            <el-table-column prop="name" label="项目名称"></el-table-column>
+            <el-table-column prop="number" label="项目编号"></el-table-column>
+            <el-table-column prop="description" label="项目描述"></el-table-column>
+            <el-table-column prop="customer" label="客户名称"></el-table-column>
+            <el-table-column prop="customerTel" label="客户电话"></el-table-column>
+
+            <el-table-column prop="province" label="省份"></el-table-column>
+            <el-table-column prop="city" label="城市"></el-table-column>
+            <el-table-column prop="address" label="具体地址"></el-table-column>
+
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button type="text" size="medium" @click="showEdit(scope.row)">编辑</el-button>
+                <el-button type="text" size="medium" @click="gateway">网关</el-button>
+                <el-button type="text" size="medium" @click="del(scope.row)" style="color: #c01920">删除</el-button>
+              </template>
+            </el-table-column>
+
+          </el-table>
+
+
+          <el-pagination
+              style="margin-top: 15px;text-align: center"
+              background
+              layout="prev, pager, next"
+              :page-size="pager.pageSize"
+              :current-page="pager.pageIndex"
+              :total="pager.itemCount"
+              @current-change="handleCurrentChange"
+          >
+          </el-pagination>
+        </div>
+      </el-main>
+
+    </el-container>
+  </div>
+</template>
+
+
+<script>
+
+
+export default {
+  name: 'project',
+
+  data() {
+    return {
+
+      api: {
+        listOperator: this.$api.operator.list,
+
+        list: this.$api.project.list,
+        delete: this.$api.project.delete,
+        add: this.$api.project.add,
+        update: this.$api.project.update,
+      },
+
+      operators: [],
+
+      addOrEdit: 1,
+
+      dialogFormVisible: false,
+      dialogFormVisible1: false,
+
+      pager: {
+        pageSize: 2,
+        pageIndex: 1,
+        itemCount: 0,
+      },
+
+      tableData:
+          [{
+            name: '1',
+            number: '1',
+            description: '1',
+            customer: '1',
+            customerTel: '1',
+            province: '1',
+            city: '1',
+            address: '1',
+          }],
+      formData: {
+        name: '1',
+        number: '1',
+        description: '1',
+        customer: '1',
+        customerTel: '1',
+        province: '1',
+        city: '1',
+        address: '1',
+        operatorNumber: '',
+        code: '',
+        valid: '',
+      },
+      searchFormData:
+          {
+            name: '',
+            number: '',
+            customer: '',
+            customerTel: '',
+            province: '',
+            city: '',
+            address: '',
+            operatorNumber: '',
+          }
+    }
+  },
+
+
+  created: function () {
+    this.loadData();
+    this.getOperatorNumber();
+  },
+
+  methods:{
+    //切换页码
+    handleCurrentChange(index) {
+      this.loadData(index)
+    },
+
+    getOperatorNumber() {
+      const vm = this;
+      vm.$http.get(vm.api.listOperator, {
+        params: {
+          number: this.searchFormData.operatorNumber,
+        }
+      }).then((resp) => {
+        console.log(resp.data.data.operators)
+
+        vm.operators = resp.data.data.operators
+      })
+    },
+
+
+    loadData(index) {
+      const vm = this;
+      vm.$http.get(vm.api.list, {
+        params: {
+          pageSize: 5,
+          pageIndex: index ? index : 1,
+
+          name: this.searchFormData.name,
+          number: this.searchFormData.number,
+          province: this.searchFormData.province,
+          city: this.searchFormData.city,
+          address: this.searchFormData.address,
+          customer: this.searchFormData.customer,
+          customerTel: this.searchFormData.customerTel,
+          operatorNumber: this.searchFormData.operatorNumber,
+        }
+      })
+          .then((response) => {
+            // vm.paper = response.data.data.paper;
+            //console.log(response.data.data);
+
+            vm.pager = response.data.data.pager
+
+            vm.tableData = response.data.data.projects;
+          })
+    }
+    ,
+    search() {
+      //console.log(this.searchFormData)
+      this.loadData();
+    }
+    ,
+    showAdd() {
+      this.dialogFormVisible = true;
+
+      this.formData.name = '';
+      this.formData.province = '';
+      this.formData.description = '';
+      this.formData.city = '';
+      this.formData.customer = '';
+      this.formData.customerTel = '';
+      this.formData.address = '';
+      this.formData.number = '';
+      this.formData.operatorNumber = '',
+          this.formData.description = '';
+
+      this.addOrEdit = 1
+
+      this.getOperatorNumber()
+    }
+    ,
+
+    showEdit(row) {
+
+      console.log()
+
+      this.dialogFormVisible = true;
+
+      this.editRow = JSON.parse(JSON.stringify(row));
+      this.formData = this.editRow
+
+      this.addOrEdit = 2
+
+      this.getOperatorNumber()
+    }
+    ,
+
+
+    addOrEditMehtond() {
+      const vm = this;
+      if (this.addOrEdit == 2) {
+        vm.$http.get(vm.api.update, {
+          params: {
+            code: this.formData.code,
+            name: this.formData.name,
+            number: this.formData.number,
+            description: this.formData.description,
+            province: this.formData.province,
+            city: this.formData.city,
+            address: this.formData.address,
+            operatorNumber: this.formData.operatorNumber,
+            customer: this.formData.customer,
+            customerTel: this.formData.customerTel,
+
+          }
+        })
+            .then((response) => {
+              console.log(response)
+
+
+              if (response.data.status == 200) {
+
+                this.$message({
+                  type: 'success',
+                  showClose: true,
+                  message: response.data.desc
+                })
+              }
+
+              this.dialogFormVisible = false;
+
+              this.loadData();
+
+            })
+            .catch(() => {
+            });
+      }
+
+      if (this.addOrEdit == 1) {
+        vm.$http.get(vm.api.add, {
+          params: {
+            name: this.formData.name,
+            number: this.formData.number,
+            description: this.formData.description,
+            province: this.formData.province,
+            city: this.formData.city,
+            operatorNumber: this.formData.operatorNumber,
+            address: this.formData.address,
+            customer: this.formData.customer,
+            customerTel: this.formData.customerTel,
+          }
+        })
+            .then((response) => {
+
+              if (response.data.status == 200) {
+
+                this.dialogFormVisible = false;
+
+                this.$message({
+                  type: 'success',
+                  showClose: true,
+                  message: response.data.desc
+                })
+
+                this.loadData();
+              }
+              if (response.data.status == 500) {
+
+                this.dialogFormVisible = false;
+
+                this.$message({
+                  type: 'error',
+                  showClose: true,
+                  message: '未找到运营商'
+                })
+
+                this.loadData();
+              }
+            })
+      }
+    }
+    ,
+
+    del(row) {
+      const vm = this;
+      this.$confirm('确认删除', '提示', {
+        type: 'warning'
+      }).then(() => {
+        vm.$http.get(vm.api.delete, {
+          params: {
+            code: row.code,
+          }
+        })
+            .then((response) => {
+              console.log(response)
+              if (response.data.status == 200) {
+                this.$message({
+                  type: 'success',
+                  showClose: true,
+                  message: response.data.desc
+                })
+
+              }
+              this.loadData();
+            })
+      })
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              showClose: true,
+              message: '取消删除'
+            })
+          });
+    }
+    ,
+    cancel() {
+      this.$message({
+        message: '操作取消',
+        showClose: true,
+        type: 'info'
+      });
+
+      this.dialogFormVisible = false;
+    }
+    ,
+
+
+    gateway() {
+      let vm = this;
+      vm.$router.push('/gateway')
+    }
+    ,
+  }
+}
+
+</script>
+
+<style scoped>
+.el-form-item {
+  margin-right: 10px;
+  margin-left: 10px;
+  margin-bottom: 10px;
+  margin-top: 0px;
+}
+
+</style>

sources/client/vrv-platform/src/views/project/operatorList.vue

@@ -0,0 +1,491 @@
+<template>
+  <div id="project">
+    <el-container>
+
+      <el-main>
+        <div style="margin-bottom: 10px">
+          <el-button size="medium" icon="el-icon-back" type="text">返回</el-button>
+          <span style="margin-left: 20px; font-size: 18px">项目列表</span>
+        </div>
+
+        <el-button size="medium" icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">
+          查询
+        </el-button>
+        <el-button size="medium" icon="el-icon-plus" @click="showAdd" style="margin-left: 0">新增</el-button>
+
+        <div style="padding: 10px;background-color: white">
+          <el-form :inline="true" :model="searchFormData" style="background-color: white;">
+            <el-form-item label="项目名称">
+              <el-input placeholder="项目名称" size="mini" v-model="searchFormData.name"></el-input>
+            </el-form-item>
+            <el-form-item label="项目编号">
+              <el-input placeholder="项目编号" size="mini" v-model="searchFormData.number"></el-input>
+            </el-form-item>
+
+            <el-form-item label="客户名称">
+              <el-input placeholder="客户名称" size="mini" v-model="searchFormData.customer"></el-input>
+            </el-form-item>
+            <el-form-item label="客户电话">
+              <el-input placeholder="客户电话" size="mini" v-model="searchFormData.customerTel"></el-input>
+            </el-form-item>
+
+            <el-form-item label="省份" size="mini" style="margin-top: 6px">
+              <el-select v-model="searchFormData.province" placeholder="省份" style="width: 180px">
+
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="城市" style="margin-top: 6px" size="mini">
+              <el-select v-model="searchFormData.city" placeholder="城市" style="width: 180px">
+                <el-option label="广州" value="广州"></el-option>
+                <el-option label="韶关" value="韶关"></el-option>
+              </el-select>
+            </el-form-item>
+
+
+            <el-form-item label="具体地址">
+              <el-input placeholder="具体地址" size="mini" v-model="searchFormData.address"></el-input>
+            </el-form-item>
+
+            <el-form-item label="运营商编号" style="margin-top: 6px" size="mini">
+              <el-select v-model="formData.operatorNumber" placeholder="运营商编号" style="width: 180px">
+
+                <el-option :value="i.number" v-for="(i,index) in operators" :key="index" :label="i.number"></el-option>
+
+              </el-select>
+            </el-form-item>
+
+            <!--            编辑弹窗-->
+            <el-dialog title="项目" :visible.sync="dialogFormVisible" style="width: 70% ; margin-left: 300px ;">
+              <el-form label-position="left" :model="formData">
+                <el-row style="margin-left: 15px">
+                  <el-form-item label="项目名称">
+                    <el-input v-model="formData.name"></el-input>
+                  </el-form-item>
+                  <el-form-item label="项目编号">
+                    <el-input v-model="formData.number"></el-input>
+                  </el-form-item>
+                </el-row>
+                <el-row style="margin-left: 15px">
+                  <el-form-item label="项目描述">
+                    <el-input v-model="formData.description"></el-input>
+                  </el-form-item>
+                  <el-form-item label="客户名称">
+                    <el-input v-model="formData.customer"></el-input>
+                  </el-form-item>
+                </el-row>
+
+                <el-row style="margin-left: 0px">
+                  <el-form-item label="运营商编号">
+                    <el-select v-model="formData.operatorNumber" placeholder="运营商编号" style="width: 202px">
+
+                      <el-option :value="i.number" v-for="(i,index) in operators" :key="index"
+                                 :label="i.number"></el-option>
+
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item label="客户电话">
+                    <el-input v-model="formData.customerTel"></el-input>
+                  </el-form-item>
+                </el-row>
+
+                <el-form-item label="省份" style=" text-align: right;margin-right: 40px;margin-left: 52px">
+                  <el-select v-model="formData.province" placeholder="省份" style="width: 202px">
+                    <el-option label="上海" value="上海"></el-option>
+                    <el-option label="广东" value="广东"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="城市" style="margin-right: 2px">
+                  <el-select v-model="formData.city" placeholder="城市" style="width: 202px">
+                    <el-option label="广州" value="广州"></el-option>
+                    <el-option label="韶关" value="韶关"></el-option>
+                  </el-select>
+                </el-form-item>
+
+
+                <el-form-item label="具体地址" style="margin-left: 24px">
+                  <el-input v-model="formData.address"></el-input>
+                </el-form-item>
+              </el-form>
+
+              <div slot="footer" class="dialog-footer" style="text-align: center">
+                <el-button @click="cancel()">取 消</el-button>
+                <el-button type="primary" @click="addOrEditMehtond">确 定</el-button>
+              </div>
+            </el-dialog>
+
+
+          </el-form>
+
+          <el-table :data="tableData">
+            <el-table-column type="selection"></el-table-column>
+            <el-table-column prop="operatorNumber" label="运营商编号"></el-table-column>
+            <el-table-column prop="name" label="项目名称"></el-table-column>
+            <el-table-column prop="number" label="项目编号"></el-table-column>
+            <el-table-column prop="description" label="项目描述"></el-table-column>
+            <el-table-column prop="customer" label="客户名称"></el-table-column>
+            <el-table-column prop="customerTel" label="客户电话"></el-table-column>
+
+            <el-table-column prop="province" label="省份"></el-table-column>
+            <el-table-column prop="city" label="城市"></el-table-column>
+            <el-table-column prop="address" label="具体地址"></el-table-column>
+
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button type="text" size="medium" @click="showEdit(scope.row)">编辑</el-button>
+                <el-button type="text" size="medium" @click="gateway">网关</el-button>
+                <el-button type="text" size="medium" @click="del(scope.row)" style="color: #c01920">删除</el-button>
+              </template>
+            </el-table-column>
+
+          </el-table>
+
+
+          <el-pagination
+              style="margin-top: 15px;text-align: center"
+              background
+              layout="prev, pager, next"
+              :page-size="pager.pageSize"
+              :current-page="pager.pageIndex"
+              :total="pager.itemCount"
+              @current-change="handleCurrentChange"
+          >
+          </el-pagination>
+        </div>
+      </el-main>
+
+    </el-container>
+  </div>
+</template>
+
+
+<script>
+
+
+export default {
+  name: 'project',
+
+  data() {
+    return {
+
+      api: {
+        listOperator: this.$api.operator.list,
+
+        list: this.$api.project.list,
+        delete: this.$api.project.delete,
+        add: this.$api.project.add,
+        update: this.$api.project.update,
+      },
+
+      operators: [],
+
+      addOrEdit: 1,
+
+      dialogFormVisible: false,
+      dialogFormVisible1: false,
+
+      pager: {
+        pageSize: 2,
+        pageIndex: 1,
+        itemCount: 0,
+      },
+
+      operatorData:{
+        name:'',
+        number:'',
+        code:'',
+        status:'',
+      },
+
+
+      tableData:
+          [{
+            name: '1',
+            number: '1',
+            description: '1',
+            customer: '1',
+            customerTel: '1',
+            province: '1',
+            city: '1',
+            address: '1',
+            operatorName:'',
+            operatorNumber:'',
+          }],
+      formData: {
+        name: '1',
+        number: '1',
+        description: '1',
+        customer: '1',
+        customerTel: '1',
+        province: '1',
+        city: '1',
+        address: '1',
+        operatorNumber: '',
+        code: '',
+        valid: '',
+      },
+      searchFormData:
+          {
+            name: '',
+            number: '',
+            customer: '',
+            customerTel: '',
+            province: '',
+            city: '',
+            address: '',
+            operatorNumber: '',
+          }
+    }
+  },
+
+
+  created: function () {
+    this.loadData();
+    this.getOperatorNumber();
+
+  },
+
+  methods: {
+    //切换页码
+    handleCurrentChange(index) {
+      this.loadData(index)
+    },
+
+    getOperatorNumber() {
+      const vm = this;
+      vm.$http.get(vm.api.listOperator, {
+        params: {
+          number: this.searchFormData.operatorNumber,
+        }
+      }).then((resp) => {
+        vm.operators = resp.data.data.operators
+      })
+    },
+
+
+    loadData(index) {
+      var row = this.$route.query.row;
+      console.log(row)
+
+      this.operatorData = row
+
+      console.log(this.operatorData.name)
+
+      const vm = this;
+      vm.$http.get(vm.api.list, {
+        params: {
+          pageSize: 5,
+          pageIndex: index ? index : 1,
+
+          name: this.searchFormData.name,
+          number: this.searchFormData.number,
+          province: this.searchFormData.province,
+          city: this.searchFormData.city,
+          address: this.searchFormData.address,
+          customer: this.searchFormData.customer,
+          customerTel: this.searchFormData.customerTel,
+          operatorName: this.operatorData.name,
+          operatorNumber: this.operatorData.number,
+        }
+      })
+          .then((response) => {
+            // vm.paper = response.data.data.paper;
+            //console.log(response.data.data);
+
+            vm.pager = response.data.data.pager
+
+            vm.tableData = response.data.data.projects;
+            vm.tableData.operatorNumber = this.operatorData.number;
+          })
+    }
+    ,
+    search() {
+      //console.log(this.searchFormData)
+      this.loadData();
+    }
+    ,
+    showAdd() {
+      this.dialogFormVisible = true;
+
+      this.formData.name = '';
+      this.formData.province = '';
+      this.formData.description = '';
+      this.formData.city = '';
+      this.formData.customer = '';
+      this.formData.customerTel = '';
+      this.formData.address = '';
+      this.formData.number = '';
+      this.formData.operatorNumber = '',
+          this.formData.description = '';
+
+      this.addOrEdit = 1
+
+      this.getOperatorNumber()
+    }
+    ,
+
+    showEdit(row) {
+
+      console.log()
+
+      this.dialogFormVisible = true;
+
+      this.editRow = JSON.parse(JSON.stringify(row));
+      this.formData = this.editRow
+
+      this.addOrEdit = 2
+
+      this.getOperatorNumber()
+    }
+    ,
+
+
+    addOrEditMehtond() {
+      const vm = this;
+      if (this.addOrEdit == 2) {
+        vm.$http.get(vm.api.update, {
+          params: {
+            code: this.formData.code,
+            name: this.formData.name,
+            number: this.formData.number,
+            description: this.formData.description,
+            province: this.formData.province,
+            city: this.formData.city,
+            address: this.formData.address,
+            operatorNumber: this.formData.operatorNumber,
+            customer: this.formData.customer,
+            customerTel: this.formData.customerTel,
+
+          }
+        })
+            .then((response) => {
+              console.log(response)
+
+
+              if (response.data.status == 200) {
+
+                this.$message({
+                  type: 'success',
+                  showClose: true,
+                  message: response.data.desc
+                })
+              }
+
+              this.dialogFormVisible = false;
+
+              this.loadData();
+
+            })
+            .catch(() => {
+            });
+      }
+
+      if (this.addOrEdit == 1) {
+        vm.$http.get(vm.api.add, {
+          params: {
+            name: this.formData.name,
+            number: this.formData.number,
+            description: this.formData.description,
+            province: this.formData.province,
+            city: this.formData.city,
+            operatorNumber: this.formData.operatorNumber,
+            address: this.formData.address,
+            customer: this.formData.customer,
+            customerTel: this.formData.customerTel,
+          }
+        })
+            .then((response) => {
+
+              if (response.data.status == 200) {
+
+                this.dialogFormVisible = false;
+
+                this.$message({
+                  type: 'success',
+                  showClose: true,
+                  message: response.data.desc
+                })
+
+                this.loadData();
+              }
+              if (response.data.status == 500) {
+
+                this.dialogFormVisible = false;
+
+                this.$message({
+                  type: 'error',
+                  showClose: true,
+                  message: '未找到运营商'
+                })
+
+                this.loadData();
+              }
+            })
+      }
+    }
+    ,
+
+    del(row) {
+      const vm = this;
+      this.$confirm('确认删除', '提示', {
+        type: 'warning'
+      }).then(() => {
+        vm.$http.get(vm.api.delete, {
+          params: {
+            code: row.code,
+          }
+        })
+            .then((response) => {
+              console.log(response)
+              if (response.data.status == 200) {
+                this.$message({
+                  type: 'success',
+                  showClose: true,
+                  message: response.data.desc
+                })
+
+              }
+              this.loadData();
+            })
+      })
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              showClose: true,
+              message: '取消删除'
+            })
+          });
+    }
+    ,
+    cancel() {
+      this.$message({
+        message: '操作取消',
+        showClose: true,
+        type: 'info'
+      });
+
+      this.dialogFormVisible = false;
+    }
+    ,
+
+
+    gateway() {
+      let vm = this;
+      vm.$router.push('/gateway')
+    }
+    ,
+  }
+}
+
+</script>
+
+<style scoped>
+.el-form-item {
+  margin-right: 10px;
+  margin-left: 10px;
+  margin-bottom: 10px;
+  margin-top: 0px;
+}
+
+</style>

sources/client/vrv-platform/src/views/project/project.vue

@@ -1,400 +0,0 @@
-<template>
-  <div id="project">
-    <el-container>
-
-      <el-main>
-        <div style="margin-bottom: 20px">
-          <el-button size="medium" icon="el-icon-back" type="text">返回</el-button>
-          <span style="margin-left: 20px;margin-bottom: 15px; font-size: 18px">项目列表</span>
-        </div>
-
-        <div>
-          <el-row>
-            <el-button size="medium"  icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">查询</el-button>
-            <el-button size="medium" icon="el-icon-plus" @click="showAdd">新增</el-button>
-          </el-row>
-        </div>
-
-        <el-form :inline="true" :model="searchFormData" style="background-color: white;">
-          <el-form-item label="项目名称">
-            <el-input placeholder="项目名称" size="mini" v-model="searchFormData.name"></el-input>
-          </el-form-item>
-          <el-form-item label="项目编号">
-            <el-input placeholder="项目编号" size="mini" v-model="searchFormData.number"></el-input>
-          </el-form-item>
-
-          <el-form-item label="客户名称">
-            <el-input placeholder="客户名称" size="mini" v-model="searchFormData.customer"></el-input>
-          </el-form-item>
-          <el-form-item label="客户电话">
-            <el-input placeholder="客户电话" size="mini" v-model="searchFormData.customerTel"></el-input>
-          </el-form-item>
-          <el-form-item label="省份">
-            <el-input placeholder="省份" size="mini" v-model="searchFormData.province"></el-input>
-          </el-form-item>
-          <el-form-item label="城市">
-            <el-input placeholder="城市" size="mini" v-model="searchFormData.city"></el-input>
-          </el-form-item>
-          <el-form-item label="具体地址">
-            <el-input placeholder="具体地址" size="mini" v-model="searchFormData.address"></el-input>
-          </el-form-item>
-
-          <el-form-item label="运营商编号">
-            <el-input placeholder="运营商编号" size="mini" v-model="searchFormData.operatorNumber"></el-input>
-          </el-form-item>
-
-
-          <el-dialog title="项目" :visible.sync="dialogFormVisible">
-            <el-form label-position="left" :model="formData">
-              <el-form-item label="项目名称">
-                <el-input v-model="formData.name"></el-input>
-              </el-form-item>
-              <el-form-item label="项目编号">
-                <el-input v-model="formData.number"></el-input>
-              </el-form-item>
-              <el-form-item label="项目描述">
-                <el-input v-model="formData.description"></el-input>
-              </el-form-item>
-              <el-form-item label="客户名称">
-                <el-input v-model="formData.customer"></el-input>
-              </el-form-item>
-              <el-form-item label="客户电话">
-                <el-input v-model="formData.customerTel"></el-input>
-              </el-form-item>
-              <el-form-item label="项目省份">
-                <el-input v-model="formData.province"></el-input>
-              </el-form-item>
-              <el-form-item label="项目城市">
-                <el-input v-model="formData.city"></el-input>
-              </el-form-item>
-              <el-form-item label="具体地址">
-                <el-input v-model="formData.address"></el-input>
-              </el-form-item>
-              <el-form-item label="运营商编号">
-                <el-input v-model="formData.operatorNumber"></el-input>
-              </el-form-item>
-            </el-form>
-
-            <div slot="footer" class="dialog-footer">
-              <el-button @click="cancel()">取 消</el-button>
-              <el-button type="primary" @click="addOrEditMehtond">确 定</el-button>
-            </div>
-          </el-dialog>
-
-        </el-form>
-
-
-        <el-table :data="tableData">
-          <el-table-column  type="selection"></el-table-column>
-          <el-table-column prop="name" label="项目名称"></el-table-column>
-          <el-table-column prop="number" label="项目编号"></el-table-column>
-          <el-table-column prop="description" label="项目描述"></el-table-column>
-          <el-table-column prop="customer" label="客户名称"></el-table-column>
-          <el-table-column prop="customerTel" label="客户电话"></el-table-column>
-
-          <el-table-column prop="province" label="省份"></el-table-column>
-          <el-table-column prop="city" label="城市"></el-table-column>
-          <el-table-column prop="address" label="具体地址"></el-table-column>
-
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button type="text" size="medium" @click="showEdit(scope.row)">编辑</el-button>
-              <el-button type="text" size="medium" @click="gateway">网关</el-button>
-              <el-button type="text" size="medium" @click="del(scope.row)" style="color: #c01920">删除</el-button>
-            </template>
-          </el-table-column>
-
-        </el-table>
-
-        <el-pagination
-            style="margin-top: 15px;text-align: center"
-            background
-            layout="prev, pager, next"
-            :page-size="pager.pageSize"
-            :current-page="pager.pageIndex"
-            :total="pager.itemCount"
-            @current-change="handleCurrentChange"
-        >
-        </el-pagination>
-      </el-main>
-
-    </el-container>
-  </div>
-</template>
-
-
-<script>
-
-
-export default {
-  name: 'project',
-  data() {
-    return {
-      api: {
-        list: this.$api.project.list,
-        delete: this.$api.project.delete,
-        add: this.$api.project.add,
-        update: this.$api.project.update,
-      },
-
-      addOrEdit: 1,
-
-      dialogFormVisible: false,
-
-      pager: {
-        pageSize: 2,
-        pageIndex: 1,
-        itemCount: 0,
-      },
-
-      tableData:
-          [{
-            name: '1',
-            number: '1',
-            description: '1',
-            customer: '1',
-            customerTel: '1',
-            province: '1',
-            city: '1',
-            address: '1',
-          }],
-      formData: {
-        name: '1',
-        number: '1',
-        description: '1',
-        customer: '1',
-        customerTel: '1',
-        province: '1',
-        city: '1',
-        address: '1',
-        operatorNumber: '1',
-        code: '',
-        valid: '',
-      },
-      searchFormData:
-          {
-            name: '',
-            number: '',
-            customer: '',
-            customerTel: '',
-            province: '',
-            city: '',
-            address: '',
-            operatorNumber: '',
-          }
-    }
-  },
-
-  created: function () {
-    this.loadData();
-  },
-
-  methods: {
-    //切换页码
-    handleCurrentChange(index) {
-      this.loadData(index)
-    },
-
-    loadData(index) {
-      const vm = this;
-      vm.$http.get(vm.api.list, {
-        params: {
-          pageSize: 5,
-          pageIndex: index ? index : 1,
-
-          name: this.searchFormData.name,
-          number: this.searchFormData.number,
-          province: this.searchFormData.province,
-          city: this.searchFormData.city,
-          address: this.searchFormData.address,
-          customer: this.searchFormData.customer,
-          customerTel: this.searchFormData.customerTel,
-          operatorNumber: this.searchFormData.operatorNumber,
-        }
-      })
-          .then((response) => {
-            // vm.paper = response.data.data.paper;
-            //console.log(response.data.data);
-
-            vm.pager = response.data.data.pager
-
-            vm.tableData = response.data.data.projects;
-          })
-    },
-    search() {
-      //console.log(this.searchFormData)
-      this.loadData();
-    },
-    showAdd() {
-      this.dialogFormVisible = true;
-
-      this.formData.name = '';
-      this.formData.province = '';
-      this.formData.description = '';
-      this.formData.city = '';
-      this.formData.customer = '';
-      this.formData.customerTel = '';
-      this.formData.address = '';
-      this.formData.number = '';
-      this.formData.operatorNumber = '',
-          this.formData.description = '';
-
-      this.addOrEdit = 1
-    },
-
-    showEdit(row) {
-
-      console.log(row)
-
-      this.dialogFormVisible = true;
-
-      this.formData = row
-
-      this.addOrEdit = 2
-    },
-
-
-    addOrEditMehtond() {
-      const vm = this;
-      if (this.addOrEdit == 2) {
-        vm.$http.get(vm.api.update, {
-          params: {
-            code: this.formData.code,
-            name: this.formData.name,
-            number: this.formData.number,
-            description: this.formData.description,
-            province: this.formData.province,
-            city: this.formData.city,
-            address: this.formData.address,
-            operatorNumber: this.formData.operatorNumber,
-            customer: this.formData.customer,
-            customerTel: this.formData.customerTel,
-
-          }
-        })
-            .then((response) => {
-              console.log(response)
-
-
-              if (response.data.status == 200) {
-
-                this.$message({
-                  type: 'success',
-                  showClose: true,
-                  message: response.data.desc
-                })
-              }
-
-              this.dialogFormVisible = false;
-
-              this.loadData();
-
-            })
-            .catch(() => {
-            });
-      }
-
-      if (this.addOrEdit == 1) {
-        vm.$http.get(vm.api.add, {
-          params: {
-            name: this.formData.name,
-            number: this.formData.number,
-            description: this.formData.description,
-            province: this.formData.province,
-            city: this.formData.city,
-            operatorNumber: this.formData.operatorNumber,
-            address: this.formData.address,
-            customer: this.formData.customer,
-            customerTel: this.formData.customerTel,
-          }
-        })
-            .then((response) => {
-
-              if (response.data.status == 200) {
-
-                this.dialogFormVisible = false;
-
-                this.$message({
-                  type: 'success',
-                  showClose: true,
-                  message: response.data.desc
-                })
-
-                this.loadData();
-              }
-              if (response.data.status == 500) {
-
-                this.dialogFormVisible = false;
-
-                this.$message({
-                  type: 'error',
-                  showClose: true,
-                  message: '未找到运营商'
-                })
-
-                this.loadData();
-              }
-            })
-      }
-    },
-
-    del(row) {
-      const vm = this;
-      this.$confirm('确认删除', '提示', {
-        type: 'warning'
-      }).then(() => {
-        vm.$http.get(vm.api.delete, {
-          params: {
-            code: row.code,
-          }
-        })
-            .then((response) => {
-              console.log(response)
-              if (response.data.status == 200) {
-                this.$message({
-                  type: 'success',
-                  showClose: true,
-                  message: response.data.desc
-                })
-
-              }
-              this.loadData();
-            })
-      })
-          .catch(() => {
-            this.$message({
-              type: 'info',
-              showClose: true,
-              message: '取消删除'
-            })
-          });
-    },
-    cancel() {
-      this.$message({
-        message: '操作取消',
-        showClose: true,
-        type: 'info'
-      });
-
-      this.dialogFormVisible = false;
-    },
-
-    gateway() {
-      let vm = this;
-      vm.$router.push('/gateway')
-    }
-
-
-  }
-
-
-}
-</script>
-
-<style scoped>
-.el-form-item{
-  margin-left: 15px;
-  margin-top: 10px
-}
-
-</style>

sources/client/vrv-platform/src/views/role/list.vue

@@ -1,18 +1,18 @@
 <template>
   <div id="role">
     <el-main>
-      <div style="margin-bottom: 20px">
+
+      <div style="margin-bottom: 10px">
         <el-button size="medium" icon="el-icon-back" type="text">返回</el-button>
-        <span style="margin-left: 20px;margin-bottom: 15px; font-size: 18px">角色列表</span>
+        <span style="margin-left: 20px; font-size: 18px">角色列表</span>
       </div>
 
-      <div>
-        <el-row>
-          <el-button size="medium"  icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">查询</el-button>
-          <el-button size="medium" icon="el-icon-plus" @click="showAdd">新增</el-button>
-        </el-row>
-      </div>
 
+      <el-button size="medium"  icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">查询</el-button>
+      <el-button size="medium" icon="el-icon-plus" @click="showAdd" style="margin-left: 0">新增</el-button>
+
+
+      <div style="padding: 10px;background-color: white">
       <el-form :inline="true" :model="searchFormData" style="background-color: white;">
         <el-form-item label="角色名称">
           <el-input placeholder="角色名称" size="mini" v-model="searchFormData.name"></el-input>
@@ -64,6 +64,7 @@
 
       </el-table>
 
+
       <el-pagination
           style="margin-top: 15px;text-align: center"
         background
@@ -74,6 +75,7 @@
         @current-change="handleCurrentChange"
       >
       </el-pagination>
+      </div>
 
     </el-main>
   </div>
@@ -284,9 +286,12 @@ export default {
 }
 </script>
 
-<style>
-.el-form-item {
-  margin-left: 15px;
-  margin-top: 10px
+<style scoped>
+.el-form-item{
+  margin-right: 10px;
+  margin-left: 10px;
+  margin-bottom: 10px;
+  margin-top: 0px;
 }
+
 </style>

sources/client/vrv-platform/src/views/user/list.vue

@@ -1,20 +1,18 @@
 <template>
   <div id="user">
     <el-main>
-      <div style="margin-bottom: 20px">
+      <div style="margin-bottom: 10px">
         <el-button size="medium" icon="el-icon-back" type="text">返回</el-button>
-        <span style="margin-left: 20px;margin-bottom: 15px; font-size: 18px">用户列表</span>
+        <span style="margin-left: 20px; font-size: 18px">用户列表</span>
       </div>
 
-      <div>
-        <el-row>
-          <el-button size="medium" icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">
-            查询
-          </el-button>
-          <el-button size="medium" icon="el-icon-plus" @click="showAdd">新增</el-button>
-        </el-row>
-      </div>
+      <el-button size="medium" icon="el-icon-search" style="margin-bottom: 15px" @click="search(searchFormData)">
+        查询
+      </el-button>
+      <el-button size="medium" icon="el-icon-plus" @click="showAdd" style="margin-left: 0">新增</el-button>
+
 
+      <div style="padding: 10px;background-color: white">
       <el-form :inline="true" :model="searchFormData" style="background-color: white;">
         <el-form-item label="姓名">
           <el-input placeholder="姓名" size="mini" v-model="searchFormData.realname"></el-input>
@@ -83,6 +81,7 @@
 
       </el-table>
 
+
       <el-pagination
           style="margin-top: 15px;text-align: center"
         background
@@ -93,6 +92,7 @@
         @current-change="handleCurrentChange"
       >
       </el-pagination>
+      </div>
 
     </el-main>
   </div>
@@ -324,9 +324,12 @@ export default {
 }
 </script>
 
-<style>
+
+<style scoped>
 .el-form-item {
-  margin-left: 15px;
-  margin-top: 10px
+  margin-right: 10px;
+  margin-left: 10px;
+  margin-bottom: 10px;
+  margin-top: 0px;
 }
 </style>

sources/server/vrv/vrv-platform/src/main/resources/application.yml

@@ -0,0 +1,19 @@
+fastboot:
+  auth:
+    exclude:
+      urls:
+        - /
+        - /**/*
+        - /auth/login
+        - /auth/logout
+        - /auth/verifyCode
+        - /auth/userInfo
+        - /auth/menuTree
+        - /nas/upload
+        - /nas/download
+        - /nas/delete
+        - /nas/batchDelete
+        - /nas/spaceInfo
+        - /app/appInfo
+        - /app/logo
+        - /commonFile/download