Przeglądaj źródła

全局修改某些样式

凉纪 2 lat temu
rodzic
commit
6a9c3679dd
44 zmienionych plików z 192 dodań i 197 usunięć
  1. 7 5
      .env.development
  2. 3 3
      src/assets/styles/element-variables.scss
  3. 26 10
      src/assets/styles/index.scss
  4. 1 1
      src/assets/styles/ruoyi.scss
  5. 4 4
      src/assets/styles/variables.scss
  6. 11 12
      src/views/check/index.vue
  7. 3 3
      src/views/core/accessPlan/index.vue
  8. 5 6
      src/views/core/drill/drillDictionary/index.vue
  9. 3 3
      src/views/core/drill/plan/index.vue
  10. 3 3
      src/views/core/edu/plan/index.vue
  11. 2 3
      src/views/core/knowledge/index.vue
  12. 2 3
      src/views/core/materials/index.vue
  13. 0 1
      src/views/core/message/index.vue
  14. 3 3
      src/views/core/send/index.vue
  15. 2 3
      src/views/monitor/job/index.vue
  16. 1 2
      src/views/resumption/evaluate/index.vue
  17. 2 3
      src/views/resumption/plan/index.vue
  18. 6 7
      src/views/resumption/protection/index.vue
  19. 1 2
      src/views/resumption/rule/index.vue
  20. 4 4
      src/views/resumption/ruleManager/index.vue
  21. 2 3
      src/views/safetyBook/index.vue
  22. 2 3
      src/views/safetycheck/checkRegister/index.vue
  23. 3 4
      src/views/safetycheck/rule/index.vue
  24. 1 1
      src/views/safetycheck/ruleManager/index.vue
  25. 2 3
      src/views/system/area/index.vue
  26. 2 2
      src/views/system/bind/index.vue
  27. 4 4
      src/views/system/check/index.vue
  28. 4 5
      src/views/system/config/index.vue
  29. 2 2
      src/views/system/dept/dialog.edit.vue
  30. 20 20
      src/views/system/dept/extend.vue
  31. 1 3
      src/views/system/dept/index.vue
  32. 12 12
      src/views/system/device/index.vue
  33. 8 9
      src/views/system/dict/data.vue
  34. 9 10
      src/views/system/dict/index.vue
  35. 3 4
      src/views/system/information/index.vue
  36. 1 2
      src/views/system/menu/index.vue
  37. 3 4
      src/views/system/notice/index.vue
  38. 3 4
      src/views/system/post/index.vue
  39. 2 2
      src/views/system/role/authUser.vue
  40. 9 9
      src/views/system/role/index.vue
  41. 2 2
      src/views/system/user/extend.vue
  42. 5 4
      src/views/system/user/index.vue
  43. 0 1
      src/views/system/workTimeSet/workTime.vue
  44. 3 3
      src/views/tool/gen/index.vue

+ 7 - 5
.env.development

@@ -8,15 +8,17 @@ ENV = 'development'
 #测试地址
 #VUE_APP_BASE_API = 'http://10.87.10.91:8080'
 #罗俊
-# VUE_APP_BASE_API = 'http://10.87.10.49:8080'
+#VUE_APP_BASE_API = 'http://10.87.10.49:8080'
 #罗伟
-VUE_APP_BASE_API = 'http://10.87.10.47:8080'
+#VUE_APP_BASE_API = 'http://10.87.10.47:8080'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
-VUE_APP_BASE_API = 'http://localhost:8080'
-# 55环境
+#dev
 VUE_APP_BASE_API = 'http://10.87.10.55:8080'
-
+#贾武先
+#VUE_APP_BASE_API = 'http://10.87.10.42:8080'
+#景远超
+#VUE_APP_BASE_API = 'http://10.87.11.173:8080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

+ 3 - 3
src/assets/styles/element-variables.scss

@@ -5,10 +5,10 @@
 
 /* theme color */
 // $--color-primary: #008CD6;
-$--color-primary: #008CD6;
-$--color-success: #13ce66;
+$--color-primary: #008cd6;
+$--color-success: #009240FF;
 $--color-warning: #ffba00;
-$--color-danger: #ff4949;
+$--color-danger: #D7000FFF;
 // $--color-info: #1E1E1E;
 
 $--button-font-weight: 400;

+ 26 - 10
src/assets/styles/index.scss

@@ -178,7 +178,7 @@ aside {
   cursor: pointer;
 
   &:hover {
-    color: rgb(32, 160, 255);
+    color: #008cd6;
   }
 }
 
@@ -192,6 +192,13 @@ aside {
   }
 }
 
