Forráskód Böngészése

09/24

升级element ui
mo 5 éve
szülő
commit
72c520d359

+ 1 - 1
package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "axios": "0.18.1",
     "default-passive-events": "^1.0.10",
-    "element-ui": "2.7.2",
+    "element-ui": "^2.12.0",
     "js-cookie": "2.2.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",

+ 125 - 2
src/views/journal/journalItem.vue

@@ -30,7 +30,47 @@
         <p class='msg'>那家纯四季花城教学总结爱喝酒收到货就暗示的看见爱上大家超级好吃就撒客户看见爱上当看见那家纯四季花城教学总结爱喝酒收到货就暗示的看见爱上大家超级好吃就撒客户看见爱上当看见</p>
       </div>
     </div>
-    <div class="right"></div>
+    <div class="right">
+      <img src="@/assets/images/base/placehorder-icon.png"
+           class="header"
+           alt="">
+      <div class="info">
+        <h2>黄老师<span>【185****2109】</span></h2>
+        <p class="subMsg">发至 <span class='san'></span> <span style="margin-left:30px">我</span></p>
+        <div class="textWrap">
+          <p>审批事项: 合班</p>
+          <p>开始时间: 2019-09-01 09:00</p>
+          <p>结束时间: 2019-09-01 09:00</p>
+          <p>备注:班人数较少较少班人数较少较少班人数较少较少班人数较少较少班人数较少较少班人数较少较少班人数较少较少班人数较少较少</p>
+        </div>
+        <div class="timeline">
+          <el-timeline>
+            <el-timeline-item placement='center'>
+              <div class='timeMsg'>
+                <p class="name">我</p>
+                <p class='status'>审批中</p>
+              </div>
+              <div slot='dot'>
+                <img class='dot'
+                     src="@/assets/images/base/clock.png"
+                     alt="">
+              </div>
+            </el-timeline-item>
+            <el-timeline-item placement='center'>
+              <div class='timeMsg'>
+                <p class="name">我</p>
+                <p class='status'>审批中</p>
+              </div>
+              <div slot='dot'>
+                <img class='dot'
+                     src="@/assets/images/base/clock.png"
+                     alt="">
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -44,7 +84,10 @@ export default {
         Htrashicon: require('@/assets/images/base/trashicon-h.png'),
         boxicon: require('@/assets/images/base/boxicon.png'),
         Hboxicon: require('@/assets/images/base/boxicon-h.png')
-      }
+      },
+      activities: [{
+
+      }]
     }
   }
 }
@@ -157,5 +200,85 @@ export default {
       }
     }
   }
+  .right {
+    padding: 18px 24px;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    width: 570px;
+    box-sizing: border-box;
+    border: 1px solid #e4e8eb;
+    margin-left: 25px;
+    .header {
+      width: 30px;
+      height: 30px;
+      position: relative;
+      top: 7px;
+      border-radius: 50%;
+      margin-right: 12px;
+    }
+    .info {
+      position: relative;
+      h2 {
+        color: #212223;
+        font-size: 16px;
+        margin-bottom: 0px;
+        span {
+          font-size: 12px;
+          color: #444;
+        }
+      }
+      .subMsg {
+        position: relative;
+        font-size: 12px;
+        color: #444;
+        margin-bottom: 12px;
+        .san {
+          // margin-left: 110px;
+          float: left;
+          position: absolute;
+          top: 0px;
+          width: 0;
+          height: 0;
+          border-width: 5px;
+          border-style: solid;
+          border-color: transparent #909191 transparent transparent;
+          transform: rotate(180deg); /*顺时针旋转90°*/
+          margin: 0 8px;
+        }
+      }
+      .textWrap {
+        width: 316px;
+        line-height: 21px;
+        font-size: 14px;
+        color: #212223;
+        margin: 12px 0 34px;
+      }
+      .dot {
+        width: 20px;
+        height: 20px;
+      }
+      .timeMsg {
+        position: relative;
+        top: 5px;
+        .name {
+          font-size: #444;
+          font-size: 16px;
+          margin-bottom: 3px;
+          font-weight: 600;
+        }
+        .status {
+          font-size: 14px;
+          color: #62a070;
+        }
+        .status.waring {
+          color: #f97215;
+        }
+        .status.end {
+          color: #aaaaaa;
+        }
+      }
+    }
+  }
 }
 </style>

+ 1 - 1
src/views/login/index.vue

@@ -140,7 +140,7 @@ export default {
             .then(() => {
               console.log('登录成功');
               this.$router.push({ path: this.redirect || "/" });
-              console.log(store.getters.organ);
+
             })
             .catch(() => {
             });

+ 20 - 14
src/views/teamBuild/components/teamSoundMoney.vue

@@ -68,22 +68,25 @@
                          width="180">
           <template slot-scope="scope">
             <div>
-              <div class="chiose"
-                   v-if='scope.row.type == 1'
-                   v-popover:popover>选择</div>
+              <!-- <div class="chiose"
+                  >选择</div> -->
               <p v-if='scope.row.type == 2'>{{scope.row.fangshi}}</p>
-              <el-popover @show="handleStatus(scope)"
-                          placement="bottom"
-                          v-model="visible2">
-                <el-input placeholder="啦啦啦"
-                          v-model="scope.row.fangshi"></el-input>
+              <el-popover placement="bottom"
+                          v-model="scope.row.visible"
+                          v-if='scope.row.type == 1'>
+                <div slot='reference'
+                     class='chiose'>
+                  操作
+                </div>
+                <el-input v-model="scope.row.fangshi"></el-input>
+                1111
                 <div style="text-align: right; margin: 0">
                   <el-button size="mini"
                              type="text"
-                             @click="visible2 = false">取消</el-button>
+                             @click="scope.row.visible = false">取消</el-button>
                   <el-button type="primary"
                              size="mini"
-                             @click="visible2 = false">确定</el-button>
+                             @click="scope.row.visible  = false">确定</el-button>
                 </div>
               </el-popover>
             </div>
@@ -130,19 +133,20 @@ export default {
         fangshi: 2,
         jiaopu: 'jiaopu1',
         type: 1,
-        id: 1
+        id: 1,
+        visible: false
       },
       {
         sound: '短笛',
         jihua: '10',
         yuji: '10',
         zhonglei: [],
-        fangshi: 1,
+        fangshi: 9,
         jiaopu: 'jiaopu1',
         type: 1,
-        id: 1
+        id: 1,
+        visible: false
       }],
-      visible2: false
     }
   },
   methods: {
@@ -190,6 +194,8 @@ export default {
     font-size: 14px;
     color: #444;
     align-items: center;
+    position: relative;
+    z-index: 1;
     .remove {
       width: 98px;
       height: 32px;

+ 2 - 2
vue.config.js

@@ -16,8 +16,8 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // const port = process.env.port || process.env.npm_config_port || 9528 // dev port
 // http://47.99.212.176:8000
 // http://192.168.3.28:8000
-// let target = 'http://47.99.212.176:8000'
-let target = 'http://192.168.3.28:8000'
+let target = 'http://47.99.212.176:8000'
+// let target = 'http://192.168.3.28:8000'
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**