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

src/api/manage.js

@@ -1,20 +1,20 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 export function getAllSubregion(params) {
   return request({
-    url: "/api/management/getallsubregion",
-    method: "Get",
+    url: '/api/management/getallsubregion',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function SaveManageInfo(data) {
-  console.log("data是什么", data);
+  console.log('data是什么', data)
   return request({
-    url: "/api/management/savemanageinfo",
-    method: "Post",
+    url: '/api/management/savemanageinfo',
+    method: 'Post',
     data: data
-  });
+  })
 }
 
 export function getAllMachineInfo(
@@ -25,12 +25,12 @@ export function getAllMachineInfo(
   equipmentid,
   statusid
 ) {
-  console.log("page", page);
-  console.log("limit", limit);
-  console.log("zoneid", zoneid);
-  console.log("equipmentid", equipmentid);
-  console.log("statusid", statusid);
-  console.log("seacherkey", searchKey);
+  console.log('page', page)
+  console.log('limit', limit)
+  console.log('zoneid', zoneid)
+  console.log('equipmentid', equipmentid)
+  console.log('statusid', statusid)
+  console.log('seacherkey', searchKey)
   const params = {
     page: page,
     limit: limit,
@@ -38,112 +38,166 @@ export function getAllMachineInfo(
     zoneid: zoneid,
     equipmentid: equipmentid,
     statusid: statusid
-  };
+  }
   return request({
-    url: "/api/management/getallmachineinfo",
-    method: "Get",
+    url: '/api/management/getallmachineinfo',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function getAllMachine(zoneid, classid, deviceid) {
-  console.log("zoneid", zoneid);
-  console.log("classid", classid);
-  console.log("deviceid", deviceid);
+  console.log('zoneid', zoneid)
+  console.log('classid', classid)
+  console.log('deviceid', deviceid)
   const params = {
     zoneid: zoneid,
     classid: classid,
     deviceid: deviceid
-  };
+  }
   return request({
-    url: "/api/management/getallmachine",
-    method: "Get",
+    url: '/api/management/getallmachine',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function getMachineDetailById(id, params) {
   return request({
-    url: "/api/management/getmachinedetail?id=" + id,
-    method: "Get",
+    url: '/api/management/getmachinedetail?id=' + id,
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function UpdateMachineInfo(data) {
-  console.log("data是什么", data);
   return request({
-    url: "/api/management/updatemachineinfo",
-    method: "Post",
+    url: '/api/management/updatemachineinfo',
+    method: 'Post',
     data: data
-  });
+  })
 }
 
 export function getAllEquimentName(params) {
   return request({
-    url: "/api/management/getallequimentname",
-    method: "Get",
+    url: '/api/management/getallequimentname',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function savePlan(data, id) {
-  console.log("data是什么", data);
-  console.log("id", id);
+  console.log('data是什么', data)
+  console.log('id', id)
   return request({
-    url: "/api/management/saveplan?id=" + id,
-    method: "Post",
+    url: '/api/management/saveplan?id=' + id,
+    method: 'Post',
     data: data
-  });
+  })
 }
 
 export function getAllPlan(params) {
   return request({
-    url: "/api/management/getallplan",
-    method: "Get",
+    url: '/api/management/getallplan',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function getAllPlanDetail(id, params) {
   return request({
-    url: "/api/management/getallplandetail?id=" + id,
-    method: "Get",
+    url: '/api/management/getallplandetail?id=' + id,
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function getEditMachine(id, params) {
-  console.log("id", id);
   return request({
-    url: "/api/management/geteditmachine?id=" + id,
-    method: "Get",
+    url: '/api/management/geteditmachine?id=' + id,
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function DeletePlans(data) {
-  console.log("删除的数据是?", data);
   return request({
-    url: "/api/staff/deleteplans",
-    method: "delete",
+    url: '/api/staff/deleteplans',
+    method: 'delete',
     data: data
-  });
+  })
 }
 
 export function EditPlanDetail(id, params) {
   return request({
-    url: "/api/manage/editplandetail?id=" + id,
-    method: "get",
+    url: '/api/manage/editplandetail?id=' + id,
+    method: 'get',
     params: params
-  });
+  })
 }
 
 export function UpdatePlanInfo(data) {
-  console.log("data是什么", data);
   return request({
-    url: "/api/manage/updateplaninfo",
-    method: "Post",
+    url: '/api/manage/updateplaninfo',
+    method: 'Post',
     data: data
-  });
+  })
+}
+
+export function getComprehensive(params) {
+  return request({
+    url: '/api/manage/getcomprehensive',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function SaveInformation(data) {
+  return request({
+    url: '/api/manage/saveinformation',
+    method: 'Post',
+    data: data
+  })
+}
+
+export function getPatientInfo(id, params) {
+  return request({
+    url: '/api/manage/getpatientinfo?id=' + id,
+    method: 'Get',
+    params: params
+  })
+}
+
+export function ChangeClass(equitid, id) {
+  const params = {
+    equitid: equitid,
+    id: id
+  }
+  return request({
+    url: '/api/manage/changeclass',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function changePatient(equitid, id) {
+  console.log('equitid', equitid)
+  console.log('id', id)
+  const params = {
+    equitid: equitid,
+    id: id
+  }
+  return request({
+    url: '/api/manage/changepatient',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getAllOrganization(params) {
+  return request({
+    url: '/api/manage/getallorganization',
+    method: 'Get',
+    params: params
+  })
 }

src/router/modules/device.js

@@ -39,6 +39,7 @@ export default {
     {
       path: "/device/main",
       component: () => import("@/xt_pages/management/index"),
+      // component: () => import('@/xt_pages/device/main'),
       name: "dialysisMachineManage",
       meta: {
         title: "dialysisMachineManage"

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -194,6 +194,45 @@
                     <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==5">
                       HF
                     </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==6">
+                      SCUF
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==7">
+                      IUF
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==8">
+                      HFHD
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==9">
+                      HFHD+HP
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==10">
+                      PHF
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==11">
+                      HFR
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==12">
+                      HDF+HP
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==13">
+                      CRRT
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==14">
+                      腹水回输
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==15">
+                      HD前置换
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==16">
+                      HD后置换
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==17">
+                      HDF前置换
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==18">
+                      HDF后置换
+                    </div>
                   </div>
 
                   <div class="inline_block" style="margin-left:10px;flex:1;">

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -820,8 +820,8 @@
               </div>
               <div class="inline_block">
                 &emsp;实际超滤量：
-                <div class="under_line" style="width: 70px;text-align: left" v-if="getFloat(afterdialysis.actual_ultrafiltration)">
-                  {{getFloat(afterdialysis.actual_ultrafiltration)}}
+                <div class="under_line" style="width: 70px;text-align: left" v-if="getFloat(prescription.ultrafiltration)">
+                  {{getFloat(prescription.ultrafiltration)}}
                 </div>
                 <div class="under_line" style="width: 70px;" v-else>
                   {{'/'}}

src/xt_pages/home/index.vue

@@ -1,43 +1,51 @@
 <template>
-<div class="main-contain">
-  <!-- <div class="position">
+  <div class="main-contain">
+    <!-- <div class="position">
     <bread-crumb></bread-crumb>
-  </div> -->
-  <section class=" app-container app-main-bg">
-    <div class="home-page">
-      <div class="search clearfix">
-        <input type="text" class="search-input" placeholder="病人姓名/透析号" v-model="searchKey" >
-        <button class="search-button" @click="clickSearch">搜索</button>
-      </div>
-      <div class="ui-step clearfix">
-        <h2 class="ui-step-tit">病人透析治疗流程</h2>
-        <ul class="ui-step-ul">
-          <li v-for="(item, index) in steps" :key="index" class="ui-step-done">
-            <div class="ui-step-number"><i /></div>
-            <div class="ui-step-title">{{ item.title }}</div>
-          </li>
-        </ul>
-      </div>
-      <!-- <el-steps :active="5" align-center>
+    </div>-->
+    <section class="app-container app-main-bg">
+      <div class="home-page">
+        <div class="search clearfix">
+          <input type="text" class="search-input" placeholder="病人姓名/透析号" v-model="searchKey" />
+          <button class="search-button" @click="clickSearch">搜索</button>
+        </div>
+        <div class="ui-step clearfix">
+          <h2 class="ui-step-tit">病人透析治疗流程</h2>
+          <ul class="ui-step-ul">
+            <li v-for="(item, index) in steps" :key="index" class="ui-step-done">
+              <div class="ui-step-number">
+                <i />
+              </div>
+              <div class="ui-step-title">{{ item.title }}</div>
+            </li>
+          </ul>
+        </div>
+        <!-- <el-steps :active="5" align-center>
           <el-step  v-for="(item, index) in steps" :key="index" :title="item.title"></el-step>
-      </el-steps> -->
-      <div class="config-process">
-        <h2 class="title">系统使用配置流程</h2>
-        <ul class="process">
-          <router-link v-for="(item, index) in process" tag="li" class="items" :key="index" :to="item.link">
-              <img :src="item.imgUrl" >
+        </el-steps>-->
+        <div class="config-process">
+          <h2 class="title">系统使用配置流程</h2>
+          <ul class="process">
+            <router-link
+              v-for="(item, index) in process"
+              tag="li"
+              class="items"
+              :key="index"
+              :to="item.link"
+            >
+              <img :src="item.imgUrl" />
               <p class="name">{{ item.name }}</p>
-          </router-link>
-        </ul>
+            </router-link>
+          </ul>
+        </div>
       </div>
-    </div>
-    <div class="main-r">
+      <div class="main-r">
         <div class="res-widget">
           <ul>
             <li class="taocan-title clearfix">
-              <div class="taocan-h2 ">{{subscibeBan.used}}</div>
+              <div class="taocan-h2">{{subscibeBan.used}}</div>
               <div class="bar"></div>
-              <div class="taocan-h1 ">{{subscibeBan.name}}</div>
+              <div class="taocan-h1">{{subscibeBan.name}}</div>
             </li>
             <li class="taocan-item">
               <div class="ng-binding" :title="subscibeBan.desc">{{subscibeBan.desc}}</div>
@@ -56,18 +64,16 @@
                 <div class="taocan-use clearfix" :style="subscibeBan.pce"></div>
               </div>
                 <a class="btn clearfix" v-if="subscibeBan.pay_status" href="javascript:0" @click="openPay">立即购买</a>
-            </li> -->
+            </li>-->
           </ul>
         </div>
 
         <div class="res-widget" v-if="patientData.length > 0">
-
           <ul>
             <li class="taocan-title clearfix">
               <div class="bar"></div>
-              <div class="taocan-h1 ">传染病检查提醒通知</div>
+              <div class="taocan-h1">传染病检查提醒通知</div>
             </li>
-
           </ul>
           <el-table
             :data="patientData"
@@ -75,30 +81,25 @@
             highlight-current-row
             :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
           >
-
             <el-table-column label="姓名" align="center">
-              <template slot-scope="scope">
-                {{scope.row.name}}
-              </template>
+              <template slot-scope="scope">{{scope.row.name}}</template>
             </el-table-column>
 
-
             <el-table-column label="检查日期" align="center">
               <template slot-scope="scope">
-               <span v-if="dateCompare(scope.row.infectious_next_record_time) == 1">{{ scope.row.infectious_next_record_time | parseTime('{y}-{m}-{d}')}}</span>
-                <span v-if="dateCompare(scope.row.infectious_next_record_time) == 2" style="color: red">{{ scope.row.infectious_next_record_time | parseTime('{y}-{m}-{d}')}}</span>
-
+                <span
+                  v-if="dateCompare(scope.row.infectious_next_record_time) == 1"
+                >{{ scope.row.infectious_next_record_time | parseTime('{y}-{m}-{d}')}}</span>
+                <span
+                  v-if="dateCompare(scope.row.infectious_next_record_time) == 2"
+                  style="color: red"
+                >{{ scope.row.infectious_next_record_time | parseTime('{y}-{m}-{d}')}}</span>
               </template>
             </el-table-column>
 
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="primary"
-                    @click="jump(scope.row.id)"
-                  >查看
-                  </el-button>
+                <el-button size="mini" type="primary" @click="jump(scope.row.id)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -108,297 +109,353 @@
             :page-size="5"
             background
             style="margin-top:20px;float: right"
-            :total="total">
-          </el-pagination>
+            :total="total"
+          ></el-pagination>
         </div>
 
-     </div>
-
-
-  </section>
+        <el-button type="text" @click="dialogVisible = true">点击打开 Dialog</el-button>
+
+        <el-dialog
+          title="病人姓名"
+          :visible.sync="dialogVisible"
+          width="30%"
+          :before-close="handleClose"
+        >
+          <div class="newLine">
+            <span>本次透析日期</span>
+            <span>123</span>
+          </div>
+          <div class="newLine">
+            <span>透前体重(kg)</span>
+            <span>123</span>
+          </div>
+          <div class="newLine">
+            <span>干体重(kg)</span>
+            <span>123</span>
+          </div>
+          <div class="newLine">
+            <span>衣物重(kg)</span>
+            <span>123</span>
+          </div>
+          <div class="newLine">
+            <span>体重增加(kg)</span>
+            <span>123</span>
+          </div>
+          <div class="newLine">
+            <span>透后体重(kg)</span>
+            <span>123</span>
+          </div>
+          <div class="newLine">
+            <span>体重减少(kg)</span>
+            <span>123</span>
+          </div>
+          <div class="newLine">
+            <span>上次透后体重(kg)</span>
+            <span>123</span>
+          </div>
+
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+          </span>
+        </el-dialog>
+      </div>
+    </section>
   </div>
-
 </template>
 <script>
-import { GetServerTime } from '@/api/public'
-import { GetPatientTotal,GetRemind } from '@/api/patient'
-import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { GetServerTime } from "@/api/public";
+import { GetPatientTotal, GetRemind } from "@/api/patient";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 export default {
-  name: 'Home',
+  name: "Home",
   components: {
     BreadCrumb
   },
   data() {
     return {
-      searchKey: '',
+      dialogVisible: false,
+
+      searchKey: "",
       patientTotal: 0,
-      patientData:[],
+      patientData: [],
       steps: [
-        { title: '透析处方' },
-        { title: '接诊评估' },
-        { title: '透前评估' },
-        { title: '临时医嘱' },
-        { title: '双人核对' },
-        { title: '透析上机' },
-        { title: '透析监测' },
-        { title: '透析下机' },
-        { title: '透后评估' },
-        { title: '治疗小结' }
+        { title: "透析处方" },
+        { title: "接诊评估" },
+        { title: "透前评估" },
+        { title: "临时医嘱" },
+        { title: "双人核对" },
+        { title: "透析上机" },
+        { title: "透析监测" },
+        { title: "透析下机" },
+        { title: "透后评估" },
+        { title: "治疗小结" }
       ],
       process: [
         {
-          imgUrl: require('../../assets/home/equipment.png'),
-          name: '设备管理',
-          link: '/device/main'
+          imgUrl: require("../../assets/home/equipment.png"),
+          name: "设备管理",
+          link: "/device/main"
         },
         {
-          imgUrl: require('../../assets/home/user.png'),
-          name: '病人管理',
-          link: '/patients/patients'
+          imgUrl: require("../../assets/home/user.png"),
+          name: "病人管理",
+          link: "/patients/patients"
         },
         // { imgUrl: require('../../assets/home/sick.png'), name: '登记病人', link: '/patients/create' },
         // { imgUrl: require('../../assets/home/prescription.png'), name: '透析处方', link: '/dialysis/paper' },
         {
-          imgUrl: require('../../assets/home/scheduling.png'),
-          name: '病人排班',
-          link: '/workforce/appointment'
+          imgUrl: require("../../assets/home/scheduling.png"),
+          name: "病人排班",
+          link: "/workforce/appointment"
         },
         {
-          imgUrl: require('../../assets/home/record.png'),
-          name: '透析记录',
-          link: '/dialysis/dialysisrecord'
+          imgUrl: require("../../assets/home/record.png"),
+          name: "透析记录",
+          link: "/dialysis/dialysisrecord"
         },
         {
-          imgUrl: require('../../assets/home/analyze.png'),
-          name: '透析监控',
-          link: '/dialysis/watch'
+          imgUrl: require("../../assets/home/analyze.png"),
+          name: "透析监控",
+          link: "/dialysis/watch"
         }
       ],
       subscibe: {},
       subscibeBan: {
-        used: '已使用0天',
-        name: '免费版本',
-        desc: '当前为免费版',
-        detail: '可管理100位（含）以下患者',
-        leave: '剩余0天',
+        used: "已使用0天",
+        name: "免费版本",
+        desc: "当前为免费版",
+        detail: "可管理100位（含）以下患者",
+        leave: "剩余0天",
         pay_status: false
       },
       serverTime: 0,
       leftTime: false,
-      total:0,
+      total: 0,
       page: 0,
-      limit:5,
-    }
+      limit: 5
+    };
   },
   methods: {
-    dateCompare(date){
-      var date1 =  Date.parse(new Date())/1000;
-      console.log(date)
-      console.log(date1)
-     if (date > date1){
-       return 1
-     }else{
-       return 2
-
-     }
-
-
+    dateCompare(date) {
+      var date1 = Date.parse(new Date()) / 1000;
+      console.log(date);
+      console.log(date1);
+      if (date > date1) {
+        return 1;
+      } else {
+        return 2;
+      }
     },
-    jump(id){
-      this.$router.push({ path: "patients/inspection?id="+id});
+    jump(id) {
+      this.$router.push({ path: "patients/inspection?id=" + id });
     },
-    handleSizeChange(val) {
-
-    }, handleCurrentChange(val) {
-      this.page = val
-      let params = {
-        page : this.page,
-        limit: 5,
-      }
-      this.GetRemindPatientList(params)
+    handleSizeChange(val) {},
+    handleCurrentChange(val) {
+      this.page = val;
+      const params = {
+        page: this.page,
+        limit: 5
+      };
+      this.GetRemindPatientList(params);
     },
-    GetRemindPatientList(params){
-      GetRemind(params).then(response => {
-        if (response.data.state == 1) {
-          this.patientData = response.data.data.patients
-          this.total = response.data.data.total
-        } else {
-          this.$message.error(response.data.msg)
-        }
-      }).catch(e => {
-      })
+    GetRemindPatientList(params) {
+      GetRemind(params)
+        .then(response => {
+          if (response.data.state == 1) {
+            this.patientData = response.data.data.patients;
+            this.total = response.data.data.total;
+          } else {
+            this.$message.error(response.data.msg);
+          }
+        })
+        .catch(e => {});
     },
     GetPatientTotal() {
-      GetPatientTotal().then(response => {
-        if (response.data.state == 1) {
-          this.patientTotal = response.data.data.total
-        } else {
-          this.$message.error(response.data.msg)
-        }
-      }).catch(e => {
-
-      })
+      GetPatientTotal()
+        .then(response => {
+          if (response.data.state == 1) {
+            this.patientTotal = response.data.data.total;
+          } else {
+            this.$message.error(response.data.msg);
+          }
+        })
+        .catch(e => {});
     },
     clickSearch() {
       if (this.searchKey.length > 0) {
-        this.$router.push('/patients/patients?keyword=' + this.searchKey)
+        this.$router.push("/patients/patients?keyword=" + this.searchKey);
       } else {
-        this.$router.push('/patients/patients')
+        this.$router.push("/patients/patients");
       }
     },
     openPay() {
-      this.$router.push('/service/buy')
+      this.$router.push("/service/buy");
     },
     GetServerTime() {
-      GetServerTime().then(response => {
-        if (response.data.state == 1) {
-          this.serverTime = response.data.data.timestamp
-        } else {
-          this.serverTime = Math.round(new Date().getTime() / 1000)
-        }
-      }).catch(() => {
-        this.serverTime = Math.round(new Date().getTime() / 1000)
-      })
+      GetServerTime()
+        .then(response => {
+          if (response.data.state == 1) {
+            this.serverTime = response.data.data.timestamp;
+          } else {
+            this.serverTime = Math.round(new Date().getTime() / 1000);
+          }
+        })
+        .catch(() => {
+          this.serverTime = Math.round(new Date().getTime() / 1000);
+        });
     },
     initSubscibe() {
       // state:1正版(标准),2试用(免费),3其他无效状态,8专业,9(永久免费)，标准版和专业版会过期
-      var used = Math.ceil((this.serverTime - this.subscibe.period_start) / 86400)
+      var used = Math.ceil(
+        (this.serverTime - this.subscibe.period_start) / 86400
+      );
 
-      var leave = ''
-      var pce = ''
+      var leave = "";
+      var pce = "";
 
-      var leaveTime = 0
+      var leaveTime = 0;
 
-      this.subscibe.state = 2// 强制改为免费版
+      this.subscibe.state = 2; // 强制改为免费版
 
       switch (this.subscibe.state) {
         case 9:
           this.subscibeBan = {
-            used: '已使用' + used + '天',
-            name: '永久版',
-            desc: '当前为永久免费版本',
-            detail: '该版本不会过期，并可使用所有功能',
-            leave: '',
+            used: "已使用" + used + "天",
+            name: "永久版",
+            desc: "当前为永久免费版本",
+            detail: "该版本不会过期，并可使用所有功能",
+            leave: "",
             pay_status: false,
-            pce: 'width:100%'
-          }
-          break
+            pce: "width:100%"
+          };
+          break;
         case 2:
           // 免费版本不会过期，但有人数限制，免费版，可以管理20位（含）以下患者，当患者数过了20位，系统不能正常使用，达到18位时，要提醒购买,超过60位，要购买专业版
-          pce = 0
+          pce = 0;
           if (this.patientTotal > 200) {
-            leave = '管理患者数已达' + this.patientTotal + '位，请购买专业版'
-            pce = 100
+            leave = "管理患者数已达" + this.patientTotal + "位，请购买专业版";
+            pce = 100;
           } else if (this.patientTotal > 100) {
-            leave = '管理患者数已达' + this.patientTotal + '位，请购买标准版'
-            pce = 100
+            leave = "管理患者数已达" + this.patientTotal + "位，请购买标准版";
+            pce = 100;
           } else if (this.patientTotal >= 90) {
-            leave = '管理患者数已达' + this.patientTotal + '位，建议购买标准版'
-            pce = Math.round(this.patientTotal / 100 * 100)
+            leave = "管理患者数已达" + this.patientTotal + "位，建议购买标准版";
+            pce = Math.round((this.patientTotal / 100) * 100);
           }
-          pce = 'width:' + pce + '%'
+          pce = "width:" + pce + "%";
           this.subscibeBan = {
-            used: '已使用' + used + '天',
-            name: '免费版',
-            desc: '当前为免费版',
-            detail: '可管理100位（含）以下患者',
+            used: "已使用" + used + "天",
+            name: "免费版",
+            desc: "当前为免费版",
+            detail: "可管理100位（含）以下患者",
             leave: leave,
             pay_status: !!leave,
             pce: pce
-          }
-          break
+          };
+          break;
         case 8:
-          leaveTime = this.subscibe.period_end - this.serverTime
-          this.leftTime = leaveTime
+          leaveTime = this.subscibe.period_end - this.serverTime;
+          this.leftTime = leaveTime;
           if (leaveTime < 0) {
-            leave = '已经过期'
-            pce = '100'
+            leave = "已经过期";
+            pce = "100";
           } else {
-            leave = Math.floor(leaveTime / 86400)
-            leave = leave > 30 ? '' : '剩余' + leave + '天'
-            pce = 100 - Math.round(leaveTime / (this.subscibe.period_end - this.subscibe.period_start) * 100)
+            leave = Math.floor(leaveTime / 86400);
+            leave = leave > 30 ? "" : "剩余" + leave + "天";
+            pce =
+              100 -
+              Math.round(
+                (leaveTime /
+                  (this.subscibe.period_end - this.subscibe.period_start)) *
+                  100
+              );
           }
-          pce = 'width:' + pce + '%'
+          pce = "width:" + pce + "%";
 
           this.subscibeBan = {
-            used: '已使用' + used + '天',
-            name: '专业版',
-            desc: '当前为专业版',
-            detail: '不限患者',
+            used: "已使用" + used + "天",
+            name: "专业版",
+            desc: "当前为专业版",
+            detail: "不限患者",
             leave: leave,
             pay_status: !!leave,
             pce: pce
-          }
-          break
+          };
+          break;
         case 1:
-          leaveTime = this.subscibe.period_end - this.serverTime
-          this.leftTime = leaveTime
+          leaveTime = this.subscibe.period_end - this.serverTime;
+          this.leftTime = leaveTime;
           if (leaveTime < 0) {
-            leave = '已经过期'
-            pce = '100'
+            leave = "已经过期";
+            pce = "100";
           } else if (this.patientTotal > 200) {
-            leave = '管理患者数已达' + this.patientTotal + '位，请购买专业版'
-            pce = 'width:100%'
+            leave = "管理患者数已达" + this.patientTotal + "位，请购买专业版";
+            pce = "width:100%";
           } else if (this.patientTotal >= 190) {
-            leave = '管理患者数已达' + this.patientTotal + '位，建议购买专业版'
-            pce = Math.round(this.patientTotal / 200 * 100)
+            leave = "管理患者数已达" + this.patientTotal + "位，建议购买专业版";
+            pce = Math.round((this.patientTotal / 200) * 100);
           } else {
-            leave = Math.floor(leaveTime / 86400)
-            leave = leave > 30 ? '' : '剩余' + leave + '天，建议购买标准版'
-            pce = 100 - Math.round(leaveTime / (this.subscibe.period_end - this.subscibe.period_start) * 100)
+            leave = Math.floor(leaveTime / 86400);
+            leave = leave > 30 ? "" : "剩余" + leave + "天，建议购买标准版";
+            pce =
+              100 -
+              Math.round(
+                (leaveTime /
+                  (this.subscibe.period_end - this.subscibe.period_start)) *
+                  100
+              );
           }
-          pce = 'width:' + pce + '%'
+          pce = "width:" + pce + "%";
 
           this.subscibeBan = {
-            used: '已使用' + used + '天',
-            name: '标准版',
-            desc: '当前为标准版',
-            detail: '可管理200位（含）以下患者',
+            used: "已使用" + used + "天",
+            name: "标准版",
+            desc: "当前为标准版",
+            detail: "可管理200位（含）以下患者",
             leave: leave,
             pay_status: !!leave,
             pce: pce
-          }
-          break
+          };
+          break;
 
         default:
           this.subscibeBan = {
-            used: '',
-            name: '未订阅服务',
-            desc: '当前未订阅服务',
-            detail: '无法使用血透系统',
-            leave: '',
+            used: "",
+            name: "未订阅服务",
+            desc: "当前未订阅服务",
+            detail: "无法使用血透系统",
+            leave: "",
             pay_status: true,
-            pce: ''
-          }
-          break
+            pce: ""
+          };
+          break;
       }
     }
-
   },
   created() {
-    this.subscibe = this.$store.getters.xt_user.subscibe
-    this.GetPatientTotal()
-    this.GetServerTime()
-    let params = {
-      page : this.page+1,
-      limit: this.limit,
-    }
-    this.GetRemindPatientList(params)
+    this.subscibe = this.$store.getters.xt_user.subscibe;
+    this.GetPatientTotal();
+    this.GetServerTime();
+    const params = {
+      page: this.page + 1,
+      limit: this.limit
+    };
+    this.GetRemindPatientList(params);
   },
   watch: {
     serverTime: function() {
       if (this.serverTime > 0 && this.patientTotal > 0) {
-        this.initSubscibe()
+        this.initSubscibe();
       }
     },
     patientTotal: function() {
       if (this.serverTime > 0 && this.patientTotal > 0) {
-        this.initSubscibe()
+        this.initSubscibe();
       }
     }
   }
-
-}
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
@@ -410,7 +467,7 @@ export default {
   display: -ms-flexbox;
   display: flex;
   padding: 10px;
-  margin-top:15px;
+  margin-top: 15px;
   .home-page {
     font-family: "Microsoft Yahei";
     -webkit-box-flex: 1;
@@ -483,7 +540,8 @@ export default {
             left: 0;
             top: 21px;
             display: block;
-            content: " ";content: " ";
+            content: " ";
+            content: " ";
             width: 50%;
             height: 1px;
             background: #409eff;
@@ -566,7 +624,7 @@ export default {
           flex: 1;
           margin: 0 6px;
           background: #fff;
-          padding: 22px 0 ;
+          padding: 22px 0;
           cursor: pointer;
           .name {
             font-size: 14px;
@@ -581,15 +639,14 @@ export default {
     min-width: 290px;
     margin: 0 0 0 10px;
     .res-widget {
-
       min-height: 80px;
       background: #fff;
       padding: 10px 20px;
       margin-bottom: 15px;
       border-radius: 2px;
       // box-shadow: 0 0 4px 0 rgba(200, 200, 200, 0.5);
-          -webkit-box-shadow: 0 4px 12px rgba(135, 135, 135, 0.15);
-    box-shadow: 0 4px 12px rgba(135, 135, 135, 0.15);
+      -webkit-box-shadow: 0 4px 12px rgba(135, 135, 135, 0.15);
+      box-shadow: 0 4px 12px rgba(135, 135, 135, 0.15);
       background-color: #fff;
       color: #34495e;
       font-size: 12px;
@@ -759,4 +816,11 @@ export default {
     width: 16.66666667%;
   }
 }
+.newLine {
+  display: flex;
+  justify-content: space-between;
+  height: 40px;
+  line-height: 40px;
+  border-bottom: 1px solid #ccc;
+}
 </style>

src/xt_pages/management/components/ManageForm.vue

@@ -1,17 +1,29 @@
 <template>
   <div id="manage-form">
-    <el-dialog title="新增设备" :visible.sync="dialogVisible" width="50%" align="center">
+    <el-dialog
+      title="新增设备"
+      :visible.sync="dialogVisible"
+      width="50%"
+      align="center"
+    >
       <el-form ref="form" :model="form" :rules="rules">
         <el-row>
           <el-col :span="8">
             <el-form-item label="序列号:" required prop="serial_number">
-              <el-input style="width:135px" v-model="form.serial_number"></el-input>
+              <el-input
+                style="width:135px"
+                v-model="form.serial_number"
+              ></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
             <el-form-item label="设备类型:" required prop="device_type">
-              <el-select style="width:135px" v-model="form.device_type" @change="changeDeviceType">
+              <el-select
+                style="width:135px"
+                v-model="form.device_type"
+                @change="changeDeviceType"
+              >
                 <el-option
                   v-for="item in this.DeviceType"
                   :key="item.id"
@@ -23,7 +35,12 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="机位号:" prop="bed_number" v-show="bedShow">
+            <el-form-item
+              label="机位号:"
+              required
+              prop="bed_number"
+              v-show="bedShow"
+            >
               <el-select style="width:135px" v-model="form.bed_number">
                 <el-option
                   v-for="item in this.bedNumber"
@@ -38,17 +55,26 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="设备名称:" required prop="device_name">
-              <el-input style="width:135px" v-model="form.device_name"></el-input>
+              <el-input
+                style="width:135px"
+                v-model="form.device_name"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="生产厂家:" prop="manufacture_factory">
-              <el-input style="width:135px" v-model="form.manufacture_factory"></el-input>
+              <el-input
+                style="width:135px"
+                v-model="form.manufacture_factory"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="维修厂家:" prop="service_manufacturer">
-              <el-input style="width:135px" v-model="form.service_manufacturer"></el-input>
+              <el-input
+                style="width:135px"
+                v-model="form.service_manufacturer"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -60,12 +86,18 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="使用科室:" prop="use_section">
-              <el-input style="width:135px" v-model="form.use_section"></el-input>
+              <el-input
+                style="width:135px"
+                v-model="form.use_section"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="科室编号:" prop="section_number">
-              <el-input style="width:135px" v-model="form.section_number"></el-input>
+              <el-input
+                style="width:135px"
+                v-model="form.section_number"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -113,7 +145,10 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="维修工程师:" prop="maintenance_engineer">
-              <el-input style="width:135px" v-model="form.maintenance_engineer"></el-input>
+              <el-input
+                style="width:135px"
+                v-model="form.maintenance_engineer"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -123,7 +158,10 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="保修期限:" prop="guarantee_date">
-              <el-input style="width:135px" v-model="form.guarantee_date"></el-input>
+              <el-input
+                style="width:135px"
+                v-model="form.guarantee_date"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -145,8 +183,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="初次使用次数:" prop="user_total" v-show="totalShow">
-              <el-input v-model="form.user_total" style="width:135px"></el-input>
+            <el-form-item
+              label="初次使用次数:"
+              prop="user_total"
+              v-show="totalShow"
+            >
+              <el-input
+                v-model="form.user_total"
+                style="width:135px"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8" v-show="DisinfectionShow">
@@ -223,8 +268,15 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="治疗模式:" prop="treat_mode" v-show="treatShow">
-              <el-checkbox-group v-model="form.treat_mode" @change="changetreatmentmode">
+            <el-form-item
+              label="治疗模式:"
+              prop="treat_mode"
+              v-show="treatShow"
+            >
+              <el-checkbox-group
+                v-model="form.treat_mode"
+                @change="changetreatmentmode"
+              >
                 <el-checkbox
                   style="min-width:50px"
                   v-for="item in treatmentmode"
@@ -242,13 +294,16 @@
               :indeterminate="isIndeterminate"
               v-model="checkAll"
               @change="handleCheckAllChange"
-            >全选</el-checkbox>
+              >全选</el-checkbox
+            >
           </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="SaveManageInfo('form')">保存</el-button>
+        <el-button type="primary" @click="SaveManageInfo('form')"
+          >保存</el-button
+        >
       </span>
     </el-dialog>
   </div>
@@ -344,12 +399,16 @@ export default {
         { id: 2, name: "水处理机" },
         { id: 3, name: "其他" }
       ],
-      reverseMode: [{ id: 1, name: "单级反渗" }, { id: 2, name: "双级反渗" }],
+      reverseMode: [
+        { id: 1, name: "单级反渗" },
+        { id: 2, name: "双级反渗" }
+      ],
       rules: {
         serial_number: [{ required: true, message: "请填写序列号" }],
         device_name: [{ required: true, message: "请填写序列号" }],
         device_type: [{ required: true, message: "请填写设备类型" }],
-        unit_type: [{ required: true, message: "请填写设备型号" }]
+        unit_type: [{ required: true, message: "请填写设备型号" }],
+        bed_number: [{ required: true, message: "请填写机位号" }]
       },
       DisinfectionShow: false,
       reverseShow: false,
@@ -400,6 +459,7 @@ export default {
         this.allShow = false;
         this.treatShow = false;
         this.reverseShow = true;
+        this.bedShow = true;
       }
 
       if (val === 3) {

src/xt_pages/management/components/MultipleForm.vue

@@ -1,11 +1,16 @@
 <template>
   <div>
-    <el-dialog title="综合查询" :visible.sync="dialogVisible" width="99%" center>
+    <el-dialog
+      title="综合查询"
+      :visible.sync="dialogVisible"
+      width="95%"
+      center
+    >
       <el-form>
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="透析分区:">
-              <el-select style="width:120px" v-model="form.device_type">
+              <el-select style="width:120px" v-model="form.zone">
                 <el-option
                   v-for="item in this.DeviceType"
                   :key="item.id"
@@ -17,7 +22,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="机号:">
-              <el-select style="width:120px" v-model="form.device_type">
+              <el-select style="width:120px" v-model="form.device_number">
                 <el-option
                   v-for="item in this.Numbers"
                   :key="item.id"
@@ -41,7 +46,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备型号:">
-              <el-select style="width:120px" v-model="form.device_type">
+              <el-select style="width:120px" v-model="form.device_model">
                 <el-option
                   v-for="item in this.EquitmentName"
                   :key="item.id"
@@ -66,191 +71,289 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="维修期限:">
+            <div class="cell clearfix">
+              <label class="title"><span class="name">日期查询</span> : </label>
               <el-date-picker
-                v-model="form.time_limit"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                style="width:400px"
-              ></el-date-picker>
-            </el-form-item>
+                size="small"
+                clearable
+                v-model="form.start_time"
+                prefix-icon="el-icon-date"
+                :editable="false"
+                style="width: 196px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+              <span class="cellLine"> - </span>
+              <el-date-picker
+                size="small"
+                clearable
+                v-model="form.end_time"
+                prefix-icon="el-icon-date"
+                :editable="false"
+                style="width: 196px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </div>
           </el-col>
           <el-col :span="4">
             <el-form-item label="合计:">
               故障次数
-              <span>0</span>次
+              <span>{{ failure_times }}</span
+              >次
               <!-- <el-input style="width:90px"></el-input> -->
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-button type="primary" size="medium" @click="ToQuery()">查询</el-button>
+            <el-button type="primary" size="medium" @click="getComprehensive()"
+              >查询</el-button
+            >
           </el-col>
         </el-row>
         <el-row>
           <el-table :data="tableData" border style="width: 100%">
-            <el-table-column prop="date" label="序号" width="80">
-              <template slot-scope="scope"></template>
+            <el-table-column prop="date" label="序号" width="80" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.id }}
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="分区" width="80">
-              <template slot-scope="scope"></template>
+            <el-table-column prop="name" label="分区" width="80" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.name }}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="序列号" width="80">
-              <template slot-scope="scope"></template>
+            <el-table-column
+              prop="address"
+              label="序列号"
+              width="80"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.serial_number }}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="设备类型" width="100">
-              <template slot-scope="scope"></template>
+            <el-table-column
+              prop="address"
+              label="设备类型"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.device_type }}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="机号" width="80">
-              <template slot-scope="scope"></template>
+            <el-table-column
+              prop="address"
+              label="机号"
+              width="80"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.bed_number }}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="设备名称" width="100">
-              <template slot-scope="scope"></template>
+            <el-table-column
+              prop="address"
+              label="设备名称"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.device_name }}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="设备型号" width="100">
-              <template slot-scope="scope"></template>
+            <el-table-column
+              prop="address"
+              label="设备型号"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.device_type }}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="启用日期" width="100">
-              <template slot-scope="scope"></template>
+            <el-table-column
+              prop="address"
+              label="启用日期"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ getTime(scope.row.start_date) }}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="保修日期" width="100">
-              <template slot-scope="scope"></template>
+            <el-table-column
+              prop="address"
+              label="保修期限"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.guarantee_date }}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="机器状态" width="100">
-              <template slot-scope="scope"></template>
+            <el-table-column
+              prop="address"
+              label="机器状态"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.machine_status }}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="报废日期" width="100">
-              <template slot-scope="scope"></template>
+            <el-table-column
+              prop="address"
+              label="报废日期"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ getTime(scope.row.rubbish_date) }}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="报废日期" width="100">
-              <template slot-scope="scope"></template>
+            <el-table-column
+              prop="address"
+              label="报废原因"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.rubbish_reason }}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="报废原因" width="100">
-              <template slot-scope="scope"></template>
+            <el-table-column
+              prop="address"
+              label="使用年限"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.user_year }}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="使用年限" width="100">
-              <template slot-scope="scope"></template>
+            <el-table-column
+              prop="address"
+              label="工作时长"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.work_time }}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="工作时长" width="100">
-              <template slot-scope="scope"></template>
+            <el-table-column
+              prop="address"
+              label="使用次数"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.user_total }}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="使用次数" width="100">
-              <template slot-scope="scope"></template>
-            </el-table-column>
-            <el-table-column prop="address" label="故障次数" width="100">
-              <template slot-scope="scope"></template>
+            <el-table-column
+              prop="address"
+              label="故障次数"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ failure_times }}
+              </template>
             </el-table-column>
           </el-table>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        <el-button type="primary" @click="dialogVisible = false"