+//.el-button--primary.is-plain{
+//  background: transparent !important;
+//  border-color: transparent !important;
+//  color: #008cd6 !important;
+//}
+
+
 .el-button--danger {
   background: rgba(215,0,15, 0.7) !important;
   border-color: rgba(215,0,15, 0.7) !important;
@@ -205,15 +212,24 @@ aside {
   color:#fff !important;
 }
 
-.el-button--primary {
-  background: rgba(0, 140, 214, 0.1) !important;
-  border-color: rgba(0, 140, 214,1) !important;
-  color:rgba(0, 140, 214, 1) !important;
+//.el-button--primary {
+//  background: rgba(0, 140, 214, 0.1) !important;
+//  border-color: rgba(0, 140, 214,1) !important;
+//  color:rgba(0, 140, 214, 1) !important;
+//}
+
+//.el-button--primary:focus,
+//.el-button--primary:hover {
+//  background: rgba(0, 140, 214, 1) !important;
+//  border-color: rgba(0, 140, 214,1) !important;
+//  color:#fff !important;
+//}
+
+.el-switch.is-checked .el-switch__core{
+  border-color: #009240FF;
+  background-color: #009240FF;
 }
 
-.el-button--primary:focus,
-.el-button--primary:hover {
-  background: rgba(0, 140, 214, 1) !important;
-  border-color: rgba(0, 140, 214,1) !important;
-  color:#fff !important;
+.el-button [class*=el-icon-] + span{
+  margin-left: 2px;
 }

+ 1 - 1
src/assets/styles/ruoyi.scss

@@ -222,7 +222,7 @@
 }
 
 .text-success {
-	color: #1c84c6;
+	color: #008CD6FF;;
 }
 
 .text-info {

+ 4 - 4
src/assets/styles/variables.scss

@@ -1,9 +1,9 @@
 // base color
-$blue:#324157;
-$light-blue:#3A71A8;
-$red:#C03639;
+$blue:#008CD6FF;
+$light-blue:#008CD6FF;
+$red: #D7000FFF;
 $pink: #E65D6E;
-$green: #30B08F;
+$green: #009240FF;
 $tiffany: #4AB7BD;
 $yellow:#FEC171;
 $panGreen: #30B08F;

+ 11 - 12
src/views/check/index.vue

@@ -53,7 +53,7 @@
                 :value="dict.value"
               />
             </el-select>
-            
+
           </el-form-item>
 
           <el-form-item prop="checkRole" label="检查角色">
@@ -136,7 +136,6 @@
           <el-col :span="1.5">
             <el-button
               type="primary"
-              plain
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd()"
@@ -152,7 +151,7 @@
         </el-row>
 
         <el-table
-        
+
           v-loading="loading"
           :data="pageData"
           @selection-change="handleSelectionChange"
@@ -163,7 +162,7 @@
           type = 'index'
             label="序号"
             width="80px"
-            v-if="columns[0].visible"            
+            v-if="columns[0].visible"
           ></el-table-column>
           <el-table-column
             prop="planName"
@@ -175,15 +174,15 @@
             label="计划所属机构"
             v-if="columns[4].visible"
           >
-        
+
         </el-table-column>
-        
+
           <el-table-column
             prop="planCreateOrgName"
             label="计划创建机构"
             v-if="columns[3].visible"
           >
-          
+
           </el-table-column>
           <el-table-column
             prop="checkType"
@@ -278,7 +277,7 @@
           <template slot-scope="scope">
               <span>{{ formatTime(scope.row.updateTime,"YYYY-MM-DD") }}</span>
             </template>
-           
+
           </el-table-column>
 
           <el-table-column label="操作">
@@ -286,7 +285,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="onEdit(r.row.id)"
                 v-hasPermi="['core:checkplan:edit']"
                 >修改</el-button
@@ -410,12 +409,12 @@ export default {
     checkCanPublish(row) {
       // console.log(row.planOfOrgType == "1","row.planOfOrgType")
       // console.log(row.planOfOrgType == "1"&& row.distribute==null,"row.distribute")
-  
+
       //如果计划所属机构为省联社并且计划下发为null并且计划检查机构类型不为省联社和办事处(只有一个无法下发)
       if (row.planOfOrgType == "1"&& row.distribute==null&&row.execOrgType!="1"&&row.execOrgType!="2") {
         return true
       }
-    
+
       return false;
     },
     splitRoleNames(val) {
@@ -425,7 +424,7 @@ export default {
         return [];
       }
       // 使用逗号分割字符串,得到角色名称的数组
-      
+
     },
     sel(selectList){
       this.loading = true;

+ 3 - 3
src/views/core/accessPlan/index.vue

@@ -42,7 +42,7 @@
             </el-select>
           </el-form-item>
 
-        
+
 
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
@@ -54,7 +54,7 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
                  v-hasPermi="['core:accessPlan:add']"  v-if="check==true" >新增
             </el-button>
           </el-col>
@@ -96,7 +96,7 @@
           <el-table-column label="备注" align="center" prop="description"/>
           <el-table-column label="操作" fixed="right" width="120" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-if="scope.row.parentId==null && check==true"
+              <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-if="scope.row.parentId==null && check==true"
                          v-hasPermi="['core:accessPlan:edit','core:accessPlan:query']">编辑
               </el-button>
               <el-button size="mini" type="text" v-if="scope.row.isDistribute == 0 && scope.row.planStatus==0" icon="el-icon-arrow-down"

+ 5 - 6
src/views/core/drill/drillDictionary/index.vue

@@ -32,7 +32,6 @@
           <el-col :span="1.5">
             <el-button
               type="primary"
-              plain
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
@@ -56,8 +55,8 @@
 
         <el-table v-loading="loading" :data="drillDictionaryList" @selection-change="handleSelectionChange">
           <el-table-column label="编号" align="center" prop="id"/>
-          <el-table-column label="机构名称" align="center" prop="orgName" />           
-          
+          <el-table-column label="机构名称" align="center" prop="orgName" />
+
           <el-table-column label="演练类型" align="center" prop="drillType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.drillType"/>
@@ -78,7 +77,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 v-if="canEdit(scope.row)"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['core:drillDictionary:edit']"
@@ -123,7 +122,7 @@
           <el-input v-model="form.drillProjects" maxlength="50"  placeholder="请输入解决方案"/>
         </el-form-item>
         <el-form-item label="预设案由" prop="defaultCause">
-          <el-input v-model="form.defaultCause" maxlength="2000" :rows="6" 
+          <el-input v-model="form.defaultCause" maxlength="2000" :rows="6"
   show-word-limit type="textarea" placeholder="请输入预设案由"/>
         </el-form-item>
       </el-form>
@@ -304,7 +303,7 @@ export default {
     {
       return row.orgId == this.$store.getters.orgId;
     },
-    
+
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;

+ 3 - 3
src/views/core/drill/plan/index.vue

@@ -48,7 +48,7 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
                        v-hasPermi="['core:drillPlan:add']">新增
             </el-button>
           </el-col>
@@ -95,10 +95,10 @@
           <el-table-column label="修改人" align="center" width="100" prop="updateBy"/>
           <el-table-column label="操作" align="center" width="180" fixed="right" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button v-if="checkCanPublish(scope.row)" size="mini" type="text" icon="el-icon-edit"
+              <el-button v-if="checkCanPublish(scope.row)" size="mini" type="text" icon="el-icon-edit-outline"
                          @click="handlePublish(scope.row)" v-hasPermi="['core:drillPlan:publish']">下发
               </el-button>
-              <el-button v-if="checkCanEdit(scope.row)" size="mini" type="text" icon="el-icon-edit"
+              <el-button v-if="checkCanEdit(scope.row)" size="mini" type="text" icon="el-icon-edit-outline"
                          @click="handleUpdate(scope.row)" v-hasPermi="['core:drillPlan:edit']">修改
               </el-button>
               <el-button v-if="checkCanDel(scope.row)" size="mini" type="text" icon="el-icon-delete"

+ 3 - 3
src/views/core/edu/plan/index.vue

@@ -48,12 +48,12 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
                        v-hasPermi="['core:plan:add']">新增
             </el-button>
           </el-col>
           <!--   <el-col :span="1.5">
-               <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+               <el-button type="success" plain icon="el-icon-edit-outline" size="mini" :disabled="single" @click="handleUpdate"
                           v-hasPermi="['core:plan:edit']">修改
                </el-button>
              </el-col>
@@ -122,7 +122,7 @@
               <el-button v-if="checkCanPublish(scope.row)" size="mini" type="text" icon="el-icon-down"
                          @click="handlePublish(scope.row)" v-hasPermi="['core:plan:edit']">下发
               </el-button>
-              <el-button v-if="checkCanEdit(scope.row)" size="mini" type="text" icon="el-icon-edit"
+              <el-button v-if="checkCanEdit(scope.row)" size="mini" type="text" icon="el-icon-edit-outline"
                          @click="handleUpdate(scope.row)" v-hasPermi="['core:plan:edit']">编辑
               </el-button>
               <el-button v-if="checkCanDel(scope.row)" size="mini" type="text" icon="el-icon-delete"

+ 2 - 3
src/views/core/knowledge/index.vue

@@ -20,7 +20,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
@@ -31,7 +30,7 @@
         <el-button
           type="success"
           plain
-          icon="el-icon-edit"
+          icon="el-icon-edit-outline"
           size="mini"
           :disabled="single"
           @click="handleUpdate"
@@ -69,7 +68,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-edit-outline"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['core:knowledge:edit']"
           >编辑</el-button>

+ 2 - 3
src/views/core/materials/index.vue

@@ -46,7 +46,6 @@
           <el-col :span="1.5">
             <el-button
               type="primary"
-              plain
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
@@ -58,7 +57,7 @@
             <el-button
               type="success"
               plain
-              icon="el-icon-edit"
+              icon="el-icon-edit-outline"
               size="mini"
               :disabled="single"
               @click="handleUpdate"
@@ -136,7 +135,7 @@
                 v-if="checkCanEditOrDel(scope.row)"
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['core:materials:edit']"
               >编辑

+ 0 - 1
src/views/core/message/index.vue

@@ -43,7 +43,6 @@
         <el-col :span="1.5">
           <el-button
             type="primary"
-            plain
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"

+ 3 - 3
src/views/core/send/index.vue

@@ -24,7 +24,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['core:send:add']">新增</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -51,7 +51,7 @@
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" v-if="scope.row.sendStatus == 2" icon="el-icon-edit"
+          <el-button size="mini" type="text" v-if="scope.row.sendStatus == 2" icon="el-icon-edit-outline"
             @click="handleUpdate(scope.row)" v-hasPermi="['core:send:edit']">修改</el-button>
 
           <el-button size="mini" type="text" v-if="scope.row.sendStatus == 2" icon="el-icon-delete"
@@ -86,7 +86,7 @@
           <el-select mode="multiple" style="width: 100%;" v-model="form.sendUser" placeholder="按用户选择">
             <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
-          
+
           <el-select mode="multiple" style="width: 100%;" v-model="form.sendRole" placeholder="按角色选择">
             <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
           </el-select>

+ 2 - 3
src/views/monitor/job/index.vue

@@ -39,7 +39,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
@@ -50,7 +49,7 @@
         <el-button
           type="success"
           plain
-          icon="el-icon-edit"
+          icon="el-icon-edit-outline"
           size="mini"
           :disabled="single"
           @click="handleUpdate"
@@ -117,7 +116,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-edit-outline"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['monitor:job:edit']"
           >修改</el-button>

+ 1 - 2
src/views/resumption/evaluate/index.vue

@@ -68,7 +68,7 @@
                   label="评价角色"
                   v-model="queryParams.roleId"
                   placeholder="请选择评价角色"
-                  
+
                   filterable
                   @change="handleRolesChange"
                 >
@@ -102,7 +102,6 @@
             <el-col :span="1.5">
               <el-button
                 type="primary"
-                plain
                 icon="el-icon-plus"
                 size="mini"
                 @click="handleAdd"

+ 2 - 3
src/views/resumption/plan/index.vue

@@ -119,7 +119,6 @@
           <el-col :span="1.5">
             <el-button
               type="primary"
-              plain
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd()"
@@ -131,7 +130,7 @@
             <el-button
               type="success"
               plain
-              icon="el-icon-edit"
+              icon="el-icon-edit-outline"
               size="mini"
               :disabled="single"
               @click="handleUpdate"
@@ -286,7 +285,7 @@
                 v-if="eqOrg(r.row)"
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="onEdit(r.row.id)"
                 v-hasPermi="['system:user:edit']"
                 >编辑</el-button

+ 6 - 7
src/views/resumption/protection/index.vue

@@ -76,7 +76,6 @@
           <el-col :span="1.5">
             <el-button
               type="primary"
-              plain
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd()"
@@ -88,7 +87,7 @@
             <el-button
               type="success"
               plain
-              icon="el-icon-edit"
+              icon="el-icon-edit-outline"
               size="mini"
               :disabled="single"
               @click="handleUpdate"
@@ -137,7 +136,7 @@
             label="报警控制器名称"
             v-if="columns[2].visible"
           >
-          </el-table-column>         
+          </el-table-column>
           <el-table-column
             prop="status"
             label="布撤防状态"
@@ -158,7 +157,7 @@
               <!-- <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="updateStatus(r.row.id, 1)"
                 v-hasPermi="['device:protectionstatus:maintain']"
                 >布防</el-button
@@ -166,7 +165,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="updateStatus(r.row.id, 0)"
                 v-hasPermi="['device:protectionstatus:maintain']"
                 >撤防</el-button
@@ -174,7 +173,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="onEdit(r.row.id)"
                 v-hasPermi="['device:protection:edit']"
                 >编辑</el-button
@@ -182,7 +181,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-document-copy"
                 @click="onHistory(r.row)"
                 v-hasPermi="['device:protection']"
                 >布撤防历史</el-button

+ 1 - 2
src/views/resumption/rule/index.vue

@@ -67,7 +67,6 @@
           <el-col :span="1.5">
             <el-button
               type="primary"
-              plain
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd()"
@@ -126,7 +125,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="onEdit(r.row.id)"
                 v-hasPermi="['resumption:rule:edit']"
                 v-if="orgId==r.row.orgId"

+ 4 - 4
src/views/resumption/ruleManager/index.vue

@@ -14,7 +14,7 @@
           :defaultProps="defaultProps"
           :showLowerCheck="false"
           :renderContent="renderContent"
-         
+
         >
         </org-tree>
       </el-col>
@@ -87,7 +87,7 @@
             <el-button
               type="success"
               plain
-              icon="el-icon-edit"
+              icon="el-icon-edit-outline"
               size="mini"
               :disabled="single"
               @click="handleUpdate"
@@ -174,7 +174,7 @@
               <el-button
                 type="text"
                 size="small"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="onEditItem(scope.row.id)"
                 v-hasPermi="['resumption:ruleManager:edit']"
                 >编辑</el-button
@@ -350,7 +350,7 @@ export default {
       this.$nextTick(() => {
         this.fresh = true;
       });
-      
+
       this.queryParams.ruleId = data.id;
       this.rule = data;
       this.rule.orgId = node.parent.data.id;

+ 2 - 3
src/views/safetyBook/index.vue

@@ -37,7 +37,6 @@
           <el-col :span="1.5">
             <el-button
               type="primary"
-              plain
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd(null)"
@@ -77,7 +76,7 @@
             width="160"
             prop="type"
           >
-        
+
           <template slot-scope="r"
               >{{
                 getLabel(dict.type.safety_book_type, `${r.row.type}`)
@@ -105,7 +104,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleAdd(scope.row.id)"
                 v-hasPermi="['core:materials:edit']"
                 >编辑

+ 2 - 3
src/views/safetycheck/checkRegister/index.vue

@@ -61,7 +61,7 @@
             </el-select>
           </el-form-item>
           <el-row>
-            <el-form-item label="受检机构" prop="orgName">             
+            <el-form-item label="受检机构" prop="orgName">
               <org-tree-select
                 v-model="queryParams.checkOrgIds"
                 ref="checkorgTreeSelect"
@@ -89,7 +89,6 @@
           <el-col :span="1.5">
             <el-button
               type="primary"
-              plain
               icon="el-icon-download"
               size="mini"
               @click="onRegister()"
@@ -226,7 +225,7 @@
                 @click="showDetail(r.row)"
                 v-hasPermi="['resumption:taskManager:query']"
                 >详情</el-button
-              >             
+              >
             </template>
           </el-table-column>
         </el-table>

+ 3 - 4
src/views/safetycheck/rule/index.vue

@@ -67,7 +67,6 @@
           <el-col :span="1.5">
             <el-button
               type="primary"
-              plain
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd()"
@@ -96,7 +95,7 @@
             prop="name"
             label="检查库名称"
             v-if="columns[1].visible"
-          ></el-table-column>  
+          ></el-table-column>
           <el-table-column
             prop="orgType"
             label="受检机构类型"
@@ -126,7 +125,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="onEdit(r.row.id)"
                 v-hasPermi="['safetycheck:rule:edit']"
                 >修改</el-button
@@ -194,7 +193,7 @@ export default {
         checkSub:true,
         pageNum: 1,
         pageSize: 10,
-        
+
         ...query,
       },
       pageData: [],

+ 1 - 1
src/views/safetycheck/ruleManager/index.vue

@@ -146,7 +146,7 @@
               <el-button
                 type="text"
                 size="small"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="onEditItem(scope.row.id)"
                 v-hasPermi="['safetycheck:ruleManager:edit']"
                 >编辑</el-button

+ 2 - 3
src/views/system/area/index.vue

@@ -40,7 +40,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
@@ -51,7 +50,7 @@
         <el-button
           type="success"
           plain
-          icon="el-icon-edit"
+          icon="el-icon-edit-outline"
           size="mini"
           :disabled="single"
           @click="handleUpdate"
@@ -102,7 +101,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-edit-outline"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:area:edit']"
           >编辑</el-button>

+ 2 - 2
src/views/system/bind/index.vue

@@ -52,7 +52,7 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
               v-hasPermi="['system:bind:add']">新增</el-button>
           </el-col>
 
@@ -84,7 +84,7 @@
           <el-table-column label="更新时间" align="center" prop="updateTime" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+              <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:bind:edit']">编辑</el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                 v-hasPermi="['system:bind:remove']">删除</el-button>

+ 4 - 4
src/views/system/check/index.vue

@@ -47,12 +47,12 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
                        v-hasPermi="['system:check:add']">新增
             </el-button>
           </el-col>
           <!--    <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+                <el-button type="success" plain icon="el-icon-edit-outline" size="mini" :disabled="single" @click="handleUpdate"
                   v-hasPermi="['system:check:edit']">修改</el-button>
               </el-col>
               <el-col :span="1.5">
@@ -82,7 +82,7 @@
           <el-table-column label="修改人" align="center" prop="updateBy"/>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+              <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)"
                          v-hasPermi="['system:check:edit']">编辑
               </el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -107,7 +107,7 @@
           <el-form-item label="所属机构" prop="orgId">
             <treeselect style="width: 100%;" v-model="form.orgId"
                         :options="deptOptions" :show-count="true"
-                        :normalizer="tenantIdnormalizer" 
+                        :normalizer="tenantIdnormalizer"
                         :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择机构" @select="changeSelectArea"/>
           </el-form-item>
           <!-- <el-form-item label="区域名称" v-if="form.orgId!=null" prop="areaId">

+ 4 - 5
src/views/system/config/index.vue

@@ -50,7 +50,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
@@ -61,7 +60,7 @@
         <el-button
           type="success"
           plain
-          icon="el-icon-edit"
+          icon="el-icon-edit-outline"
           size="mini"
           :disabled="single"
           @click="handleUpdate"
@@ -114,14 +113,14 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-  
+
        <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-edit-outline"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:config:edit']"
           >修改</el-button>
@@ -337,4 +336,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 2 - 2
src/views/system/dept/dialog.edit.vue

@@ -179,7 +179,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleOrgUpdate(scope.row)"
                 v-hasPermi="['system:construction:edit']"
                 >查看证书</el-button
@@ -187,7 +187,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleOrgUpdate(scope.row)"
                 v-hasPermi="['system:construction:edit']"
                 >修改</el-button

+ 20 - 20
src/views/system/dept/extend.vue

@@ -121,7 +121,7 @@
           </el-col>
 
 
-          
+
           <el-col :span="8">
             <el-form-item v-if="type == 10" label="平台供应商品牌">
               <el-select
@@ -258,14 +258,14 @@
                 v-if="scope.row.certificate"
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="downBusiness(scope.row.certificate)"
                 >查看证书</el-button
               >
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleOrgUpdate(scope.row)"
                 >编辑</el-button
               >
@@ -443,14 +443,14 @@
                 v-if="scope.row.certificate"
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="downBusiness(scope.row.certificate)"
                 >查看证书</el-button
               >
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleBusinessUpdate(scope.row)"
                 >编辑</el-button
               >
@@ -584,14 +584,14 @@
                 v-if="scope.row.certificate"
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="downBusiness(scope.row.certificate)"
                 >查看证书</el-button
               >
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleBankUpdate(scope.row)"
                 >编辑</el-button
               >
@@ -707,14 +707,14 @@
                 v-if="scope.row.certificate"
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="downBusiness(scope.row.certificate)"
                 >查看证书</el-button
               >
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handledetachedUpdate(scope.row)"
                 >编辑</el-button
               >
@@ -1558,7 +1558,7 @@ export default {
       if(this.Businessimgs.length>0){
         this.Businessform.certificate= this.Businessimgs[this.Businessimgs.length - 1].toString(",");
       }
-     
+
       this.$refs.Businessform.validate((valid) => {
         if (valid) {
           // 表单验证通过,提交数据或执行其他操作
@@ -1643,7 +1643,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleBankAdd() {
-      
+
       this.Bankreset();
       this.Bankopen = true;
       this.Banktitle = "新增安全防范设施建设达标情况";
@@ -1665,7 +1665,7 @@ export default {
         this.Bankform.certificate= this.Bankimgs[this.Bankimgs.length - 1].toString(",");
       }
 
-      
+
       this.$refs.Bankform.validate((valid) => {
         if (valid) {
           // 表单验证通过,提交数据或执行其他操作
@@ -1694,7 +1694,7 @@ export default {
           // 表单验证未通过,显示错误信息
         }
       });
-      
+
       // this.$refs["Bankform"].validate((valid) => {
       //   if (valid) {
 
@@ -1759,7 +1759,7 @@ export default {
         this.detachedform = response.data;
         // this.detachedform.certificateEvidence=parseInt(response.data.certificateEvidence);
         this.detachedopen = true;
-        
+
         this.detachedtitle = "编辑安全防范设施建设达标情况";
       });
     },
@@ -1769,13 +1769,13 @@ export default {
         this.detachedform.certificate= this.detachedimgs[this.detachedimgs.length - 1].toString(",");
       }
 
-     
+
       this.$refs.detachedform.validate((valid) => {
         if (valid) {
           // 表单验证通过,提交数据或执行其他操作
           this.detachedform.orgId = this.$route.params.id;
           this.detachedform.type = 4;
- 
+
           if (this.detachedform.id != null) {
             updateOrgPhysicalDefenseConstruction(this.detachedform).then(
               (response) => {
@@ -1784,7 +1784,7 @@ export default {
                 this.getdetachedPhysicalDefenseConstructionInfo();
               }
             );
-            
+
           } else {
             addOrgPhysicalDefenseConstruction(this.detachedform).then(
               (response) => {
@@ -1861,7 +1861,7 @@ export default {
       this.orgreset();
       const id = row.id || this.orgids;
       getOrgPhysicalDefenseConstruction(id).then((response) => {
-        
+
         this.orgform = response.data;
         this.orgopen = true;
         // console.log(response.data.certificateEvidence,"response.data.certificateEvidence")
@@ -1884,7 +1884,7 @@ export default {
           // 表单验证通过,提交数据或执行其他操作
           this.orgform.orgId = this.$route.params.id;
           this.orgform.type = 1;
-  
+
           if (this.orgform.id != null) {
             updateOrgPhysicalDefenseConstruction(this.orgform).then(
               (response) => {
@@ -2018,7 +2018,7 @@ export default {
 .title {
   font-size: 18px;
   text-align: left;
-  background: #008cd6bd;
+  background: #008cd6ff;
   color: #fff;
   height: 36px;
   line-height: 36px;

+ 1 - 3
src/views/system/dept/index.vue

@@ -117,7 +117,6 @@
               <el-button
                 v-if="false"
                 type="primary"
-                plain
                 icon="el-icon-plus"
                 size="mini"
                 @click="showDialogEdit(0)"
@@ -125,7 +124,6 @@
               ></el-button>
               <el-button
                 type="primary"
-                plain
                 icon="el-icon-plus"
                 size="mini"
                 @click="handleAdd"
@@ -245,7 +243,7 @@
                 <el-button
                   size="mini"
                   type="text"
-                  icon="el-icon-edit"
+                  icon="el-icon-edit-outline"
                   @click="handleUpdate(scope.row)"
                   v-hasPermi="['system:dept:edit']"
                   >编辑</el-button

+ 12 - 12
src/views/system/device/index.vue

@@ -46,7 +46,7 @@
                 v-hasPermi="['system:device:import']">导出模版</el-button>
             </el-col>
             <el-col :span="1.5">
-           
+
                 <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:device:add']">新增</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -80,7 +80,7 @@
             <!--    <el-table-column label="保修期限" align="center" prop="maintenanceTerm" /> -->
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)"
                   v-hasPermi="['system:device:edit']">编辑</el-button>
                 <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                   v-hasPermi="['system:device:remove']">删除</el-button>
@@ -91,12 +91,12 @@
           <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize" @pagination="getList" />
         </el-col>
-   
+
     </el-row>
-   
-  
-    
-   
+
+
+
+
 
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
@@ -194,7 +194,7 @@
         :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
-  
+
       </el-upload>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFileForm">确 定</el-button>
@@ -306,7 +306,7 @@ export default {
         title: "",
         // 是否禁用上传
         isUploading: false,
-       
+
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
@@ -340,7 +340,7 @@ export default {
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
-      
+
       this.$refs.tree.filter(val);
     }
   },
@@ -359,7 +359,7 @@ export default {
       this.upload.title = "设备导入";
       this.upload.open = true;
     },
-   
+
       // 文件上传成功处理
       handleFileSuccess(response, file, fileList) {
       this.upload.open = false;
@@ -534,7 +534,7 @@ export default {
         this.open = true;
         this.title = "编辑";
       });
-      
+
     },
     /** 提交按钮 */
     submitForm() {

+ 8 - 9
src/views/system/dict/data.vue

@@ -39,7 +39,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
@@ -50,7 +49,7 @@
         <el-button
           type="success"
           plain
-          icon="el-icon-edit"
+          icon="el-icon-edit-outline"
           size="mini"
           :disabled="single"
           @click="handleUpdate"
@@ -121,7 +120,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-edit-outline"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dict:edit']"
           >编辑</el-button>
@@ -174,14 +173,14 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="显示排序" prop="dictSort">
-              <el-input-number 
+              <el-input-number
               style="width: 100%;"
               v-model="form.dictSort" controls-position="right" :min="0" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="回显样式" prop="listClass">
-              <el-select 
+              <el-select
                 style="width: 100%;"
                 v-model="form.listClass">
                 <el-option
@@ -194,7 +193,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        
+
         <el-row>
           <el-col :span="12">
             <el-form-item label="状态" prop="status">
@@ -207,9 +206,9 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-        
+
         </el-row>
-        
+
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
@@ -432,4 +431,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 9 - 10
src/views/system/dict/index.vue

@@ -44,7 +44,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
@@ -55,7 +54,7 @@
         <el-button
           type="success"
           plain
-          icon="el-icon-edit"
+          icon="el-icon-edit-outline"
           size="mini"
           :disabled="single"
           @click="handleUpdate"
@@ -123,7 +122,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-edit-outline"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dict:edit']"
           >编辑</el-button>
@@ -148,13 +147,13 @@
 
     <!-- 添加或修改参数配置对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="650px" append-to-body>
-      
+
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        
+
         <el-form-item label="字典名称" prop="dictName">
           <el-input v-model="form.dictName" placeholder="请输入字典名称" />
         </el-form-item>
-          
+
         <el-form-item label="字典类型" prop="dictType">
           <el-input v-model="form.dictType" placeholder="请输入字典类型" />
         </el-form-item>
@@ -171,9 +170,9 @@
             </el-form-item>
           </el-col>
         </el-row>
-       
-        
-        
+
+
+
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
@@ -343,4 +342,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 3 - 4
src/views/system/information/index.vue

@@ -123,7 +123,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
@@ -134,7 +133,7 @@
         <el-button
           type="success"
           plain
-          icon="el-icon-edit"
+          icon="el-icon-edit-outline"
           size="mini"
           :disabled="single"
           @click="handleUpdate"
@@ -201,7 +200,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-edit-outline"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:information:edit']"
           >修改</el-button>
@@ -215,7 +214,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

+ 1 - 2
src/views/system/menu/index.vue

@@ -51,7 +51,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
@@ -150,7 +149,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-edit-outline"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:menu:edit']"
             >编辑</el-button

+ 3 - 4
src/views/system/notice/index.vue

@@ -37,7 +37,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
@@ -48,7 +47,7 @@
         <el-button
           type="success"
           plain
-          icon="el-icon-edit"
+          icon="el-icon-edit-outline"
           size="mini"
           :disabled="single"
           @click="handleUpdate"
@@ -99,7 +98,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-edit-outline"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:notice:edit']"
           >修改</el-button>
@@ -309,4 +308,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 3 - 4
src/views/system/post/index.vue

@@ -37,7 +37,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
@@ -48,7 +47,7 @@
         <el-button
           type="success"
           plain
-          icon="el-icon-edit"
+          icon="el-icon-edit-outline"
           size="mini"
           :disabled="single"
           @click="handleUpdate"
@@ -100,7 +99,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-edit-outline"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:post:edit']"
           >修改</el-button>
@@ -306,4 +305,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 2 - 2
src/views/system/role/authUser.vue

@@ -17,7 +17,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openSelectUser"
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="openSelectUser"
           v-hasPermi="['system:role:add']">添加用户</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -156,4 +156,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 9 - 9
src/views/system/role/index.vue

@@ -24,11 +24,11 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+        <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" size="mini" :disabled="single" @click="handleUpdate"
+        <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">
@@ -48,7 +48,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table 
+    <el-table
           border
           height="650"
           size="small"
@@ -79,7 +79,7 @@
       </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">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+          <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)"
             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>
@@ -119,7 +119,7 @@
                   :key="dict.value"
                   :label="dict.label"
                   :value="`${dict.value}`"
-                
+
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -144,7 +144,7 @@
           </el-col>
         </el-row>
 
-        
+
 
 <!--        <el-form-item prop="roleKey">
           <span slot="label">
@@ -155,8 +155,8 @@
           </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>
@@ -295,7 +295,7 @@ export default {
         ],
         orgType: [
           { required: true, message: "请选择机构类型", trigger: "blur" }
-        ], 
+        ],
         roleSort: [
           { required: true, message: "角色顺序不能为空", trigger: "blur" }
         ],

+ 2 - 2
src/views/system/user/extend.vue

@@ -116,7 +116,7 @@
             </el-form-item>
           </el-col>
 
-        
+
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item prop="entryTime" label="现任职时间">
               <el-date-picker v-model="formData.entryTime" :picker-options="endDatepickerOptions" align="right"
@@ -701,7 +701,7 @@ export default {
 .title {
   font-size: 18px;
   text-align: left;
-  background: #008CD6bd;
+  background: #008CD6ff;
   color: #fff;
   height: 36px;
   line-height: 36px;

+ 5 - 4
src/views/system/user/index.vue

@@ -113,7 +113,6 @@
           <el-col :span="1.5">
             <el-button
               type="primary"
-              plain
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
@@ -122,7 +121,7 @@
             >
           </el-col>
           <!-- <el-col :span="1.5">
-            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+            <el-button type="success" plain icon="el-icon-edit-outline" size="mini" :disabled="single" @click="handleUpdate"
               v-hasPermi="['system:user:edit']">修改</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -290,19 +289,20 @@
                 size="mini"
                 type="text"
                 icon="el-icon-plus"
-                v-if="scope.row.isManage == 'Y'"
                 @click="handleExtend(scope.row)"
                 v-hasPermi="['system:user:extend']"
                 >补充信息</el-button
               >
+              <el-divider direction="vertical"></el-divider>
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit-outline"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:user:edit']"
                 >编辑</el-button
               >
+              <el-divider direction="vertical"></el-divider>
               <el-button
                 size="mini"
                 type="text"
@@ -311,6 +311,7 @@
                 v-hasPermi="['system:user:remove']"
                 >删除</el-button
               >
+              <el-divider direction="vertical"></el-divider>
               <el-dropdown
                 size="mini"
                 @command="(command) => handleCommand(command, scope.row)"

+ 0 - 1
src/views/system/workTimeSet/workTime.vue

@@ -67,7 +67,6 @@
           <el-col :span="1.5">
             <el-button
               type="primary"
-              plain
               size="mini"
               icon="el-icon-thumb"
               @click="clickAdd"

+ 3 - 3
src/views/tool/gen/index.vue

@@ -59,7 +59,7 @@
         <el-button
           type="success"
           plain
-          icon="el-icon-edit"
+          icon="el-icon-edit-outline"
           size="mini"
           :disabled="single"
           @click="handleEditTable"
@@ -122,7 +122,7 @@
           <el-button
             type="text"
             size="small"
-            icon="el-icon-edit"
+            icon="el-icon-edit-outline"
             @click="handleEditTable(scope.row)"
             v-hasPermi="['tool:gen:edit']"
           >编辑</el-button>
@@ -262,7 +262,7 @@ export default {
         this.$modal.msgError("请选择要生成的数据");
         return;
       }
-      
+
       if(row.genType === "1") {
         genCode(row.tableName).then(response => {
           this.$modal.msgSuccess("成功生成到自定义路径:" + row.genPath);