首页 发现 帮助
注册 登录
front
/
preliminary
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

bug3224,3217,3207,3233

luolei 5 年之前
父节点
73d0e9ff0e
当前提交
67470c140e
共有 6 个文件被更改，包括 85 次插入 和 11 次删除
合并视图 显示文件统计
  1. 2 1
      config/index.js
  2. 2 0
      src/App.vue
  3. 56 0
      src/common/Head.vue
  4. 10 3
      src/common/UsualSymptom.vue
  5. 9 6
      src/components/MainPage.vue
  6. 6 1
      src/less/index.less

+ 2 - 1
config/index.js
查看文件 

@@ -5,8 +5,9 @@
 
 const path = require('path')
 
 const path = require('path')
 
 // const proxy_path = 'http://192.168.2.236:80';
 
 // const proxy_path = 'http://192.168.2.236:80';
 
 // const proxy_path = 'http://192.168.2.236:5050';
 
 // const proxy_path = 'http://192.168.2.236:5050';
 
-const proxy_path = 'http://192.168.2.241:5050';
 
+// const proxy_path = 'http://192.168.2.241:5050';
 
 // const proxy_path = 'http://223.93.170.82:23650';
 
 // const proxy_path = 'http://223.93.170.82:23650';
 
+const proxy_path = 'http://223.93.170.82:24182';
 
 
 
 module.exports = {
 
 module.exports = {
 
   dev: {
 
   dev: {

+ 2 - 0
src/App.vue
查看文件 

@@ -4,6 +4,8 @@
 
         <portal-target name="notification-outlet"></portal-target>
 
         <portal-target name="notification-outlet"></portal-target>
 
         <portal-target name="notification-detail"></portal-target>
 
         <portal-target name="notification-detail"></portal-target>
 
         <portal-target name="notification-search"></portal-target>
 
         <portal-target name="notification-search"></portal-target>
 
+        <portal-target name="notification-usual"></portal-target>
 
+        <portal-target name="notification-head"></portal-target>
 
     </div>
 
     </div>
 
 </template>
 
 </template>
 
 <script>
 
 <script>

+ 56 - 0
src/common/Head.vue
查看文件 

@@ -0,0 +1,56 @@
 
+<template>
 
+  <portal to="notification-head">
 
+    <div class="progress-bar">
 
+      <div class="title">
 
+        <span :class="{'active':activeTab==i.type}" :style="{width:(100/allMoudles.length)+'%'}" v-for="i in allMoudles">{{i.name}}</span>
 
+      </div>
 
+      <div class="progress">
 
+        <p :style="{width:progress}"></p>
 
+      </div>
 
+    </div>
 
+  </portal>
 
+</template>
 
+<script>
 
+export default {
 
+  props:['activeTab','allMoudles','progress']
 
+}
 
+</script>
 
+<style lang="less" scoped>
 
+@import "../less/base.less";
 
+
 
+.progress-bar {
 
+  height: .8rem;
 
+  line-height: 0.44rem;
 
+  background: #fff;
 
+  color: #aaa;
 
+  /*margin-bottom:.4rem;*/
 
+  .title{
 
+    height: 100%;
 
+  }
 
+  span{
 
+    display: inline-block;
 
+    font-size: .26rem;
 
+    color: #aaa;
 
+    text-align: center;
 
+    &:not(:last-child):after{
 
+        content: ">";
 
+        float: right;
 
+        color: #aaa;
 
+     }
 
+  }
 
+  .active{
 
+    font-size: #font[dialog];
 
+    color: #colors[theme];
 
+    font-weight: 500;
 
+  }
 
+  .progress{
 
+    height:0.06rem;
 
+    background:#F5F5F5;
 
+    p{
 
+      width:.1px;
 
+      height: 100%;
 
+      background: #colors[theme];
 
+    }
 
+  }
 
+}
 
+</style>

+ 10 - 3
src/common/UsualSymptom.vue
查看文件 

@@ -1,4 +1,5 @@
 
 <template>
 
 <template>
 
+  <portal to="notification-usual">
 
   <div class="usual-symptom">
 
   <div class="usual-symptom">
 
     <p class="title-bar">
 
     <p class="title-bar">
 
       <!--<a href="javascript:void(0)">--><img @click="back" src="../images/back.png" alt="返回"/><!--</a>-->
 
       <!--<a href="javascript:void(0)">--><img @click="back" src="../images/back.png" alt="返回"/><!--</a>-->
 
@@ -29,6 +30,7 @@
 
     <Tiptoast :show="showExp" :data="message" @close="closeTip"/>
 
     <Tiptoast :show="showExp" :data="message" @close="closeTip"/>
 
     <!-- <ConfirmBox :show="showConfirm" @confirmDialog="confirmDialog" @cancelDialog = "cancelDialog"></ConfirmBox> -->
 
     <!-- <ConfirmBox :show="showConfirm" @confirmDialog="confirmDialog" @cancelDialog = "cancelDialog"></ConfirmBox> -->
 
   </div>
 
   </div>
 
+  </portal>
 
 </template>
 
 </template>
 
 <script>
 
 <script>
 
   import Radio from './Radio';
 
   import Radio from './Radio';
 
@@ -122,15 +124,20 @@
 
     position: fixed;
 
     position: fixed;
 
     bottom: 0;
 
     bottom: 0;
 
     background: #fff;
 
     background: #fff;
 
-    padding: .38rem .1rem;
 
+    padding: .2rem .1rem;
 
     box-shadow: 0 0 30px -10px rgba(104, 124, 189, 0.25);
 
     box-shadow: 0 0 30px -10px rgba(104, 124, 189, 0.25);
 
   }
 
   }
 
   .title-bar{
 
   .title-bar{
 
     font-size: #font[title];
 
     font-size: #font[title];
 
-    margin:0 0 .5rem .2rem;
 
+    overflow: hidden;
 
     img{
 
     img{
 
       width: .16rem;
 
       width: .16rem;
 
-      margin-right:.4rem;
 
+      padding: .2rem .4rem .4rem .2rem;
 
+      float: left;
 
+    }
 
+    span {
 
+      padding-top: .1rem;
 
+      float: left;
 
     }
 
     }
 
   }
 
   }
 
   .radio-item{
 
   .radio-item{

+ 9 - 6
src/components/MainPage.vue
查看文件 

@@ -1,13 +1,14 @@
 
 <template>
 
 <template>
 
   <div class="page">
 
   <div class="page">
 
-    <div class="progress-bar">
 
+    <Head :activeTab='activeTab' :allMoudles='allMoudles' :progress='progress'/>
 
+    <!-- <div class="progress-bar">
 
       <div class="title">
 
       <div class="title">
 
         <span :class="{'active':activeTab==i.type}" :style="{width:(100/allMoudles.length)+'%'}" v-for="i in allMoudles">{{i.name}}</span>
 
         <span :class="{'active':activeTab==i.type}" :style="{width:(100/allMoudles.length)+'%'}" v-for="i in allMoudles">{{i.name}}</span>
 
       </div>
 
       </div>
 
       <div class="progress">
 
       <div class="progress">
 
         <p :style="{width:progress}"></p>
 
         <p :style="{width:progress}"></p>
 
       </div>
 
       </div>
 
-    </div>
 
+    </div> -->
 
     <div class="wrapper">
 
     <div class="wrapper">
 
       <div class="scrollPart" :style="{'paddingBottom':pdbm}">
 
       <div class="scrollPart" :style="{'paddingBottom':pdbm}">
 
         <!--<div class="right clearfix">
 
         <!--<div class="right clearfix">
 
@@ -100,6 +101,7 @@ import ConfirmBox from '../common/ConfirmBox'
 
 import UsualSymptom from '../common/UsualSymptom';
 
 import UsualSymptom from '../common/UsualSymptom';
 
 import MultSelect from '../common/MultSelect.vue';
 
 import MultSelect from '../common/MultSelect.vue';
 
 import TipWarning from '../common/TipWarning.vue';
 
 import TipWarning from '../common/TipWarning.vue';
 
+import Head from '../common/Head.vue';
 
 import api from "../utils/api.js";
 
 import api from "../utils/api.js";
 
 import {mapState} from 'vuex';
 
 import {mapState} from 'vuex';
 
 import {moduleCP,moduleConfig,getValuesArr,getNSum} from '@utils/tools'
 
 import {moduleCP,moduleConfig,getValuesArr,getNSum} from '@utils/tools'
 
@@ -429,7 +431,8 @@ export default {
 
     ConfirmBox,
 
     ConfirmBox,
 
     UsualSymptom,
 
     UsualSymptom,
 
     MultSelect,
 
     MultSelect,
 
-    TipWarning
 
+    TipWarning,
 
+    Head
 
   }
 
   }
 
 }
 
 }
 
 </script>
 
 </script>
 
@@ -454,9 +457,9 @@ export default {
 
   background: #fff;
 
   background: #fff;
 
   color: #aaa;
 
   color: #aaa;
 
   /*margin-bottom:.4rem;*/
 
   /*margin-bottom:.4rem;*/
 
-.title{
 
-  height: 100%;
 
-}
 
+  .title{
 
+    height: 100%;
 
+  }
 
   span{
 
   span{
 
     display: inline-block;
 
     display: inline-block;
 
     font-size: .26rem;
 
     font-size: .26rem;

+ 6 - 1
src/less/index.less
查看文件 

@@ -5,9 +5,14 @@ body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, input, textarea, p, t
 
   font-family: Arial, sans-serif, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB";
 
   font-family: Arial, sans-serif, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB";
 
   color: #333333;
 
   color: #333333;
 
   // -webkit-text-size-adjust:100%;
 
   // -webkit-text-size-adjust:100%;
 
-  -webkit-text-size-adjust:auto;
 
+  // -webkit-text-size-adjust:auto;
 
   -webkit-tap-highlight-color: rgba(0,0,0,0);
 
   -webkit-tap-highlight-color: rgba(0,0,0,0);
 
   -webkit-tap-highlight-color: transparent;
 
   -webkit-tap-highlight-color: transparent;
 
+
 
+  -webkit-text-size-adjust : none ;
 
+  -moz-text-size-adjust : none ;
 
+  -ms-text-size-adjust : none ;
 
+  text-size-adjust : none
 
 }
 
 }
 
 input, textarea{
 
 input, textarea{
 
   outline: none;
 
   outline: none;