浏览代码

系统管理

luowei 2 年之前
父节点
当前提交
ea175d2ab8

+ 9 - 41
src/views/system/area/index.vue

@@ -1,8 +1,9 @@
 <template>
   <div class="app-container">
-
-
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <div class="main-right-box">
+           <!--    搜索条件    -->
+           <div class="main-search-box">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="机构类型" prop="orgType">
             <el-select
               v-model="queryParams.orgType"
@@ -29,11 +30,6 @@
         />
       </el-form-item>
 
-
-      <!-- <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item> -->
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -63,42 +59,12 @@
           v-hasPermi="['system:area:add']"
         >新增</el-button>
       </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit-outline"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:area:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:area:remove']"
-        >删除</el-button>
-      </el-col> -->
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:area:export']"
-        >导出</el-button>
-      </el-col> -->
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
+           </div>
+           <el-table
       border
       height="600"
       size="small"
@@ -140,6 +106,8 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+          </div>
+   
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>

+ 12 - 35
src/views/system/check/index.vue

@@ -1,30 +1,10 @@
 <template>
   <div class="app-container">
+    <div class="main-right-box">
+           <!--    搜索条件    -->
+           <div class="main-search-box">
 
-    <!-- <el-row :gutter="20"> -->
-      <!--部门数据-->
-      <!-- <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入机构名称" clearable size="small" prefix-icon="el-icon-search"
-                    style="margin-bottom: 20px"/>
-        </div>
-        <div class="tree-container">
-          <div style="margin-bottom: 10px;">
-            <el-checkbox v-model="queryParams.checkSub" @change="changeCheckBox">关联下级</el-checkbox>
-          </div>
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
-                   :filter-node-method="filterNode" ref="tree" node-key="id" :default-expanded-keys="defaultKeys"
-                   :default-checked-keys="defaultKeys" @node-click="handleNodeClick"/>
-        </div>
-      </el-col> -->
-  <!--机构数据-->
-  <!-- <el-col :span="4" :xs="24">
-<org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
-  @click="clickTreeNode" businessTree></org-tree> 
-</el-col> -->
-
-      <!-- <el-col :span="20" :xs="24"> -->
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
           <el-form-item label="NFC点位" prop="checkName">
             <el-input v-model="queryParams.checkName" placeholder="请输入NFC点位名称" clearable
                       @keyup.enter.native="handleQuery"/>
@@ -46,10 +26,6 @@
             </el-select>
           </el-form-item>
 
-          <!-- <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item> -->
         </el-form>
 
         <el-row :gutter="10" class="mb8">
@@ -72,18 +48,20 @@
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-        <el-table
+    
+       
+           </div>
+           <el-table
           border
           height="600"
           size="small"
           v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
-          <!--<el-table-column type="selection" width="55" align="center" />-->
-          <el-table-column label="序号" align="center" min-width="50">
+  <el-table-column label="序号" align="center" min-width="50">
             <template v-slot:default="scope">
               <span v-text="getPageIndex(scope.$index)"> </span>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="所属机构" align="left" prop="orgName"/> -->
+        
           <el-table-column label="机构类型" align="center" prop="orgType" />
           <el-table-column label="NFC点位" align="left" prop="checkName"/>
           <el-table-column label="修改人" align="center" prop="updateBy"/>
@@ -101,10 +79,9 @@
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
                     :limit.sync="queryParams.pageSize"
                     @pagination="getList"/>
-      <!-- </el-col>
 
-
-    </el-row> -->
+          </div>
+        
 
 
     <!-- 添加或修改区域采集点对话框 -->

+ 0 - 13
src/views/system/dept/index.vue

@@ -67,19 +67,6 @@
                    />
                  </el-select>
                </el-form-item>
- 
-<!--               <el-form-item>-->
-<!--                 <el-button-->
-<!--                   type="primary"-->
-<!--                   icon="el-icon-search"-->
-<!--                   size="mini"-->
-<!--                   @click="handleQuery"-->
-<!--                 >搜索</el-button-->
-<!--                 >-->
-<!--                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"-->
-<!--                 >重置</el-button-->
-<!--                 >-->
-<!--               </el-form-item>-->
              </el-form>
              <el-row :gutter="10">
                <el-col :span="1.5">

