system-phone 3.1.11 → 3.1.13

package/src/bootstrap/less/wells.less

@@ -1,29 +1,29 @@
-//
-// Wells
-// --------------------------------------------------
-
-
-// Base class
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: @well-bg;
-  border: 1px solid @well-border;
-  border-radius: @border-radius-base;
-  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
-  blockquote {
-    border-color: #ddd;
-    border-color: rgba(0,0,0,.15);
-  }
-}
-
-// Sizes
-.well-lg {
-  padding: 24px;
-  border-radius: @border-radius-large;
-}
-.well-sm {
-  padding: 9px;
-  border-radius: @border-radius-small;
-}
+//
+// Wells
+// --------------------------------------------------
+
+
+// Base class
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: @well-bg;
+  border: 1px solid @well-border;
+  border-radius: @border-radius-base;
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+  blockquote {
+    border-color: #ddd;
+    border-color: rgba(0,0,0,.15);
+  }
+}
+
+// Sizes
+.well-lg {
+  padding: 24px;
+  border-radius: @border-radius-large;
+}
+.well-sm {
+  padding: 9px;
+  border-radius: @border-radius-small;
+}

package/src/components/AloneLoadParams.vue

@@ -1,26 +1,26 @@
-<template>
-  <div>
-     <p>获取参数中，请保持网络畅通</p>
-  </div>
-</template>
-
-<script>
-import co from 'co'
-import Vue from 'vue'
-import LoadParams from '../plugins/LoadParams'
-
-export default {
-  title: '加载参数',
-  props: {
-    componentName: {
-      type: String
-    }
-  },
-  ready () {
-    LoadParams.load().then(() => {
-      // this.$resetpost(Vue.dataUrl + 'rs/logic/androidLog', {data: {name: 'path', msg: '加载参数成功'}}, {resolveMsg: null, rejectMsg: null})
-      this.$goto(this.componentName)
-    })
-  }
-}
-</script>
+<template>
+  <div>
+     <p>获取参数中，请保持网络畅通</p>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import Vue from 'vue'
+import LoadParams from '../plugins/LoadParams'
+
+export default {
+  title: '加载参数',
+  props: {
+    componentName: {
+      type: String
+    }
+  },
+  ready () {
+    LoadParams.load().then(() => {
+      // this.$resetpost(Vue.dataUrl + 'rs/logic/androidLog', {data: {name: 'path', msg: '加载参数成功'}}, {resolveMsg: null, rejectMsg: null})
+      this.$goto(this.componentName)
+    })
+  }
+}
+</script>

package/src/components/AttendManage.vue

@@ -505,6 +505,7 @@
   }
   .imgs{
     width: 35px;
+    height: 35px;
     margin-top: 15px;
   }
   .pages-bgcolor{

package/src/components/LoadAppdata.vue

@@ -1,38 +1,38 @@
-<template>
-  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
-    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
-    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
-  </div>
-</template>
-
-<script>
-  export default {
-    title: '加载参数',
-    data () {
-      return {
-        msg: '',
-        show: false
-      }
-    },
-    ready () {
-      this.$appdata.load().then(() => {
-        this.$emit('ready')
-      })
-    }
-  }
-</script>
-<style media="screen">
-  .loadingdata {
-    position: fixed;
-    background: #fff;
-    opacity: 0.6;
-    top: 0;
-    width: 100%;
-  }
-  .loaderror {
-    opacity: 1;
-  }
-  .loadsuccess {
-    display: none;
-  }
-</style>
+<template>
+  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
+    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
+    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '加载参数',
+    data () {
+      return {
+        msg: '',
+        show: false
+      }
+    },
+    ready () {
+      this.$appdata.load().then(() => {
+        this.$emit('ready')
+      })
+    }
+  }
+</script>
+<style media="screen">
+  .loadingdata {
+    position: fixed;
+    background: #fff;
+    opacity: 0.6;
+    top: 0;
+    width: 100%;
+  }
+  .loaderror {
+    opacity: 1;
+  }
+  .loadsuccess {
+    display: none;
+  }
+</style>

package/src/components/LoginApp.vue

@@ -152,21 +152,24 @@ export default {
       this.password = val
     },
     // 对资源菜单进行排序
-    sortFunctions(val) {
-      if (val && val.length > 0) {
-        for (var i = 0; i < val.length - 1; i++) {
-          for (var j = 0; j < val.length - 1 - i; j++) {
-            if (val[j].position > val[j + 1].position) {
-              var temp = val[j + 1]
-              val[j + 1] = val[j]
-              val[j] = temp;
-            }
-          }
+    sortFunctions (val) {
+      this.sortArr(val)
+      val.forEach((item)=>{
+        if(item.children && Array.isArray(item.children)){
+          this.sortArr(item.children)
         }
-        return val
-      }
+      })
       return val
     },
+    sortArr(val){
+      val.sort((itemA, itemB)=>{
+        if(itemA.position !== itemB.position){
+          return itemA.position - itemB.position
+        }else{
+          return itemA.id - itemB.id
+        }
+      })
+    },
     // 记住密码选中/未选中
     showoff() {
       this.showsave = false

package/src/components/LoginAppNew.vue

@@ -118,21 +118,24 @@
     },
       methods: {
       // 对资源菜单进行排序
-      sortFunctions(val){
-          if(val && val.length > 0){
-            for(var i = 0;i<val.length-1;i++){
-              for(var j = 0;j<val.length-1-i;j++){
-                  if(val[j].position > val[j+1].position){
-                    var temp = val[j+1]
-                    val[j+1] = val[j]
-                    val[j] = temp;
-                  }
-              }
+        sortFunctions (val) {
+          this.sortArr(val)
+          val.forEach((item)=>{
+            if(item.children && Array.isArray(item.children)){
+              this.sortArr(item.children)
             }
-            return val
-          }
+          })
           return val
-      },
+        },
+        sortArr(val){
+          val.sort((itemA, itemB)=>{
+            if(itemA.position !== itemB.position){
+              return itemA.position - itemB.position
+            }else{
+              return itemA.id - itemB.id
+            }
+          })
+        },
       // 记住密码选中/未选中
       showoff(){
         this.showsave = false