liang преди 3 години
родител
ревизия
12b44fdf55
променени са 3 файла, в които са добавени 35 реда и са изтрити 18 реда
  1. 25 12
      src/assets/styles/global.css
  2. 4 1
      src/views/pt.vue
  3. 6 5
      src/views/taishi/index.vue

+ 25 - 12
src/assets/styles/global.css

@@ -1017,22 +1017,34 @@ margin-right: 34px;
    background-color: transparent !important;
   }
 
-  /* #app .sidebar-container{
+  #app .sidebar-container {
+    -webkit-transition: width 0.28s;
+    transition: width 0.28s;
     width: 265px !important;
-    padding:0 !important;
-    text-overflow:no !important;
-  }
+    background-color: #304156;
+    height: 100%;
+    position: fixed;
+    font-size: 0px;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 1001;
+    overflow: hidden;
+    -webkit-box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
+    box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
+}
   
-  #app .main-container{
-    margin-left: 265px !important;
-  } */
-
+  #app .main-container {
+    min-height: 100%;
+    -webkit-transition: margin-left 0.28s;
+    transition: margin-left 0.28s;
+    margin-left: 265px;
+    position: relative;
+  }
   /* .el-input__inner {
     border: 1px solid white !important;
 } */
-#app .hideSidebar .main-container{
-  margin-left:50px;
-}
+
 
 /* 表单验证提示文字居左 */
 .el-form-item__error {
@@ -1067,4 +1079,5 @@ margin-right: 34px;
 /* 树形结构合起来去掉选中背景色 */
 .el-tree-node:focus > .el-tree-node__content {
   background-color: transparent;
-}
+}
+

+ 4 - 1
src/views/pt.vue

@@ -302,7 +302,7 @@
                 <div class="num2-ul-title-c">代办事项</div>
                 <div class="num2-ul-title-r">执行人</div>
               </div>
-              <li class="num2-ul-li" v-for="item in worklist" :key="item.id">
+              <li class="num2-ul-li" v-for="item in worklist" :key="item.id" @click="dbsxfun">
                 <div class="num2-ul-li-l">{{item.taskName}}</div>
                 <div class="num2-ul-li-c">工作</div>
                 <div class="num2-ul-li-r">{{item.peopleName}}</div>
@@ -851,6 +851,9 @@ export default {
       this.open5 = true;
       this.ggflg = false;
     },
+    dbsxfun(){
+       this.$router.push({ path: "/workingArrangements/workTask" }).catch(() => {});
+    }
   },
   destroyed() {
     clearInterval(this.timer); // 清除定时器

+ 6 - 5
src/views/taishi/index.vue

@@ -1144,9 +1144,10 @@ export default {
       this.jclist = res.data;
     });
     //涉密移动载体
-    getNumber().then((res) => {
-      // cconsole.log(res)
-    });
+    // getNumber().then((res) => {
+    //   console.log(res)
+    //   this.smztlist=res.data;
+    // });
     this.startTime();
   },
   mounted() {
@@ -1352,7 +1353,7 @@ export default {
       var data1 = [];
       var data = [];
       var data2 = [];
-      console.log(this.wclist);
+      // console.log(this.wclist);
       for (var i in this.wclist) {
         data.push(i);
         for (var e in this.wclist[i][0]) {
@@ -2043,7 +2044,7 @@ export default {
 }
 .left1-head2 span {
   margin-left: 15%;
-  line-height: 23px;
+  line-height: 25px;
   color: #fff;
   font-size: 0.8rem;
 }