完成了系统管理模块

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -334,17 +334,9 @@
               <tr align="center">
                 <td width="200" height="40">区分</td>
                 <td colspan="2" width="420">内容</td>
-                <td
-                  width="100"
-                >
-                  应到人数
-                </td>
-                <td width="100" >实到人数</td>
-                <td
-                  width="100"
-                >
-                  到课率
-                </td>
+                <td width="100">应到人数</td>
+                <td width="100">实到人数</td>
+                <td width="100">到课率</td>
               </tr>
               <tr align="center">
                 <td height="60">
@@ -353,7 +345,7 @@
                     placeholder="请输入时间"
                   ></el-input>
                 </td>
-                <td rowspan="2" colspan="2" >
+                <td rowspan="2" colspan="2">
                   <el-input
                     type="textarea"
                     :rows="1"
@@ -1895,7 +1887,7 @@ export default {
   content: "";
   width: 8px;
   height: 8px;
-  border-radius: 50%;
+  /* border-radius: 50%; */
   background-color: #1d96ff;
   margin-left: 26px;
 }
@@ -1904,7 +1896,7 @@ export default {
   content: "";
   width: 8px;
   height: 8px;
-  border-radius: 50%;
+  /* border-radius: 50%; */
   background-color: #67c23a;
   margin-left: 26px;
 }
@@ -1913,7 +1905,7 @@ export default {
   content: "";
   width: 8px;
   height: 8px;
-  border-radius: 50%;
+  /* border-radius: 50%; */
   background-color: #ff4949;
   margin-left: 26px;
 }
@@ -1945,9 +1937,9 @@ export default {
   border-bottom: 1px solid white !important;
 }
 ::v-deep .data .el-input__inner {
-    border: none !important;
+  border: none !important;
 }
 ::v-deep .box .el-input__inner {
-    border: none !important;
+  border: none !important;
 }
 </style>

src/views/peopleManage/people/index.vue

@@ -25,7 +25,7 @@
           v-show="showSearch"
           label-width="68px"
         >
-          <el-form-item label="姓名" prop="name">
+          <el-form-item prop="name">
             <el-input
               v-model="queryParams.name"
               placeholder="请输入姓名"
@@ -472,16 +472,10 @@
         </el-date-picker>
           </el-form-item>-->
           <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="btn"
-              @click="handleQuery"
+            <el-button type="primary" size="btn" @click="handleQuery"
               >搜索</el-button
             >
-            <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
-              >重置</el-button
-            >
+            <el-button size="btr" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
 
@@ -532,10 +526,10 @@
               v-hasPermi="['peopleManage:people:export']"
             >导出</el-button>
           </el-col>-->
-          <right-toolbar
+          <!-- <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"
-          ></right-toolbar>
+          ></right-toolbar> -->
         </el-row>
 
         <el-table
@@ -1161,16 +1155,10 @@
           ></el-date-picker>
         </el-form-item>
         <div class="jiben">
-          家庭信息
-          <span @click="tiaddfun">+</span>
+          家庭信息 <span @click="tiaddfun" class="zengJia">+</span>
         </div>
         <el-row
-          style="
-            background-color: rgba(255, 255, 255, 0.10980392156862745);
-            padding-top: 20px;
-            margin-top: 10px;
-            margin-bottom: 20px;
-          "
+          style="padding-top: 20px; margin-top: 10px; margin-bottom: 20px"
           v-for="(item, index) in jtlist"
           :key="index"
         >
