pref:修改页面样式

sample-form-manager-ui/admin/src/assets/css/common.less

@@ -393,3 +393,23 @@
 .el-drawer__body{
   border-top:1px solid #ececec;
 }
+.el-button--primary{
+  background: linear-gradient(90deg, #5ab6ff, #2e9aff) !important;
+  border: none !important;
+  border-color: transparent !important;
+}
+.el-dialog__header{
+  .el-dialog__title{
+    color: #1890FF !important;
+    font-size: 18px;
+    font-weight: bold;
+  }
+  .el-dialog__close{
+    color: #188fff !important;
+    font-size: 26px;
+    font-weight: bold;
+  }
+}
+.el-pagination__jump{
+  margin-left: 0px !important;
+}
\ No newline at end of file

sample-form-manager-ui/admin/src/pages/hardware/NumberWriteDevice.vue

@@ -41,7 +41,6 @@
           v-loading="loading"
           border
           :data="tableData"
-          size="small"
           tooltip-effect="dark"
           style="width: 100%"
           max-height="676px"
@@ -156,7 +155,7 @@
       <div class="pagination" v-if="total">
         <el-pagination
           background
-          layout="total,sizes,prev,pager,next,jumper"
+          layout="total,prev,pager,next,sizes,jumper"
           :pager-count="5"
           :total="total"
           :current-page="current"

sample-form-manager-ui/admin/src/pages/hardware/modal/AddMatter.vue

@@ -19,9 +19,11 @@
               :key="v.id"
             >
               <div class="flex aic jcb">
-                <p class="matter-item-title">
-                  {{ v.matterName }}
-                </p>
+                <el-tooltip :content="v.matterName" placement="top">
+                  <p class="matter-item-title">
+                    {{ v.matterName }}
+                  </p>
+                </el-tooltip>
                 <i class="el-icon-delete delete" @click="handleDel(v.id)"></i>
               </div>
               <div class="matter-item-count">
@@ -73,9 +75,9 @@
                 @keyup.native.enter="handleSearch"
               ></el-input>
               <el-button size="small" type="primary" @click="handleSearch"
-                >搜索</el-button
+                >搜 索</el-button
               >
-              <el-button size="small" @click="handleReset">重置</el-button>
+              <el-button size="small" @click="handleReset">重 置</el-button>
             </div>
           </TableHeader>
           <!-- 表格 -->
@@ -147,7 +149,7 @@
           <div class="pagination" v-if="total">
             <el-pagination
               background
-              layout="total,sizes,prev,pager,next,jumper"
+              layout="total,prev,pager,next,sizes,jumper"
               :pager-count="5"
               :total="total"
               :current-page="current"
@@ -385,6 +387,7 @@ export default {
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
+      cursor: default;
     }
     .matter-item-count {
       margin-top: 4px;

sample-form-manager-ui/admin/src/pages/software/basics/BasicsSet.vue

@@ -57,9 +57,9 @@
         </el-button>
       </div>
       <div class="mt50">
-        <el-button size="small" @click="handleReset">重置</el-button>
+        <el-button size="small" @click="handleReset">重 置</el-button>
         <el-button size="small" type="primary" @click="handleOk"
-          >确定
+          >确 定
         </el-button>
       </div>
     </el-card>
@@ -116,6 +116,7 @@ export default {
 
     showInput() {
       if (this.baseSetInfo.hotwords.length >= 10) {
+        this.$message.warning("最多添加10个热门词汇！");
         return;
       }
       this.inputVisible = true;

sample-form-manager-ui/admin/src/pages/software/librarymanage/LibraryManage.vue

@@ -43,9 +43,9 @@
             @keyup.native.enter="handleSearch"
           ></el-input>
           <el-button size="small" type="primary" @click="handleSearch"
-            >搜索</el-button
+            >搜 索</el-button
           >
-          <el-button size="small" @click="handleReset">重置</el-button>
+          <el-button size="small" @click="handleReset">重 置</el-button>
         </div>
       </TableHeader>
       <!-- 表格 -->
@@ -110,7 +110,7 @@
       <div class="pagination" v-if="total">
         <el-pagination
           background
-          layout="total,sizes,prev,pager,next,jumper"
+          layout="total,prev,pager,next,sizes,jumper"
           :pager-count="5"
           :total="total"
           :current-page="current"

sample-form-manager-ui/admin/src/pages/software/materials/MaterialsManage.vue

@@ -7,7 +7,7 @@
         </div>
         <TableHeader>
           <div slot="left">
-            <el-button size="small" @click="setCurrent">{{
+            <el-button size="small" type="primary" @click="setCurrent">{{
               activeDep.id ? "取消选择" : "全部材料"
             }}</el-button>
           </div>
@@ -42,9 +42,9 @@
               @keyup.native.enter="handleSearchLeft"
             ></el-input>
             <el-button size="small" type="primary" @click="handleSearchLeft"
-              >搜索</el-button
+              >搜 索</el-button
             >
-            <el-button size="small" @click="leftReset">重置</el-button>
+            <el-button size="small" @click="leftReset">重 置</el-button>
           </div>
         </TableHeader>
         <!-- 表格 -->
@@ -55,6 +55,7 @@
               v-loading="loadingLeft"
               :data="LeftTableData"
               size="small"
+              border
               tooltip-effect="dark"
               style="width: 100%"
               max-height="676px"
@@ -103,7 +104,7 @@
         <div class="pagination" v-if="leftTotal">
           <el-pagination
             background
-            layout="total,sizes,prev,pager,next,jumper"
+            layout="total,prev,pager,next,sizes,jumper"
             :pager-count="5"
             :total="leftTotal"
             :current-page="leftCurrent"
@@ -165,9 +166,9 @@
               @keyup.native.enter="handleSearchRight"
             ></el-input>
             <el-button size="small" type="primary" @click="handleSearchRight"
-              >搜索</el-button
+              >搜 索</el-button
             >
-            <el-button size="small" @click="rightReset">重置</el-button>
+            <el-button size="small" @click="rightReset">重 置</el-button>
           </div>
         </TableHeader>
         <!-- 表格 -->
@@ -212,7 +213,7 @@
             </el-table-column>
             <el-table-column
               prop="total"
-              label="填写次数"
+              label="查看次数"
               align="center"
               width="80"
             >
@@ -255,7 +256,7 @@
         <div class="pagination" v-if="rightTotal">
           <el-pagination
             background
-            layout="total,sizes,prev,pager,next,jumper"
+            layout="total,prev,pager,next,sizes,jumper"
             :pager-count="5"
             :total="rightTotal"
             :current-page="rightCurrent"

sample-form-manager-ui/admin/src/pages/software/materials/modal/CommonLib.vue

@@ -17,9 +17,9 @@
             @keyup.native.enter="handleSarch"
           ></el-input>
           <el-button size="small" type="primary" @click="handleSarch"
-            >搜索
+            >搜 索
           </el-button>
-          <el-button size="small" @click="resetSearch">重置</el-button>
+          <el-button size="small" @click="resetSearch">重 置</el-button>
         </div>
       </TableHeader>
       <el-table

sample-form-manager-ui/admin/src/pages/software/materials/modal/PreviewMaterials.vue

@@ -112,20 +112,20 @@ export default {
   height: 100%;
   background-color: #e8e8e8;
   overflow-y: auto;
-  &::-webkit-scrollbar {
-    width: 10px;
-    overflow-y: auto;
-  }
+  // &::-webkit-scrollbar {
+  //   width: 10px;
+  //   overflow-y: auto;
+  // }
 
-  &::-webkit-scrollbar-thumb {
-    border-radius: 6px;
-    background-color: rgba(144, 147, 153, 0.5);
-  }
+  // &::-webkit-scrollbar-thumb {
+  //   border-radius: 6px;
+  //   background-color: rgba(144, 147, 153, 0.5);
+  // }
 
-  &::-webkit-scrollbar-track {
-    border-radius: 6px;
-    background: #fff;
-  }
+  // &::-webkit-scrollbar-track {
+  //   border-radius: 6px;
+  //   background: #fff;
+  // }
 
   .left-header {
     height: 80px;

sample-form-manager-ui/admin/src/pages/software/matter/MatterManage.vue

@@ -46,9 +46,9 @@
               placeholder="请输入事项全称搜索"
             ></el-input>
             <el-button size="small" type="primary" @click="searchLeft"
-              >搜索</el-button
+              >搜 索</el-button
             >
-            <el-button size="small" @click="leftReset">重置</el-button>
+            <el-button size="small" @click="leftReset">重 置</el-button>
           </div>
         </TableHeader>
         <!-- 表格 -->
@@ -143,7 +143,7 @@
         <div class="pagination" v-if="leftTotal">
           <el-pagination
             background
-            layout="total,sizes,prev,pager,next,jumper"
+            layout="total,prev,pager,next,sizes,jumper"
             :pager-count="5"
             :total="leftTotal"
             :current-page="leftCurrent"
@@ -165,7 +165,7 @@
         <!-- 内容 -->
         <TableHeader>
           <div slot="left">
-            <el-button size="small" type="success" @click="handleAllJoin"
+            <el-button size="small" type="primary" @click="handleAllJoin"
               >批量加入</el-button
             >
           </div>
@@ -200,9 +200,9 @@
               @keyup.native.enter="handleSearchRight"
             ></el-input>
             <el-button size="small" type="primary" @click="handleSearchRight"
-              >搜索</el-button
+              >搜 索</el-button
             >
-            <el-button size="small" @click="rightReset">重置</el-button>
+            <el-button size="small" @click="rightReset">重 置</el-button>
           </div>
         </TableHeader>
         <!-- 表格 -->
@@ -259,7 +259,7 @@
         <div class="pagination" v-if="rightTotal">
           <el-pagination
             background
-            layout="total,sizes,prev,pager,next,jumper"
+            layout="total,prev,pager,next,sizes,jumper"
             :pager-count="5"
             :total="rightTotal"
             :current-page="rightCurrent"

sample-form-manager-ui/admin/src/pages/system/parameter/Parameter.vue

@@ -19,16 +19,15 @@
           @keyup.native.enter="handleSearch"
         ></el-input>
         <el-button size="small" type="primary" @click="handleSearch"
-          >搜索</el-button
+          >搜 索</el-button
         >
-        <el-button size="small" @click="handleReset">重置</el-button>
+        <el-button size="small" @click="handleReset">重 置</el-button>
       </div>
     </TableHeader>
     <!-- 表格 -->
     <div class="table-content">
       <el-table
         ref="multipleTable"
-        size="small"
         v-loading="loading"
         :data="tableData"
         border
@@ -93,7 +92,7 @@
     <div class="pagination" v-if="total">
       <el-pagination
         background
-        layout="total,sizes,prev,pager,next,jumper"
+        layout="total,prev,pager,next,sizes,jumper"
         :pager-count="5"
         :total="total"
         :current-page="current"

sample-form-manager-ui/admin/src/pages/system/systemlogs/SystemLogs.vue

@@ -11,9 +11,9 @@
           @keyup.native.enter="handleSearch"
         ></el-input>
         <el-button size="small" type="primary" @click="handleSearch"
-          >搜索</el-button
+          >搜 索</el-button
         >
-        <el-button size="small" @click="handleReset">重置</el-button>
+        <el-button size="small" @click="handleReset">重 置</el-button>
       </div>
     </TableHeader>
     <!-- 表格 -->
@@ -61,7 +61,7 @@
     <div class="pagination" v-if="total">
       <el-pagination
         background
-        layout="total,sizes,prev,pager,next,jumper"
+        layout="total,prev,pager,next,sizes,jumper"
         :pager-count="5"
         :total="total"
         :current-page="current"

sample-form-manager-ui/admin/src/pages/system/task/TaskSet.vue

@@ -19,16 +19,15 @@
           @keyup.native.enter="handleSearch"
         ></el-input>
         <el-button size="small" type="primary" @click="handleSearch"
-          >搜索</el-button
+          >搜 索</el-button
         >
-        <el-button size="small" @click="handleReset">重置</el-button>
+        <el-button size="small" @click="handleReset">重 置</el-button>
       </div>
     </TableHeader>
     <!-- 表格 -->
     <div class="table-content">
       <el-table
         ref="multipleTable"
-        size="small"
         v-loading="loading"
         :data="tableData"
         border
@@ -103,7 +102,7 @@
     <div class="pagination" v-if="total">
       <el-pagination
         background
-        layout="total,sizes,prev,pager,next,jumper"
+        layout="total,prev,pager,next,sizes,jumper"
         :pager-count="5"
         :total="total"
         :current-page="current"