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

src/api/manage.js

     limit: limit,
     page: page
   }
+  console.log('params', params)
   return request({
     url: '/api/manage/queryinfo',
     method: 'Get',

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

               住院号：
               <div
                 class="under_line"
-                style="width: 50px;text-align: left"
+                style="width: 70px;text-align: left"
                 v-if="record.receive_assessment.admission_number"
               >{{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}</div>
-              <div class="under_line" style="width: 50px;" v-else>{{'/'}}</div>
+              <div class="under_line" style="width: 70px;" v-else>{{'/'}}</div>
             </div>
             <div class="inline_block" style="margin-left:5px;">
               姓名：
               诊断：
               <div
                 class="under_line_two"
-                style="width: 160px;text-align: left"
+                style="width: 150px;text-align: left"
               >{{record.patient.diagnose}}</div>
             </div>
           </div>
                 诊断：
                 <div
                   class="under_line_two"
-                  style="width: 180px;text-align: left"
+                  style="width: 150px;text-align: left"
                 >{{record.patient.diagnose}}</div>
               </div>
             </div>
                 style="width: 70px;text-align: left"
                 v-if="record.receive_assessment.admission_number"
               >{{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}</div>
-              <div class="under_line" style="width: 50px;" v-else>{{'/'}}</div>
+              <div class="under_line" style="width: 70px;" v-else>{{'/'}}</div>
             </div>
             <div class="inline_block" style="margin-left:5px;">
               姓名：
               诊断：
               <div
                 class="under_line_two"
-                style="width: 160px;text-align: left"
+                style="width: 150px;text-align: left"
               >{{record.patient.diagnose}}</div>
             </div>
           </div>
                   诊断：
                   <div
                     class="under_line_two"
-                    style="width: 180px;text-align: left"
+                    style="width: 150px;text-align: left"
                   >{{record.patient.diagnose}}</div>
                 </div>
               </div>

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

             </div>
             <div class="inline_block" style="margin-left: 5px;">
               住院号：
-              <div class="under_line" style="width: 50px;text-align: left" v-if="record.receive_assessment.admission_number">
+              <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
                 {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
               </div>
-              <div class="under_line" style="width: 50px;" v-else>
+              <div class="under_line" style="width: 70px;" v-else>
                 {{'/'}}
               </div>
             </div>
 
             <div class="inline_block" style="margin-left: 5px;">
               诊断：
-              <div class="under_line_two" style="width: 160px;text-align: left">{{record.patient.diagnose}}</div>
+              <div class="under_line_two" style="width: 150px;text-align: left">{{record.patient.diagnose}}</div>
             </div>
 
           </div>
 
               <div class="inline_block" style="margin-left: 10px;">
                 诊断：
-                <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
+                <div class="under_line_two" style="width: 150px;text-align: left">{{record.patient.diagnose}}</div>
               </div>
 
             </div>

src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue

             </div>
             <div class="inline_block" style="margin-left: 5px;">
               住院号：
-              <div class="under_line" style="width: 50px;text-align: left" v-if="record.receive_assessment.admission_number">
+              <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
                 {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
               </div>
-              <div class="under_line" style="width: 50px;" v-else>
+              <div class="under_line" style="width: 70px;" v-else>
                 {{'/'}}
               </div>
             </div>
 
             <div class="inline_block" style="margin-left: 5px;">
               诊断：
-              <div class="under_line_two" style="width: 160px;text-align: left">{{record.patient.diagnose}}</div>
+              <div class="under_line_two" style="width: 150px;text-align: left">{{record.patient.diagnose}}</div>
             </div>
 
           </div>
 
                 <div class="inline_block" style="margin-left: 10px;">
                   诊断：
-                  <div class="under_line_two" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
+                  <div class="under_line_two" style="width: 150px;text-align: left">{{record.patient.diagnose}}</div>
                 </div>
 
               </div>

src/xt_pages/dialysis/bulletinBoard.vue

 </template>
 
 <script>
-import { getBoards } from "@/api/board";
-import bulletinboard from "./components/bulletinboard";
-import { parseTime } from "@/utils";
-import BreadCrumb from "../components/bread-crumb";
-import screenfull from "screenfull";
+import { getBoards } from '@/api/board'
+import bulletinboard from './components/bulletinboard'
+import { parseTime } from '@/utils'
+import BreadCrumb from '../components/bread-crumb'
+import screenfull from 'screenfull'
 export default {
   components: { BreadCrumb, bulletinboard },
-  name: "bulletinBoard",
+  name: 'bulletinBoard',
   data() {
     return {
       dialogTableVisible: false,
       showSetting: false,
       crumbs: [
-        { path: false, name: "透析管理" },
-        { path: "dialysis/board", name: "数据看板" }
+        { path: false, name: '透析管理' },
+        { path: 'dialysis/board', name: '数据看板' }
       ],
-      orgname: "",
-      today: "今天",
-      week: "--",
-      timer:null,
-      rightItem: "board-right-menu-item",
+      orgname: '',
+      today: '今天',
+      week: '--',
+      timer: null,
+      rightItem: 'board-right-menu-item',
       boardData: [],
       showTime: 120,
       currentPage: 0,
       loading: true,
-      weekDay: ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
-      roonOptions: { 1: "上午", 2: "下午", 3: "晚上" },
+      weekDay: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+      roonOptions: { 1: '上午', 2: '下午', 3: '晚上' },
       modeOptions: {}
-    };
+    }
   },
   created() {
-    var xtuser = this.$store.getters.xt_user;
-    this.orgname = xtuser.org.org_name;
+    var xtuser = this.$store.getters.xt_user
+    this.orgname = xtuser.org.org_name
     // this.orgname = "遂溪方济医院";
-    this.modeOptions = this.$store.getters.treatment_mode;
-    this.initData();
-  }, beforeDestroy () {
+    this.modeOptions = this.$store.getters.treatment_mode
+    this.initData()
+  }, beforeDestroy() {
     clearInterval(this.timer)
     this.timer = null
     this.$once('hook:beforeDestroy', () => {
   },
   methods: {
     fullscreenboard: function() {
-      this.dialogTableVisible = true;
+      this.dialogTableVisible = true
       // let routeData = this.$router.resolve({ path: '/fullscreenboard' })
       // window.open(routeData.href, '_blank')
     },
     outfullscreenboard: function() {
-      this.dialogTableVisible = false;
-      this.showSetting = false;
+      this.dialogTableVisible = false
+      this.showSetting = false
     },
     togglefullscreen: function() {
       if (!screenfull.enabled) {
         this.$message({
-          message: "你的浏览器不支持",
-          type: "warning"
-        });
-        return false;
+          message: '你的浏览器不支持',
+          type: 'warning'
+        })
+        return false
       }
-      screenfull.toggle();
-      this.showSetting = false;
+      screenfull.toggle()
+      this.showSetting = false
     },
     openSetting() {
       if (this.showSetting == false) {
-        this.showSetting = true;
+        this.showSetting = true
       } else {
-        this.showSetting = false;
+        this.showSetting = false
       }
     },
     initData: function() {
-      var _this = this;
-      var timeOut = this.showTime * 1000;
-      this.currentPage++;
-      this.getBoards();
+      var _this = this
+      var timeOut = this.showTime * 1000
+      this.currentPage++
+      this.getBoards()
 
       this.timer = window.setInterval(() => {
         setTimeout(this.getBoards(), 0)
-      }, timeOut)
-
+      }, 120000)
     },
     getBoards: function() {
       getBoards(this.currentPage).then(response => {
-        this.loading = false;
-        var r = response.data;
+        this.loading = false
+        var r = response.data
         if (r.state == 0) {
-          this.$message.error(r.msg);
-          return false;
+          this.$message.error(r.msg)
+          return false
         } else {
           if (r.data.boards.length == 0) {
-            this.currentPage = 1;
-            this.getBoards();
+            this.currentPage = 1
+            // this.getBoards()
           } else {
-            this.today = r.data.today;
+            this.today = r.data.today
             this.week =
-              r.data.week in this.weekDay ? this.weekDay[r.data.week] : "--";
-            this.boardData = r.data.boards;
+              r.data.week in this.weekDay ? this.weekDay[r.data.week] : '--'
+            this.boardData = r.data.boards
           }
         }
-      });
+      })
     },
     modeName: function(mode_id) {
-      return mode_id in this.modeOptions ? this.modeOptions[mode_id].name : "";
+      return mode_id in this.modeOptions ? this.modeOptions[mode_id].name : ''
     },
     boradData: function(record) {
       if (record.dialysis_order) {
         if (record.dialysis_order.stage == 2) {
-          return "已下机";
+          return '已下机'
         } else {
-          return "透析中";
+          return '透析中'
         }
       } else if (record.sign) {
-        return "已签到";
+        return '已签到'
       } else {
-        return "未签到";
+        return '未签到'
       }
     },
     nextSchedule: function(nextlist) {
       if (nextlist.length == 0) {
-        return "——";
+        return '——'
       }
-      var dayTime = parseTime(nextlist[0].schedule_date, "{m}月{d}日");
+      var dayTime = parseTime(nextlist[0].schedule_date, '{m}月{d}日')
       var noon =
         nextlist[0].schedule_type in this.roonOptions
-          ? " " + this.roonOptions[nextlist[0].schedule_type]
-          : "";
-      return dayTime + noon;
+          ? ' ' + this.roonOptions[nextlist[0].schedule_type]
+          : ''
+      return dayTime + noon
     }
   }
-};
+}
 </script>
 
 <style lang="scss" scoped>

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

         </div>
         <div class="inline_block" style="margin-left: 5px;">
           住院号：
