Merge branch 'dev_gabjq' of http://39.99.224.27:9022/changchao/founder_vue into dev_gabjq

src/assets/styles/detailContent.scss

@@ -72,11 +72,22 @@
       width: 100%;
     }
 
+    /deep/ .el-input-number .el-input__inner {
+      text-align: left;
+    }
+
     .elBtns {
       width: 100%;
       text-align: right;
     }
 
+    .elDateClass {
+      /deep/ .el-input__prefix .el-input__icon {
+        color: #2C5DE5;
+        font-weight: bold;
+      }
+    }
+
     .btnStylePub {
       width: 120px;
       font-size: 14px;

src/assets/styles/element-variables.scss

@@ -4,5 +4,4 @@ $--color-primary: #2C5DE5;
 /* 改变 icon 字体路径变量，必需 */
 $--font-path: '~element-ui/lib/theme-chalk/fonts';
 
-// @import "~element-ui/packages/theme-chalk/src/index";
 @import "~element-ui/packages/theme-chalk/src/index";
\ No newline at end of file

src/assets/styles/leftMenu.scss

@@ -15,6 +15,14 @@
     margin-left: 7px;
   }
 
+  span {
+    font-size: 16px;
+  }
+
+  i {
+    font-size: 16px;
+  }
+
   /deep/ .el-submenu ul>li {
     background-color: #1C1D27 !important;
   }

src/assets/styles/listContent.scss

@@ -85,6 +85,21 @@
           .cell {
             color: #666666;
             font-weight: normal;
+            font-size: 16px;
+          }
+        }
+      }
+
+      /deep/ .el-table__body-wrapper {
+        td {
+          .cell {
+            color: #333333;
+            font-weight: normal;
+            font-size: 14px;
+          }
+
+          button {
+            font-size: 14px;
           }
         }
       }
@@ -103,6 +118,13 @@
       }
     }
 
+    .elDateClass {
+      /deep/ .el-input__prefix .el-input__icon {
+        color: #2C5DE5;
+        font-weight: bold;
+      }
+    }
+
     .btnStylePub {
       width: 120px;
       font-size: 14px;

src/components/leftMenu_components.vue

@@ -2,7 +2,7 @@
   <!--左侧导航-->
   <div
     class="leftMenu"
-    :style="{ width: isCollapse == true ? '72px' : '240px' }"
+    :style="{ width: isCollapse == true ? '72px' : '300px' }"
   >
     <el-scrollbar style="height: 100%">
       <el-menu

src/views/artisanManage/components/artisanManageEdit.vue

@@ -129,6 +129,7 @@
             <el-input-number
               v-model="detailInfo.workYears"
               controls-position="right"
+              placeholder="请选择从事警犬技术工作时间"
               :min="0"
             ></el-input-number>
           </el-form-item>

src/views/poDogJobManage/components/poDogJobManageEdit.vue

@@ -57,7 +57,7 @@
           </el-form-item>
           <el-form-item
             label="出生日期"
-            class="elItemClass"
+            class="elItemClass elDateClass"
             prop="birthDate"
           >
             <el-date-picker

src/views/poDogJobManage/index.vue

@@ -34,7 +34,7 @@
         </el-form-item>
         <el-form-item
           label="出生日期"
-          class="elItemClass"
+          class="elItemClass elDateClass"
         >
           <el-date-picker
             v-model="formData.birthDate"

src/views/sy/index.vue

@@ -6,12 +6,12 @@
     <div class="content">
       <div
         class="leftWrap"
-        :style="{ width: isCollapseP == true ? '72px' : '240px' }"
+        :style="{ width: isCollapseP == true ? '72px' : '300px' }"
       >
         <div
           class="headerTitle"
           id="header"
-          :style="{ width: isCollapseP == true ? '72px' : '240px' }"
+          :style="{ width: isCollapseP == true ? '72px' : '300px' }"
         >
           <img
             v-if="isCollapseP == true"
@@ -21,7 +21,7 @@
           />
           <img
             v-else
-            style="width: 210px;"
+            style="width: 270px;"
             src="../../assets/img/login/logoTitle.png"
             alt=""
           />
@@ -33,7 +33,7 @@
       </div>
       <div
         class="rightContent"
-        :style="isCollapseP == true ? 'width: calc(100px - 72px);' : 'width: calc(100px - 240px);'"
+        :style="isCollapseP == true ? 'width: calc(100px - 72px);' : 'width: calc(100px - 300px);'"
       >
         <div class="rightTitle">
           <div class="leftContentClass">
@@ -325,7 +325,7 @@ export default {
 
 .headerTitle {
   height: 64px;
-  width: 240px;
+  width: 300px;
   background: #1e2636;
   font-size: 18px;
   color: #fff;

src/views/teUnitManage/components/teUnitManageEdit.vue

@@ -78,6 +78,7 @@
             <el-input-number
               v-model="detailInfo.dwmj"
               controls-position="right"
+              placeholder="请输入单位面积"
               :min="0"
             ></el-input-number>
           </el-form-item>
@@ -95,6 +96,7 @@
             <el-input-number
               v-model="detailInfo.dwbzs"
               controls-position="right"
+              placeholder="请输入单位编制数"
               :min="0"
               :precision="0"
             ></el-input-number>
@@ -116,6 +118,7 @@
             <el-input-number
               v-model="detailInfo.qs"
               controls-position="right"
+              placeholder="请输入犬舍"
               :min="0"
               :precision="0"
             ></el-input-number>