@@ -2037,4 +2025,6 @@ export default {
 ::v-deep .el-tree-node__content {
   height: 32px;
 }
+.zengJia {
+}
 </style>

src/views/pt.vue

@@ -1007,7 +1007,7 @@ hr {
   background: rgba(0, 246, 255, 0.3);
 }
 .num1-box-l {
-  flex: 7;
+  flex: 1;
   height: 100%;
   text-align: left;
   margin-left: 10px;
@@ -1040,7 +1040,7 @@ hr {
   background: rgba(0, 246, 255, 0.3);
 }
 .num1-ul-li-l {
-  flex: 7;
+  flex: 1;
   height: 100%;
   text-align: center;
 }
@@ -1059,7 +1059,7 @@ hr {
   line-height: 45px;
 }
 .num1-ul-title-l {
-  flex: 7;
+  flex: 1;
   height: 100%;
   text-align: center;
 }

src/views/system/config/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="参数名称" prop="configName">
+      <el-form-item prop="configName">
         <el-input
           v-model="queryParams.configName"
           placeholder="请输入参数名称"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="参数键名" prop="configKey">
+      <el-form-item prop="configKey">
         <el-input
           v-model="queryParams.configKey"
           placeholder="请输入参数键名"
@@ -27,7 +27,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="系统内置" prop="configType">
+      <el-form-item prop="configType">
         <el-select
           v-model="queryParams.configType"
           placeholder="系统内置"
@@ -42,7 +42,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item>
         <el-date-picker
           v-model="dateRange"
           size="small"
@@ -60,12 +60,8 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="btn" @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btn" @click="handleQuery">搜索</el-button>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -128,10 +124,10 @@
           >刷新</el-button
         >
       </el-col>
-      <right-toolbar
+      <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar>
+      ></right-toolbar> -->
     </el-row>
 
     <el-table
@@ -157,10 +153,16 @@
       <el-table-column label="参数键值" align="center" prop="configValue" />
       <el-table-column label="系统内置" align="center" prop="configType">
         <template slot-scope="scope">
-          <dict-tag
+          <span v-if="scope.row.configType == 'Y'" style="color: #1d96ff"
+            >是</span
+          >
+          <span v-if="scope.row.configType == 'N'" style="color=#FF4949"
+            >否</span
+          >
+          <!-- <dict-tag
             :options="dict.type.sys_yes_no"
             :value="scope.row.configType"
-          />
+          /> -->
         </template>
       </el-table-column>
       <el-table-column
@@ -570,4 +572,7 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+::v-deep .el-date-editor .el-range-input {
+  color: #fff;
+}
 </style>

src/views/system/cookcategory/index.vue

@@ -102,10 +102,10 @@
           >导出</el-button
         >
       </el-col>
-      <right-toolbar
+      <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar>
+      ></right-toolbar> -->
     </el-row>
 
     <el-table

src/views/system/dept/index.vue

@@ -6,7 +6,7 @@
       :inline="true"
       v-show="showSearch"
     >
-      <el-form-item label="单位名称" prop="deptName" style="color=''">
+      <el-form-item prop="deptName" style="color=''">
         <el-input
           v-model="queryParams.deptName"
           placeholder="请输入单位名称"
@@ -15,7 +15,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item prop="status">
         <el-select
           v-model="queryParams.status"
           placeholder="单位状态"
@@ -32,12 +32,8 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="btn" @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btn" @click="handleQuery">搜索</el-button>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -63,10 +59,10 @@
           >展开/折叠</el-button
         >
       </el-col>
-      <right-toolbar
+      <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar>
+      ></right-toolbar> -->
     </el-row>
 
     <el-table
@@ -92,10 +88,14 @@
       ></el-table-column>
       <el-table-column prop="status" label="状态" width="250">
         <template slot-scope="scope">
-          <dict-tag
+          <span v-if="scope.row.status == '0'" style="color: #1d96ff"
+            >正常</span
+          >
+          <span v-if="scope.row.status == '1'" style="color=#FF4949">停用</span>
+          <!-- <dict-tag
             :options="dict.type.sys_normal_disable"
             :value="scope.row.status"
-          />
+          /> -->
         </template>
       </el-table-column>
       <el-table-column
@@ -455,9 +455,9 @@ export default {
 <style  scoped>
 /* 表格状态 */
 ::v-deep .el-tag {
-  background-color: #1d96ff;
+  /* background-color: #1d96ff; */
   border: 0px;
-  color: #fff;
+  color: #1d96ff;
   text-align: center;
   line-height: 28px;
 }

src/views/system/dict/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="字典名称" prop="dictName">
+      <el-form-item prop="dictName">
         <el-input
           v-model="queryParams.dictName"
           placeholder="请输入字典名称"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="字典类型" prop="dictType">
+      <el-form-item prop="dictType">
         <el-input
           v-model="queryParams.dictType"
           placeholder="请输入字典类型"
@@ -27,7 +27,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item prop="status">
         <el-select
           v-model="queryParams.status"
           placeholder="字典状态"
@@ -62,12 +62,8 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="btn" @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btn" @click="handleQuery">搜索</el-button>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -130,10 +126,10 @@
           >刷新</el-button
         >
       </el-col>
-      <right-toolbar
+      <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar>
+      ></right-toolbar> -->
     </el-row>
 
     <el-table
@@ -166,10 +162,14 @@
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag
+          <span v-if="scope.row.status == '0'" style="color: #1d96ff"
+            >正常</span
+          >
+          <span v-if="scope.row.status == '1'" style="color=#FF4949">停用</span>
+          <!-- <dict-tag
             :options="dict.type.sys_normal_disable"
-            :value="scope.row.status"
-          />
+            :value="scope.row.status" 
+          /> -->
         </template>
       </el-table-column>
       <el-table-column

src/views/system/menu/index.vue

@@ -6,7 +6,7 @@
       :inline="true"
       v-show="showSearch"
     >
-      <el-form-item label="菜单名称" prop="menuName">
+      <el-form-item prop="menuName">
         <el-input
           v-model="queryParams.menuName"
           placeholder="请输入菜单名称"
@@ -15,7 +15,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item prop="status">
         <el-select
           v-model="queryParams.status"
           placeholder="菜单状态"
@@ -32,12 +32,8 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="btn" @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btn" @click="handleQuery">搜索</el-button>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -63,10 +59,10 @@
           >展开/折叠</el-button
         >
       </el-col>
-      <right-toolbar
+      <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar>
+      ></right-toolbar> -->
     </el-row>
 
     <el-table
@@ -106,10 +102,14 @@
       ></el-table-column>
       <el-table-column prop="status" label="状态" width="80">
         <template slot-scope="scope">
-          <dict-tag
+          <span v-if="scope.row.status == '0'" style="color: #1d96ff"
+            >正常</span
+          >
+          <span v-if="scope.row.status == '1'" style="color=#FF4949">停用</span>
+          <!-- <dict-tag
             :options="dict.type.sys_normal_disable"
             :value="scope.row.status"
-          />
+          /> -->
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime">

src/views/system/notice/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="公告标题" prop="noticeTitle">
+      <el-form-item prop="noticeTitle">
         <el-input
           v-model="queryParams.noticeTitle"
           placeholder="请输入公告标题"
@@ -16,7 +16,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="操作人员" prop="createBy">
+      <el-form-item prop="createBy">
         <el-input
           v-model="queryParams.createBy"
           placeholder="请输入操作人员"
@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="类型" prop="noticeType">
+      <el-form-item prop="noticeType">
         <el-select
           v-model="queryParams.noticeType"
           placeholder="公告类型"
@@ -41,12 +41,8 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="btn" @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btn" @click="handleQuery">搜索</el-button>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -86,10 +82,10 @@
           >删除</el-button
         >
       </el-col>
-      <right-toolbar
+      <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar>
+      ></right-toolbar> -->
     </el-row>
 
     <el-table
@@ -126,10 +122,14 @@
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status" width="100">
         <template slot-scope="scope">
-          <dict-tag
+          <span v-if="scope.row.status == '0'" style="color: #1d96ff"
+            >正常</span
+          >
+          <span v-if="scope.row.status == '1'" style="color=#FF4949">停用</span>
+          <!-- <dict-tag
             :options="dict.type.sys_notice_status"
             :value="scope.row.status"
-          />
+          /> -->
         </template>
       </el-table-column>
       <el-table-column

src/views/system/post/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="岗位编码" prop="postCode">
+      <el-form-item prop="postCode">
         <el-input
           v-model="queryParams.postCode"
           placeholder="请输入岗位编码"
@@ -16,7 +16,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="岗位名称" prop="postName">
+      <el-form-item prop="postName">
         <el-input
           v-model="queryParams.postName"
           placeholder="请输入岗位名称"
@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item prop="status">
         <el-select
           v-model="queryParams.status"
           placeholder="岗位状态"
@@ -42,12 +42,8 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="btn" @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btn" @click="handleQuery">搜索</el-button>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -99,10 +95,10 @@
           >导出</el-button
         >
       </el-col>
-      <right-toolbar
+      <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar>
+      ></right-toolbar> -->
     </el-row>
 
     <el-table

src/views/system/role/index.vue

@@ -6,27 +6,25 @@
       v-show="showSearch"
       :inline="true"
     >
-      <el-form-item label="角色名称" prop="roleName">
+      <el-form-item prop="roleName">
         <el-input
           v-model="queryParams.roleName"
           placeholder="请输入角色名称"
-          clearable
           size="small"
           style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="权限字符" prop="roleKey">
+      <el-form-item prop="roleKey">
         <el-input
           v-model="queryParams.roleKey"
           placeholder="请输入权限字符"
-          clearable
           size="small"
           style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item prop="status">
         <el-select
           v-model="queryParams.status"
           placeholder="角色状态"
@@ -43,7 +41,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item>
         <el-date-picker
           v-model="dateRange"
           size="small"
@@ -61,12 +59,8 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" size="btn" @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btn" @click="handleQuery">搜索</el-button>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -118,10 +112,10 @@
           >导出</el-button
         >
       </el-col>
-      <right-toolbar
+      <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar>
+      ></right-toolbar> -->
     </el-row>
 
     <el-table
@@ -953,4 +947,7 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+::v-deep .el-date-editor .el-range-input {
+  color: #fff;
+}
 </style>

src/views/system/user/index.vue

@@ -9,7 +9,6 @@
             placeholder="请输入部门名称"
             clearable
             size="small"
-            prefix-icon="el-icon-search"
             style="margin-bottom: 20px"
           />
         </div>
@@ -35,7 +34,7 @@
           v-show="showSearch"
           label-width="68px"
         >
-          <el-form-item label="用户名称" prop="userName">
+          <el-form-item prop="userName">
             <el-input
               v-model="queryParams.userName"
               placeholder="请输入用户名称"
@@ -45,7 +44,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
+          <el-form-item prop="phonenumber">
             <el-input
               v-model="queryParams.phonenumber"
               placeholder="请输入手机号码"
@@ -55,7 +54,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="状态" prop="status">
+          <el-form-item prop="status">
             <el-select
               v-model="queryParams.status"
               placeholder="用户状态"
@@ -72,7 +71,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间">
+          <el-form-item>
             <el-date-picker
               v-model="dateRange"
               size="small"
@@ -90,16 +89,10 @@
             ></el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="btn"
-              @click="handleQuery"
+            <el-button type="primary" size="btn" @click="handleQuery"
               >搜索</el-button
             >
-            <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
-              >重置</el-button
-            >
+            <el-button size="btr" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
 
@@ -162,11 +155,11 @@
               >导出</el-button
             >
           </el-col>
-          <right-toolbar
+          <!-- <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"
             :columns="columns"
-          ></right-toolbar>
+          ></right-toolbar> -->
         </el-row>
 
         <el-table
@@ -1206,4 +1199,7 @@ export default {
 ::v-deep .el-tree-node__label {
   color: #fff !important;
 }
+::v-deep .el-date-editor .el-range-input {
+  color: #fff;
+}
 </style>