徐桐章 преди 4 години
родител
ревизия
e14c23aa9d
променени са 6 файла, в които са добавени 16 реда и са изтрити 11 реда
  1. 1 1
      src/App.vue
  2. 1 1
      src/common/sass/currency.scss
  3. 3 2
      src/components/vAbove/vAbove.scss
  4. 6 5
      src/components/vNav/vNav.scss
  5. 1 1
      src/components/vNav/vNav.vue
  6. 4 1
      src/views/companyManage/templateManage.vue

+ 1 - 1
src/App.vue

@@ -4,7 +4,7 @@
  * @Autor: XuTongZhang
  * @Date: 2020-06-09 15:30:15
  * @LastEditors: XuTongZhang
- * @LastEditTime: 2020-07-31 16:08:39
+ * @LastEditTime: 2020-08-17 17:16:42
 -->
 <template>
   <div class="appPage">

+ 1 - 1
src/common/sass/currency.scss

@@ -1,6 +1,6 @@
 $tint-color: rgb(251,251,251);
 $desc-color: #B3C4E0;
-$dark-color: rgb(46,47,77);
+$dark-color: #4ddcf5;
 $gray-color: rgb(242,243,245);
 $theme-color: rgb(141,144,249);
 /* 改变主题色变量 */

+ 3 - 2
src/components/vAbove/vAbove.scss

@@ -1,9 +1,10 @@
 $above-height:65px;
 .vAboveCom{
+
   position: fixed;
-  left:210px;
   z-index:100;
-  width: calc(100% - 210px);
+  width: 100%;
+  left: 0;
   box-shadow: 1px 1px 12px rgb(244,244,244);
   background-color:#fff;
   height:$above-height;

+ 6 - 5
src/components/vNav/vNav.scss

@@ -1,12 +1,13 @@
 /*
  * @Author       : yuanrunwei
  * @Date         : 2020-05-18 12:05:37
- * @LastEditors  : yuanrunwei
- * @LastEditTime : 2020-05-18 14:51:51
+ * @LastEditors: XuTongZhang
+ * @LastEditTime: 2020-08-17 17:22:36
  * @FilePath     : \ambre-admin-noob\src\components\vNav\vNav.scss
  */ 
 .vNavCom{
   position: fixed;
+  top: 65px;
   height:100%;
   z-index:101;
   .el-menu{
@@ -38,7 +39,7 @@
     min-width: 80px !important;
   }
   .el-menu-item.is-active{
-    background-color:rgb(141,114,249) !important;
+    background-color:rgb(136, 223, 238) !important;
     color:#fff;
     width:180px;
     min-width: 80px;
@@ -46,10 +47,10 @@
   }
   .el-menu-item{
     &:hover{
-        background:rgba(141,114,249,1) !important;
+        background:rgb(108, 212, 238) !important;
     }
     &:active,&:visited{
-        background:rgba(141,114,249,1) !important;
+        background:rgb(108, 212, 238) !important;
     }
   }
   .logo{

+ 1 - 1
src/components/vNav/vNav.vue

@@ -5,7 +5,7 @@
       上海梵天软件
     </div>
     <el-menu
-      background-color="#2e2f4d"
+      background-color="#4ddcf5"
       @select="handleSelect"
       text-color="#F1F1F1"
       unique-opened

+ 4 - 1
src/views/companyManage/templateManage.vue

@@ -4,7 +4,7 @@
  * @Autor: XuTongZhang
  * @Date: 2020-07-28 16:28:13
  * @LastEditors: XuTongZhang
- * @LastEditTime: 2020-08-16 14:29:21
+ * @LastEditTime: 2020-08-17 17:38:04
 -->
 <template>
   <div class="indexPage">
@@ -281,6 +281,9 @@ export default {
         .then((res) => {
           this.open()
           this.form = res.object
+          this.form.sceneId = this.form.sceneId || null
+          this.form.processId = this.form.processId || null
+          this.form.formId = this.form.formId || null
         })
     },
     details (row) {