Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

config/dev.env.js

@@ -6,5 +6,5 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API:'"http://localhost:9529"', //'"http://112.74.16.180:9527"', //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
+  BASE_API: '"http://112.74.16.180:9527"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com http://112.74.16.180:9527
 }

src/styles/index.scss

@@ -458,7 +458,7 @@ code {
   // z-index: 9999!important;
 }
 .el-message{
-  z-index: 2004!important;
+  z-index: 99999!important;
 }
 .el-select-dropdown{
   // z-index: 2003!important;

src/views/layout/components/TagsView.vue

@@ -1,8 +1,14 @@
 <template>
   <div class="tags-view-container">
     <scroll-pane class='tags-view-wrapper' ref='scrollPane'>
-      <router-link ref='tag' class="tags-view-item" :class="isActive(tag)?'active':''" v-for="tag in Array.from(visitedViews)"
-        :to="tag" :key="tag.path" @contextmenu.prevent.native="openMenu(tag,$event)">
+      <router-link 
+        ref='tag' 
+        class="tags-view-item" 
+        :class="isActive(tag)?'active':''" 
+        v-for="tag in Array.from(visitedViews)"
+        :to="tag" 
+        :key="tag.path" 
+        @contextmenu.prevent.native="openMenu(tag,$event)">
         {{generateTitle(tag.title)}}
         <span class='el-icon-close' @click.prevent.stop='closeSelectedTag(tag)'></span>
       </router-link>
@@ -18,7 +24,7 @@
 <script>
 import ScrollPane from '@/components/ScrollPane'
 import { generateTitle } from '@/utils/i18n'
-
+  
 export default {
   components: { ScrollPane },
   data() {

src/xt_pages/user/components/PatientForm.vue

@@ -989,9 +989,6 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 
-.uploadHead {
-  // margin-top: 25%;
-}
 .uploadHeadBtn {
   width: 148px;
   margin-top: 10px;
@@ -1001,7 +998,6 @@ export default {
     width: 430px;
     }
   .el-form-item {
-    // margin-bottom: 17px !important;
     .el-select {
       width: 100%;
     }
@@ -1016,5 +1012,9 @@ export default {
     }
   }
 }
+.el-select-dropdown,
+.el-popper{
+  z-index: 2000!important;
+}
 </style>
 

src/xt_pages/workforce/components/setup_template_dialog.vue

@@ -11,8 +11,8 @@
             </el-form-item>
         </el-form>
         <div style="text-align: right; padding-right: 25px; padding-top: 10px; padding-bottom: 10px;">
-            <el-button @click="hide">取消</el-button>
-            <el-button :disabled="$store.getters.xt_user.subscibe.state == 3 ? true : false" type="primary" @click="saveAction">确定</el-button>
+            <el-button @click="hide">取 消</el-button>
+            <el-button :disabled="$store.getters.xt_user.subscibe.state == 3 ? true : false" type="primary" @click="saveAction">保 存</el-button>
         </div>
     </el-dialog>
 </template>