-          <div class="under_line" style="width: 50px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
+          <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
             {{patientInfo_source_2?receiverTreatmentAccess.admission_number: '/'}}
           </div>
-          <div class="under_line" style="width: 50px;text-align: left" v-else>
+          <div class="under_line" style="width: 70px;text-align: left" v-else>
             {{'/'}}
           </div>
         </div>
         </div>
         <div class="inline_block" style="margin-left: 5px;">
           诊断：
-          <div class="under_line" style="width: 160px;text-align: left">{{patientInfo.diagnose}}</div>
+          <div class="under_line" style="width: 150px;text-align: left">{{patientInfo.diagnose}}</div>
         </div>
       </div>
 
         </div>
         <div class="inline_block" style="margin-left: 5px;">
           住院号：
-          <div class="under_line" style="width: 50px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
+          <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
             {{patientInfo_source_2?receiverTreatmentAccess.admission_number:'/'}}
           </div>
-          <div class="under_line" style="width: 50px;text-align: left" v-else>
+          <div class="under_line" style="width: 70px;text-align: left" v-else>
             {{'/'}}
           </div>
         </div>
         </div>
         <div class="inline_block" style="margin-left: 5px;">
           诊断：
-          <div class="under_line" style="width:160px;text-align: left">{{patientInfo.diagnose}}</div>
+          <div class="under_line" style="width:150px;text-align: left">{{patientInfo.diagnose}}</div>
         </div>
       </div>
 

src/xt_pages/management/components/UserForm.vue

       ).then(response => {
         if (response.data.state === 1) {
           var information = response.data.data.infor;
-          console.log("information",information)
+          console.log("information", information);
           for (let index = 0; index < information.length; index++) {
             if (information[index].class === 0) {
               information[index].class = "";