+          >确 定</el-button
+        >
       </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { getAllSubregion, getAllEquimentName } from "@/api/manage";
+import {
+  getAllSubregion,
+  getAllEquimentName,
+  getComprehensive
+} from "@/api/manage";
+import { uParseTime } from "@/utils/tools";
 export default {
   name: "MultipleForm",
   data() {
     return {
+      failure_times: 0,
       dialogVisible: false,
       form: {
         zone: "",
         device_number: "",
         device_type: "",
+        device_model: "",
         user_year: "",
-        time_limit: ""
+        start_time: "",
+        end_time: ""
       },
       userYear: [
+        { id: 0, name: "全部" },
         { id: 1, name: "0~1" },
         { id: 2, name: "1~3" },
         { id: 3, name: "3~10" },
         { id: 4, name: "10年以上" }
       ],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            }
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            }
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
-            }
-          }
-        ]
-      },
       value1: "",
       value2: "",
-      tableData: [
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1517 弄"
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1519 弄"
-        },
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1516 弄"
-        }
-      ],
+      tableData: [],
       EquitmentType: [
+        { id: 0, name: "全部" },
         { id: 1, name: "透析机" },
         { id: 2, name: "水处理机" },
         { id: 3, name: "其他" }
       ],
-      DeviceType: [],
-      Numbers: [],
-      EquitmentName: []
+      DeviceType: [{ id: 0, name: "不限" }],
+      Numbers: [{ id: 0, number: "不限" }],
+      EquitmentName: [{ id: 0, equitment_name: "全部" }],
+      runOptions: [
+        { value: "1", label: "正常" },
+        { value: "2", label: "故障" }
+      ]
     };
   },
   methods: {
     open: function() {
       this.dialogVisible = true;
     },
-    ToQuery() {},
     getAllSubregion() {
       getAllSubregion().then(response => {
         if (response.data.state === 1) {
-          var zones = response.data.data.zones;
+          var zone = response.data.data.zones;
+          var zones = [{ id: 0, name: "不限" }];
+          for (let i = 0; i < zone.length; i++) {
+            const item = zone[i];
+            zones.push({ id: item.id, name: item.name });
+          }
           this.DeviceType = zones;
-          console.log("zones是什么", zones);
-          var numbers = response.data.data.numbers;
+          console.log("zones是什么", zone);
+
+          var number = response.data.data.numbers;
+          var numbers = [{ id: 0, number: "不限" }];
+          for (let index = 0; index < number.length; index++) {
+            const item = number[index];
+            numbers.push({ id: item.id, number: item.number });
+          }
           this.Numbers = numbers;
-          console.log("numbers", numbers);
+          console.log("numbers", number);
         }
       });
     },
@@ -258,9 +361,65 @@ export default {
       getAllEquimentName().then(response => {
         if (response.data.state == 1) {
           var equit = response.data.data.equit;
-          this.EquitmentName = equit;
+          var equits = [{ id: 0, equitment_name: "全部" }];
+          for (let index = 0; index < equit.length; index++) {
+            const item = equit[index];
+            equits.push({ id: item.id, equitment_name: item.equitment_name });
+          }
+          this.EquitmentName = equits;
         }
       });
+    },
+    getComprehensive() {
+      const params = {
+        zone: this.form.zone,
+        number: this.form.device_number,
+        devicetype: this.form.device_type,
+        year: this.form.user_year,
+        starttime: this.form.start_time,
+        endtime: this.form.end_time
+      };
+      getComprehensive(params).then(response => {
+        if (response.data.state === 1) {
+          var macher = response.data.data.macher;
+          for (let index = 0; index < macher.length; index++) {
+            if (macher[index].device_type === 1) {
+              macher[index].device_type = "透析机";
+            }
+            if (macher[index].device_type === 2) {
+              macher[index].device_type = "水处理机";
+            }
+            if (macher[index].device_type === 3) {
+              macher[index].device_type = "其他";
+            }
+
+            if (macher[index].machine_status === 1) {
+              macher[index].machine_status = "使用机";
+            }
+            if (macher[index].machine_status === 2) {
+              macher[index].machine_status = "备用机";
+            }
+            if (macher[index].machine_status === 3) {
+              macher[index].machine_status = "急诊机";
+            }
+            if (macher[index].machine_status === 4) {
+              macher[index].machine_status = "报废机";
+            }
+
+            if (macher[index].start_date === 0) {
+              macher[index].start_date = "";
+            }
+            if (macher[index].rubbish_date === 0) {
+              macher[index].rubbish_date = "";
+            }
+          }
+          console.log("macher", macher);
+          this.tableData = macher;
+        }
+      });
+    },
+    getTime(time) {
+      return uParseTime(time, "{y}-{m}-{d}");
     }
   },
   created() {
@@ -270,5 +429,4 @@ export default {
 };
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>

src/xt_pages/management/components/PlanForm.vue

@@ -1,6 +1,11 @@
 <template>
   <div id="plan-form">
-    <el-dialog title="新增计划" :visible.sync="dialogVisible" width="44%" center>
+    <el-dialog
+      title="新增计划"
+      :visible.sync="dialogVisible"
+      width="50%"
+      center
+    >
       <el-form ref="form" :model="form">
         <el-row>
           <el-col :span="10">
@@ -17,7 +22,10 @@
           </el-col>
           <el-col :span="10">
             <el-form-item label="消毒时长:">
-              <el-input style="width:135px" v-model="form.disinfec_time"></el-input>
+              <el-input
+                style="width:135px"
+                v-model="form.disinfec_time"
+              ></el-input>
               <span>分钟</span>
             </el-form-item>
           </el-col>
@@ -80,7 +88,6 @@
               <el-select
                 style="width:135px"
                 v-model="form.machine_disinfectant"
-                @change="changeDeviceType"
               >
                 <el-option
                   v-for="item in this.disinfectantType"
@@ -163,7 +170,10 @@ export default {
         { id: 3, name: "晚上" }
       ],
       // 基表消毒方式
-      disinfectType: [{ id: 1, name: "擦拭" }, { id: 2, name: "化学消毒" }],
+      disinfectType: [
+        { id: 1, name: "擦拭" },
+        { id: 2, name: "化学消毒" }
+      ],
       // 基表消毒液
       disinfectantType: [
         { id: 1, name: "0.22%季铵盐" },

src/xt_pages/management/components/UserForm.vue

@@ -0,0 +1,101 @@
+<template>
+  <div id="user-form">
+    <el-row>
+      <el-col :span="2">
+        <el-checkbox
+          :indeterminate="isIndeterminate"
+          v-model="checkAll"
+          @change="handleCheckAllChange"
+          >全选</el-checkbox
+        >
+      </el-col>
+      <el-col :span="2">
+        <el-button size="small">删除</el-button>
+      </el-col>
+      <el-col :span="4">
+        <el-form-item label="机号:">
+          <el-select style="width:135px" v-model="value">
+            <el-option
+              v-for="item in this.fluidPathType"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "UserForm",
+  data() {
+    return {
+      tableData: [
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-08",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-06",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-07",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        }
+      ],
+      fluidPathType: [{ id: 1, name: "zs" }],
+      value: ""
+    };
+  }
+};
+</script>
+
+<style scoped></style>