时间选择样式修改

package-lock.json

@@ -7769,11 +7769,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -7786,15 +7788,18 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -7897,7 +7902,8 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -7907,6 +7913,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -7919,17 +7926,20 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -7946,6 +7956,7 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -8018,7 +8029,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -8028,6 +8040,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -8133,6 +8146,7 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -16159,6 +16173,11 @@
         }
       }
     },
+    "single-spa": {
+      "version": "4.4.4",
+      "resolved": "https://registry.npm.taobao.org/single-spa/download/single-spa-4.4.4.tgz",
+      "integrity": "sha1-tDx2d+D+3HGcGyhNTgo1tuQPUuI="
+    },
     "slash": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",

src/assets/scss/smp.scss

@@ -28,6 +28,9 @@ $smp--box-shadow-1: 0 0 5px rgba(0,0,0,0.1);
 @mixin smp-no-radius() {
   border-radius:0;
 }
+@mixin smp-radius-normal() {
+  border-radius:5px;
+}
 @mixin smp-no-border() {
   border:none;
 }
@@ -354,17 +357,68 @@ ul,li{
         align-items: center;
       }
       .el-icon-time,.el-icon-date{
-        background: url('~@/assets/img/common/lb_rq.png') no-repeat ;
+        // background: url('~@/assets/img/common/lb_rq.png') no-repeat ;
         width:14px;
         height:16px;
-        
+        margin:4px 0 0 0;
         &:before{
           display: none;
         }
       }
+      .el-icon-time{
+        width:16px;
+        background: url('~@/assets/img/common/lb_sj.png') no-repeat ;
+      }
+      .el-icon-date{
+        background: url('~@/assets/img/common/lb_rq.png') no-repeat ;
+      }
+      
     }
   }
 }