+ 14 - 20
src/views/system/menu/index.vue

@@ -1,10 +1,14 @@
 <template>
   <div class="app-container">
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+
+    <div class="main-right-box">
+           <!--    搜索条件    -->
+           <div class="main-search-box">
+            <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="PC端" name="1"></el-tab-pane>
       <el-tab-pane label="移动端" name="0"></el-tab-pane>
     </el-tabs>
-    <el-form
+            <el-form
       :model="queryParams"
       ref="queryForm"
       size="small"
@@ -33,18 +37,7 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
-      </el-form-item> -->
+
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -92,8 +85,9 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
+           </div>
 
-    <el-table
+           <el-table
       v-if="refreshTable"
       height="700px"
       v-loading="loading"
@@ -154,11 +148,6 @@
           />
         </template>
       </el-table-column>
-      <!--<el-table-column label="创建时间" align="center" prop="createTime">
-        &lt;!&ndash; <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template> &ndash;&gt;
-      </el-table-column>-->
       <el-table-column
         label="操作"
         align="center"
@@ -192,6 +181,11 @@
         </template>
       </el-table-column>
     </el-table>
+          </div>
+
+   
+
+    
 
     <!-- 添加或修改菜单对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="680px" append-to-body>

+ 16 - 58
src/views/system/role/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+    <div class="main-right-box">
+           <!--    搜索条件    -->
+           <div class="main-search-box">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="角色名称" prop="roleName">
         <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable style="width: 240px"
           @keyup.enter.native="handleQuery" />
@@ -12,14 +15,7 @@
             :value="dict.value" />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="创建时间">
-        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item> -->
-      <!-- <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item> -->
+
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -36,34 +32,18 @@
         <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['system:role:add']">新增</el-button>
       </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit-outline" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['system:role:edit']">修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['system:role:remove']">删除</el-button>
-      </el-col> -->
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="warning"-->
-      <!--          plain-->
-      <!--          icon="el-icon-download"-->
-      <!--          size="mini"-->
-      <!--          @click="handleExport"-->
-      <!--          v-hasPermi="['system:role:export']"-->
-      <!--        >导出</el-button>-->
-      <!--      </el-col>-->
+  
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
-    <el-table
+           </div>
+ 
+           <el-table
           border
           height="650"
           size="small"
     v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="50" align="center" /> -->
-      <el-table-column label="序号" align="center" width="50">
+      <el-table-column label="序号" align="center" width="100">
         <template v-slot:default="scope">
           <span v-text="getPageIndex(scope.$index)"> </span>
         </template>
@@ -75,16 +55,14 @@
             </template>
           </el-table-column>
           <el-table-column label="更新人" prop="createBy" :show-overflow-tooltip="true"  />
-<!--      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true"  />-->
+
       <el-table-column label="状态" align="center" >
         <template slot-scope="scope">
-<!--          <el-switch v-model="scope.row.status" active-text inactive-text active-value="0" inactive-value="1"
-            @change="handleStatusChange(scope.row)">
-          </el-switch>-->
+
             <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="150">
+      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope" v-if="scope.row.id !== 1">
@@ -92,16 +70,6 @@
             v-hasPermi="['system:role:edit']">编辑</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']">删除</el-button>
-          <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
-            v-hasPermi="['system:role:edit']">
-            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
-                v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
-              <el-dropdown-item command="handleAuthUser" icon="el-icon-user"
-                v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown> -->
         </template>
       </el-table-column>
     </el-table>
@@ -109,6 +77,9 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
 
+          </div>
+   
+
     <!-- 添加或修改角色配置对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="750px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -153,19 +124,6 @@
           </el-col>
         </el-row>
 
-
-
-<!--        <el-form-item prop="roleKey">
-          <span slot="label">
-            <el-tooltip content="控制器中定义的权限字符,如:@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-            权限字符
-          </span>
-          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
-        </el-form-item>-->
-
-
         <el-form-item label="菜单权限">
           <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
           <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>