+.el-picker-panel{
+  @include smp-no-radius();
+  .el-date-table td span{
+    @include smp-radius-normal();
+  }
+  .el-year-table td.current:not(.disabled) .cell,.el-month-table td.current:not(.disabled) .cell{
+    @include smp-radius-normal();
+    color:$smp--color-white;
+    background-color: $smp--color-blue;
+  }
+  .el-input__inner{
+    @include smp-no-radius();
+  }
+  .el-picker-panel__footer{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .el-picker-panel__link-btn.is-plain{
+    color:$smp--color-white;
+    background-color: $smp--color-blue;
+  }
+  .el-picker-panel__link-btn:not(.is-plain){
+    border:1px solid $smp--color-blue;
+    color:$smp--color-blue;
+    padding:7px 15px;
+  }
+}
+.el-time-panel{
+  .el-time-panel__footer{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+  }
+  .el-scrollbar__wrap{
+    box-sizing: content-box;
+  }
+  .el-time-spinner__item.active:not(.disabled){
+    color:$smp--color-blue;
+    font-size:normal;
+  }
+}
+
 
 /* smp icon 32
 ------------------------------ */

src/element-ui/theme/index.css

@@ -3759,7 +3759,7 @@
 }
 
 .el-message-box__status.el-icon-success {
-    color: #67c23a
+    color: #1280f1
 }
 
 .el-message-box__status.el-icon-info {
@@ -4106,7 +4106,7 @@
 }
 
 .el-form-item.is-success .el-input__inner, .el-form-item.is-success .el-input__inner:focus, .el-form-item.is-success .el-textarea__inner, .el-form-item.is-success .el-textarea__inner:focus {
-    border-color: #67c23a
+    border-color: #1280f1
 }
 
 .el-form-item.is-success .el-input-group__append .el-input__inner, .el-form-item.is-success .el-input-group__prepend .el-input__inner {
@@ -4114,7 +4114,7 @@
 }
 
 .el-form-item.is-success .el-input__validateIcon {
-    color: #67c23a
+    color: #1280f1
 }
 
 .el-form-item--feedback .el-input__validateIcon {
@@ -4862,19 +4862,19 @@
 .el-tag--success {
     background-color: rgba(103, 194, 58, .1);
     border-color: rgba(103, 194, 58, .2);
-    color: #67c23a
+    color: #1280f1
 }
 
 .el-tag--success.is-hit {
-    border-color: #67c23a
+    border-color: #1280f1
 }
 
 .el-tag--success .el-tag__close {
-    color: #67c23a
+    color: #1280f1
 }
 
 .el-tag--success .el-tag__close:hover {
-    background-color: #67c23a;
+    background-color: #1280f1;
     color: #fff
 }
 
@@ -5099,11 +5099,11 @@
 
 .el-alert--success {
     background-color: #f0f9eb;
-    color: #67c23a
+    color: #1280f1
 }
 
 .el-alert--success .el-alert__description {
-    color: #67c23a
+    color: #1280f1
 }
 
 .el-alert--info {
@@ -5254,7 +5254,7 @@
 }
 
 .el-notification .el-icon-success {
-    color: #67c23a
+    color: #1280f1
 }
 
 .el-notification .el-icon-error {
@@ -8829,7 +8829,7 @@
 }
 
 .el-upload-list__item .el-icon-upload-success {
-    color: #67c23a
+    color: #1280f1
 }
 
 .el-upload-list__item .el-icon-close {
@@ -9337,11 +9337,11 @@
 }
 
 .el-progress.is-success .el-progress-bar__inner {
-    background-color: #67c23a
+    background-color: #1280f1
 }
 
 .el-progress.is-success .el-progress__text {
-    color: #67c23a
+    color: #1280f1
 }
 
 .el-progress.is-exception .el-progress-bar__inner {
@@ -9518,7 +9518,7 @@
 }
 
 .el-message--success .el-message__content {
-    color: #67c23a
+    color: #1280f1
 }
 
 .el-message--warning {
@@ -9565,7 +9565,7 @@
 }
 
 .el-message .el-icon-success {
-    color: #67c23a
+    color: #1280f1
 }
 
 .el-message .el-icon-error {
@@ -9761,8 +9761,8 @@
 }
 
 .el-step__head.is-success {
-    color: #67c23a;
-    border-color: #67c23a
+    color: #1280f1;
+    border-color: #1280f1
 }
 
 .el-step__head.is-error {
@@ -9870,7 +9870,7 @@
 }
 
 .el-step__title.is-success {
-    color: #67c23a
+    color: #1280f1
 }
 
 .el-step__title.is-error {
@@ -9898,7 +9898,7 @@
 }
 
 .el-step__description.is-success {
-    color: #67c23a
+    color: #1280f1
 }
 
 .el-step__description.is-error {
@@ -11690,8 +11690,8 @@
 
 .el-button--success {
     color: #fff;
-    background-color: #67c23a;
-    border-color: #67c23a
+    background-color: #1280f1;
+    border-color: #1280f1
 }
 
 .el-button--success:focus, .el-button--success:hover {
@@ -11717,14 +11717,14 @@
 }
 
 .el-button--success.is-plain {
-    color: #67c23a;
+    color: #1280f1;
     background: #f0f9eb;
     border-color: #c2e7b0
 }
 
 .el-button--success.is-plain:focus, .el-button--success.is-plain:hover {
-    background: #67c23a;
-    border-color: #67c23a;
+    background: #1280f1;
+    border-color: #1280f1;
     color: #fff
 }
 

src/mock/modules/sys-menu.js

@@ -500,17 +500,13 @@ var navDataList = [
 ]
 var navDataList2 = [
   {
-    'menuId': 2,
-    'parentId': 1,
-    'parentName': null,
-    'name': '管理员列表',
-    'url': 'sys/user',
-    'perms': null,
-    'type': 1,
-    'icon': 'admin',
-    'orderNum': 1,
-    'open': null,
-    'list': null
+    'id': 1,
+    'parentId': 0, // 父ID，根ID是0
+    'name': '项目', // 菜单名
+    'ename': 'project-index', // 和路径相同，不要斜杠
+    'path': '', // 页面路径 '/功能块名/页面名' 例子：/jiankong/shouye  后台录入
+    'componentPath': '', // 文件路径，后台录入各子系统页面的文件路径，
+    'noMenu': true // 如果该菜单只是有用，但是不出现在菜单中，就添加这个属性
   }
 ]
 
@@ -523,42 +519,7 @@ export function nav () {
     data: {
       'msg': 'success',
       'code': 0,
-      'data': navDataList2,
-      'permissions': [
-        'sys:schedule:info',
-        'sys:menu:update',
-        'sys:menu:delete',
-        'sys:config:info',
-        'sys:menu:list',
-        'sys:config:save',
-        'sys:config:update',
-        'sys:schedule:resume',
-        'sys:user:delete',
-        'sys:config:list',
-        'sys:user:update',
-        'sys:role:list',
-        'sys:menu:info',
-        'sys:menu:select',
-        'sys:schedule:update',
-        'sys:schedule:save',
-        'sys:role:select',
-        'sys:user:list',
-        'sys:menu:save',
-        'sys:role:save',
-        'sys:schedule:log',
-        'sys:role:info',
-        'sys:schedule:delete',
-        'sys:role:update',
-        'sys:schedule:list',
-        'sys:user:info',
-        'sys:schedule:run',
-        'sys:config:delete',
-        'sys:role:delete',
-        'sys:user:save',
-        'sys:schedule:pause',
-        'sys:log:list',
-        'sys:oss:all'
-      ]
+      'data': navDataList2
     }
   }
 }

src/views/modules/demo/all-form-type.vue

@@ -36,6 +36,11 @@
             <el-time-picker placeholder="请选择时间" v-model="form.time"></el-time-picker>
           </el-col>
         </el-form-item>
+        <el-form-item label="日期时间" prop="timeDate">
+          <el-col :span="24">
+            <el-date-picker type="datetime" placeholder="请选择日期时间" v-model="form.timeDate"></el-date-picker>
+          </el-col>
+        </el-form-item>
         <el-form-item label="日期区间" required>
           <el-col :span="11">
             <el-form-item prop="dayStart">
@@ -92,6 +97,7 @@ export default {
         checkbox: [],
         slider: 0,
         time: '',
+        timeDate: '',
         dayStart: '',
         dayEnd: '',
         switch: false,