更新

src/api/manage.js

@@ -1,20 +1,20 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 export function getAllSubregion(params) {
-  console.log("params", params);
+  console.log('params', params)
   return request({
-    url: "/api/management/getallsubregion",
-    method: "Get",
+    url: '/api/management/getallsubregion',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function SaveManageInfo(data) {
   return request({
-    url: "/api/management/savemanageinfo",
-    method: "Post",
+    url: '/api/management/savemanageinfo',
+    method: 'Post',
     data: data
-  });
+  })
 }
 
 export function getAllMachineInfo(
@@ -32,310 +32,322 @@ 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, deviceid) {
   const params = {
     zoneid: zoneid,
     deviceid: deviceid
-  };
+  }
   return request({
-    url: "/api/management/getallmachine",
-    method: "Get",
+    url: '/api/management/getallmachine',
+    method: 'Get',
     params: params
-  });
+  })
+}
+
+export function getAllMachineTwo(zoneid, deviceid) {
+  const params = {
+    zoneid: zoneid,
+    deviceid: deviceid
+  }
+  return request({
+    url: '/api/management/getallmachinetwo',
+    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 UpdateMachineInfoTwo(data) {
-  console.log("data", data);
   return request({
-    url: "/api/management/updatemachineinfotwo",
-    method: "post",
+    url: '/api/management/updatemachineinfotwo',
+    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)
   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(unitype) {
   // eslint-disable-next-line no-redeclare
   const params = {
     unitype: unitype
-  };
+  }
   return request({
-    url: "/api/management/getallplandetail",
-    method: "Get",
+    url: '/api/management/getallplandetail',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function getEditMachine(id, params) {
   return request({
-    url: "/api/management/geteditmachine?id=" + id,
-    method: "Get",
+    url: '/api/management/geteditmachine?id=' + id,
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function DeletePlans(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) {
   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",
+    url: '/api/manage/getcomprehensive',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function SaveInformation(eid, data) {
+  console.log('data--', data)
   return request({
-    url: "/api/manage/saveinformation?eid=" + eid,
-    method: "Post",
+    url: '/api/manage/saveinformation?eid=' + eid,
+    method: 'Post',
     data: data
-  });
+  })
 }
 
 export function getPatientInfo(id, params) {
   return request({
-    url: "/api/manage/getpatientinfo?id=" + id,
-    method: "Get",
+    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",
+    url: '/api/manage/changeclass',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function changePatient(equitid, id) {
   const params = {
     equitid: equitid,
     id: id
-  };
+  }
   return request({
-    url: "/api/manage/changepatient",
-    method: "Get",
+    url: '/api/manage/changepatient',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function getAllOrganization(params) {
   return request({
-    url: "/api/manage/getallorganization",
-    method: "Get",
+    url: '/api/manage/getallorganization',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function getUserRegister(id, params) {
   return request({
-    url: "/api/manage/getregisterinfo?id=" + id,
-    method: "Get",
+    url: '/api/manage/getregisterinfo?id=' + id,
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function getInformationData(limit, page) {
   const params = {
     limit: limit,
     page: page
-  };
+  }
   return request({
-    url: "/api/manage/getinformationdata",
-    method: "Get",
+    url: '/api/manage/getinformationdata',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function SaveBacteria(id, data) {
   return request({
-    url: "/api/manage/savebacteria?id=" + id,
-    method: "Post",
+    url: '/api/manage/savebacteria?id=' + id,
+    method: 'Post',
     data: data
-  });
+  })
 }
 
 export function SaveLincomycin(id, data) {
   return request({
-    url: "/api/manage/savelincomycin?id=" + id,
-    method: "Post",
+    url: '/api/manage/savelincomycin?id=' + id,
+    method: 'Post',
     data: data
-  });
+  })
 }
 
 export function SaveQualityControl(id, data) {
   return request({
-    url: "/api/manage/savequalitycontrol?id=" + id,
-    method: "Post",
+    url: '/api/manage/savequalitycontrol?id=' + id,
+    method: 'Post',
     data: data
-  });
+  })
 }
 
 export function getOrgName(params) {
   return request({
-    url: "/api/manage/getorgname",
-    method: "Get",
+    url: '/api/manage/getorgname',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function getAllQulityInfo(params) {
   return request({
-    url: "/api/manage/getallqulityinfo",
-    method: "Get",
+    url: '/api/manage/getallqulityinfo',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function EditCulture(id, userid) {
   const params = {
     id: id,
     userid: userid
-  };
+  }
   return request({
-    url: "/api/manage/editculture",
-    method: "Get",
+    url: '/api/manage/editculture',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function UpdateCulture(data) {
   return request({
-    url: "/api/manage/updateculture",
-    method: "Post",
+    url: '/api/manage/updateculture',
+    method: 'Post',
     data: data
-  });
+  })
 }
 
 export function DeleteCultrue(data) {
   return request({
-    url: "/api/manage/deletecultrue",
-    method: "delete",
+    url: '/api/manage/deletecultrue',
+    method: 'delete',
     data: data
-  });
+  })
 }
 
 export function EditDialyState(id, params) {
   return request({
-    url: "/api/manage/editdialystate?id=" + id,
-    method: "Get",
+    url: '/api/manage/editdialystate?id=' + id,
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function UpdateDialyState(data) {
   return request({
-    url: "/api/manage/updatedialystate",
-    method: "post",
+    url: '/api/manage/updatedialystate',
+    method: 'post',
     data: data
-  });
+  })
 }
 
 export function DeleteDialystate(data) {
   return request({
-    url: "/api/manage/deletedialystate",
-    method: "delete",
+    url: '/api/manage/deletedialystate',
+    method: 'delete',
     data: data
-  });
+  })
 }
 
 export function EditIon(id, params) {
   return request({
-    url: "/api/manage/edition?id=" + id,
-    method: "Get",
+    url: '/api/manage/edition?id=' + id,
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function UpdateIon(data) {
   return request({
-    url: "/api/manage/updateion",
-    method: "Post",
+    url: '/api/manage/updateion',
+    method: 'Post',
     data: data
-  });
+  })
 }
 
 export function DeleteIon(data) {
   return request({
-    url: "/api/manage/deleteion",
-    method: "delete",
+    url: '/api/manage/deleteion',
+    method: 'delete',
     data: data
-  });
+  })
 }
 
 export function queryTable(bedid, startime, endtime) {
@@ -343,56 +355,57 @@ export function queryTable(bedid, startime, endtime) {
     bedid: bedid,
     startime: startime,
     endtime: endtime
-  };
+  }
   return request({
-    url: "/api/manage/query",
-    method: "Get",
+    url: '/api/manage/query',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function SaveRepair(id, data) {
   return request({
-    url: "/api/manage/saverepair?id=" + id,
-    method: "post",
+    url: '/api/manage/saverepair?id=' + id,
+    method: 'post',
     data: data
-  });
+  })
 }
 
 export function getAllRepair(limit, page) {
   const params = {
     limit: limit,
     page: page
-  };
+  }
   return request({
-    url: "/api/manage/getallrepair",
-    method: "Get",
+    url: '/api/manage/getallrepair',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function EditRepair(id, params) {
   return request({
-    url: "/api/manage/editrepair?id=" + id,
-    method: "Get",
+    url: '/api/manage/editrepair?id=' + id,
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function UpdateRepair(data) {
+  console.log('data-----', data)
   return request({
-    url: "/api/manage/updaterepair",
-    method: "Post",
+    url: '/api/manage/updaterepair',
+    method: 'Post',
     data: data
-  });
+  })
 }
 
 export function DeleteRepair(data) {
   return request({
-    url: "/api/manage/deleterepair",
-    method: "delete",
+    url: '/api/manage/deleterepair',
+    method: 'delete',
     data: data
-  });
+  })
 }
 
 export function queryRepair(bedid, startime, endtime) {
@@ -400,44 +413,47 @@ export function queryRepair(bedid, startime, endtime) {
     bedid: bedid,
     startime: startime,
     endtime: endtime
-  };
+  }
 
   return request({
-    url: "/api/manage/queryrepair",
-    method: "Get",
+    url: '/api/manage/queryrepair',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function EditUser(id, patientid) {
   const params = {
     id: id,
     patientid: patientid
-  };
+  }
   return request({
-    url: "/api/manage/edituser",
-    method: "Get",
+    url: '/api/manage/edituser',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function DeleteUserform(data) {
   return request({
-    url: "/api/manage/deleteform",
-    method: "delete",
+    url: '/api/manage/deleteform',
+    method: 'delete',
     data: data
-  });
+  })
 }
 
 export function UpdateForm(data) {
   return request({
-    url: "/api/manage/updateform",
-    method: "post",
+    url: '/api/manage/updateform',
+    method: 'post',
     data: data
-  });
+  })
 }
 
 export function queryInfo(zone, bed, startime, endtime, limit, page) {
+  console.log('开始时间', startime)
+  console.log('结束时间', endtime)
+  console.log('床位好', bed)
   const params = {
     zone: zone,
     bed: bed,
@@ -445,218 +461,219 @@ export function queryInfo(zone, bed, startime, endtime, limit, page) {
     endtime: endtime,
     limit: limit,
     page: page
-  };
+  }
   return request({
-    url: "/api/manage/queryinfo",
-    method: "Get",
+    url: '/api/manage/queryinfo',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function getAutoData(id, params) {
   return request({
-    url: "/api/manage/insertautodata?id=" + id,
-    method: "Get",
+    url: '/api/manage/insertautodata?id=' + id,
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function getAllEquitType(params) {
   return request({
-    url: "/api/manage/getallequittype",
-    method: "Get",
+    url: '/api/manage/getallequittype',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function getUserForm(id, limit, page) {
+  console.log('limit', limit)
   const params = {
     id: id,
     limit: limit,
     page: page
-  };
+  }
   return request({
-    url: "/api/manage/getuserform",
-    method: "Get",
+    url: '/api/manage/getuserform',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function UpdateMacheineTwo(data) {
   return request({
-    url: "/api/manage/updatemacheinettwo",
-    method: "post",
+    url: '/api/manage/updatemacheinettwo',
+    method: 'post',
     data: data
-  });
+  })
 }
 
 export function getBedForm(id, params) {
   return request({
-    url: "/api/manage/getbedform?id=" + id,
-    method: "get",
+    url: '/api/manage/getbedform?id=' + id,
+    method: 'get',
     params: params
-  });
+  })
 }
 
 export function getTotalCount(params) {
   return request({
-    url: "/api/manage/gettotalcount",
-    method: "Get",
+    url: '/api/manage/gettotalcount',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function getTotalNumber(id, params) {
   return request({
-    url: "/api/manage/getotalnumber?id=" + id,
-    method: "Get",
+    url: '/api/manage/getotalnumber?id=' + id,
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function getTimeWarning(id, params) {
   return request({
-    url: "/api/manage/gettimewarning?id=" + id,
-    method: "Get",
+    url: '/api/manage/gettimewarning?id=' + id,
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 export function SaveManageInfoTwo(data, beds) {
-  console.log("data", beds);
+  console.log('data', beds)
   return request({
-    url: "/api/manage/savemanageinfotwo?beds=" + beds,
-    method: "post",
+    url: '/api/manage/savemanageinfotwo?beds=' + beds,
+    method: 'post',
     data: data
-  });
+  })
 }
 
 export function getAllpatient(params) {
   return request({
-    url: "/api/manage/getallpatient",
-    method: "get",
+    url: '/api/manage/getallpatient',
+    method: 'get',
     params: params
-  });
+  })
 }
 
 export function changeBed(id, params) {
   return request({
-    url: "/api/manage/changebed?id=" + id,
-    method: "get",
+    url: '/api/manage/changebed?id=' + id,
+    method: 'get',
     params: params
-  });
+  })
 }
 
 export function getPatientDetail(id, params) {
   return request({
-    url: "/api/manage/getpatientdetail?id=" + id,
-    method: "get",
+    url: '/api/manage/getpatientdetail?id=' + id,
+    method: 'get',
     params: params
-  });
+  })
 }
 
 export function changeRun(id, data) {
   return request({
-    url: "/api/manage/changrun?id=" + id,
-    method: "post",
+    url: '/api/manage/changrun?id=' + id,
+    method: 'post',
     data: data
-  });
+  })
 }
 
 export function getRemanderData(params) {
   return request({
-    url: "/api/manage/getremanderdata",
-    method: "get",
+    url: '/api/manage/getremanderdata',
+    method: 'get',
     params: params
-  });
+  })
 }
 
 export function openDelete(id, params) {
   return request({
-    url: "/api/manage/opendelete?id=" + id,
-    method: "delete",
+    url: '/api/manage/opendelete?id=' + id,
+    method: 'delete',
     params: params
-  });
+  })
 }
 
 export function DeleteUserLogin(id, params) {
   return request({
-    url: "/api/manage/deleteuserlogin?id=" + id,
-    method: "delete",
+    url: '/api/manage/deleteuserlogin?id=' + id,
+    method: 'delete',
     params: params
-  });
+  })
 }
 
 export function DeleteCultrues(id, params) {
   return request({
-    url: "/api/manage/deletecultrues?id=" + id,
-    method: "delete",
+    url: '/api/manage/deletecultrues?id=' + id,
+    method: 'delete',
     params: params
-  });
+  })
 }
 
 export function DeleteDialystates(id, params) {
   return request({
-    url: "/api/manage/deletedialystates?id=" + id,
-    method: "delete",
+    url: '/api/manage/deletedialystates?id=' + id,
+    method: 'delete',
     params: params
-  });
+  })
 }
 
 export function DeleteIons(id, params) {
   return request({
-    url: "/api/manage/deleteions?id=" + id,
-    method: "delete",
+    url: '/api/manage/deleteions?id=' + id,
+    method: 'delete',
     params: params
-  });
+  })
 }
 
 export function DeleteRepairs(id, params) {
   return request({
-    url: "/api/manage/deleterepairs?id=" + id,
-    method: "delete",
+    url: '/api/manage/deleterepairs?id=' + id,
+    method: 'delete',
     params: params
-  });
+  })
 }
 
 export function SaveMode(data) {
   return request({
-    url: "/api/manage/savemode",
-    method: "post",
+    url: '/api/manage/savemode',
+    method: 'post',
     data: data
-  });
+  })
 }
 
 export function getAllMode(params) {
   return request({
-    url: "/api/manage/getallmode",
-    method: "get",
+    url: '/api/manage/getallmode',
+    method: 'get',
     params: params
-  });
+  })
 }
 
 export function EditMode(id, params) {
   return request({
-    url: "/api/manage/editmode?id=" + id,
-    method: "get",
+    url: '/api/manage/editmode?id=' + id,
+    method: 'get',
     params: params
-  });
+  })
 }
 
 export function UpdateMode(id, data) {
   return request({
-    url: "/api/manage/updatemode?id=" + id,
-    method: "post",
+    url: '/api/manage/updatemode?id=' + id,
+    method: 'post',
     data: data
-  });
+  })
 }
 
 export function DeleteMode(id, params) {
   return request({
-    url: "/api/manage/deletemode?id=" + id,
-    method: "delete",
+    url: '/api/manage/deletemode?id=' + id,
+    method: 'delete',
     params: params
-  });
+  })
 }
 
 export function selectChange(id, params) {
@@ -674,3 +691,23 @@ export function selectBed(id, params) {
     params: params
   })
 }
+
+export function getTimeBeteen(equitid, todaytime) {
+  const params = {
+    equitid: equitid,
+    todaytime: todaytime
+  }
+  return request({
+    url: '/api/manage/getime',
+    method: 'get',
+    params: params
+  })
+}
+
+export function DeleteImages(id, params) {
+  return request({
+    url: '/api/manage/deleteimages?id=' + id,
+    method: 'delete',
+    params: params
+  })
+}

src/xt_pages/management/components/ManageForm.vue

@@ -761,7 +761,7 @@ export default {
               this.$emit("getAllMachineInfo");
               this.$forceUpdate();
             } else {
-              this.$message.error("添加失败");
+              this.$message.error("该机位号已绑定设备,添加失败");
             }
           });
         }

src/xt_pages/management/home.vue

@@ -454,55 +454,55 @@
                                   </el-form-item>
                                </el-col>
                                <el-col :span="7">
-                                  <el-form-item label="备注:">
-                                      <el-input style="width:150px" v-model="form.remarks" :disabled="disableFour"></el-input>
-                                  </el-form-item>
+                                   <el-form-item label="消毒方式:">
+                                        <el-select style="width:135px" v-model="form.Disinfection_mode" :disabled="disableFour">
+                                          <el-option
+                                           v-for="item in this.DisinfectionMode"
+                                           :key="item.id"
+                                           :label="item.name"
+                                           :value="item.id"
+                                           ></el-option>
+                                         </el-select>
+                                     </el-form-item>
                                </el-col>
                                <el-col :span="7">
-                                  <el-form-item label="报废日期:">
-                                    <el-date-picker
-                                    v-model="form.rubbish_date"
-                                   prefix-icon="none"
-                                    type="date"
-                                    placeholder="请选择"
-                                    format="yyyy-MM-dd"
-                                     value-format="yyyy-MM-dd"
-                                     style="width:135px"
-                                     :disabled="disableFour">
-                                   </el-date-picker>
-                                 </el-form-item>
+                                    <el-form-item label="备注:">
+                                      <el-input style="width:150px" v-model="form.remarks" :disabled="disableFour"></el-input>
+                                    </el-form-item>
                                 </el-col>
                              </el-row>
                              <el-row>
                                <el-col :span="7">
-                                   <el-form-item label="报废原因:">
-                                     <el-select style="width:150px" v-model="form.rubbish_reason" :disabled="disableFour">
-                                       <el-option v-for="item in this.DisCardResion" :key="item.id" :label="item.name" :value="item.id" ></el-option>
-                                     </el-select>
+                                   <el-form-item label="报废日期:">
+                                     <el-date-picker
+                                       v-model="form.rubbish_date"
+                                       prefix-icon="none"
+                                       type="date"
+                                       placeholder="请选择"
+                                       format="yyyy-MM-dd"
+                                       value-format="yyyy-MM-dd"
+                                       style="width:135px"
+                                       :disabled="disableFour">
+                                    </el-date-picker>
                                    </el-form-item>
                                 </el-col>
                                 <el-col :span="7">
-                                 <el-form-item label="使用年限(年):">
-                                      <el-input style="width:150px" v-model="form.user_year" :disabled="disableFour"></el-input>
-                                 </el-form-item>
+                                    <el-form-item label="报废原因:">
+                                       <el-select style="width:150px" v-model="form.rubbish_reason" :disabled="disableFour">
+                                         <el-option v-for="item in this.DisCardResion" :key="item.id" :label="item.name" :value="item.id" ></el-option>
+                                        </el-select>
+                                     </el-form-item>
                                 </el-col>
-                                 <el-col :span="7">
-                                   <el-form-item label="工作时长(h):">
-                                       <el-input style="width:150px" v-model="form.work_time" :disabled="disableFour"></el-input>
-                                   </el-form-item>
+                                 <el-col :span="7">      
+                                    <el-form-item label="使用年限(年):">
+                                      <el-input style="width:150px" v-model="form.user_year" :disabled="disableFour"></el-input>
+                                    </el-form-item>
                                 </el-col>
                              </el-row>
                              <el-row>
-                                <el-col :span="8">
-                                    <el-form-item label="消毒方式:">
-                                        <el-select style="width:135px" v-model="form.Disinfection_mode" :disabled="disableFour">
-                                          <el-option
-                                           v-for="item in this.DisinfectionMode"
-                                           :key="item.id"
-                                           :label="item.name"
-                                           :value="item.id"
-                                           ></el-option>
-                                         </el-select>
+                                 <el-col :span="8">
+                                      <el-form-item label="工作时长(h):">
+                                         <el-input style="width:150px" v-model="form.work_time" :disabled="disableFour"></el-input>
                                      </el-form-item>
                                   </el-col>
                                  <el-col :span="8">
@@ -965,7 +965,7 @@
                                            :key="item.id"
                                            :label="item.name"
                                            :value="item.id"
-                                           style="width:80px">
+                                           style="width:90px">
                                        </el-option>
                                         </el-select>
                                      </el-form-item>
@@ -1039,7 +1039,7 @@
                                               value-format="yyyy-MM-dd HH:mm"
                                                placeholder="选择时间"
                                                v-model="userform.start_time"
-                                               style="width:150px"
+                                               style="width:185px"
                                           ></el-date-picker>
                                       </el-form-item>
                                   </el-col>
@@ -1051,7 +1051,7 @@
                                               value-format="yyyy-MM-dd HH:mm"
                                                placeholder="选择时间"
                                                v-model="userform.end_time"
-                                               style="width:150px"
+                                               style="width:185px"
                                           ></el-date-picker>
                                       </el-form-item>
                                   </el-col>
@@ -1143,7 +1143,7 @@
                                            :key="item.id"
                                            :label="item.name"
                                            :value="item.id"
-                                            style="width:150px">
+                                            style="width:200px">
                                            </el-option>
                                         </el-select>
                                      </el-form-item>
@@ -1161,7 +1161,7 @@
                                            :key="item.id"
                                            :label="item.name"
                                            :value="item.id"
-                                            style="width:100px">
+                                            style="width:200px">
                                            </el-option>
                                         </el-select>
                                      </el-form-item>
@@ -1186,7 +1186,7 @@
                                            :key="item.id"
                                            :label="item.name"
                                            :value="item.id"
-                                           style="width:135px">
+                                           style="width:200px">
                                            </el-option>
                                         </el-select>
                                        </el-form-item>
@@ -1199,7 +1199,7 @@
                                            :key="item.id"
                                            :label="item.name"
                                            :value="item.id"
-                                            style="width:100px">
+                                            style="width:260px">
                                            </el-option>
                                         </el-select>
                                      </el-form-item>
@@ -1217,7 +1217,7 @@
                                            :key="item.id"
                                            :label="item.name"
                                            :value="item.id"
-                                            style="width:100px">
+                                            style="width:200px">
                                            </el-option>
                                         </el-select>
                                      </el-form-item>
@@ -1244,7 +1244,7 @@
                                               value-format="yyyy-MM-dd HH:mm"
                                                placeholder="选择时间"
                                                v-model="userform.starttime"
-                                               style="width:150px;"
+                                               style="width:185px;"
                                           ></el-date-picker>
                                        </el-form-item>
                                     </el-col>
@@ -1256,7 +1256,7 @@
                                               value-format="yyyy-MM-dd HH:mm"
                                                placeholder="选择时间"
                                                v-model="userform.endtime"
-                                               style="width:150px;"
+                                               style="width:185px;"
                                           ></el-date-picker>
                                        </el-form-item>
                                     </el-col>
@@ -1306,8 +1306,8 @@
                                        <el-checkbox v-model="userform.germ_checked">更换</el-checkbox>
                                        <span class="warn" v-show="warnShowTwo">您已一个月未更换,请注意检测</span>
                                      </el-form-item>
-                                      
-                                     </el-col> 
+
+                                     </el-col>
                                    <el-col :span="8">
                                      <el-form-item class="newname" label="名称:">
                                        <el-select v-model="userform.germ_name" placeholder="请选择" style="width:150px">
@@ -1342,7 +1342,7 @@
                                            :key="item.admin_user_id"
                                            :label="item.user_name"
                                            :value="item.admin_user_id"
-                                            style="width:100px">
+                                            style="width:185px">
                                            </el-option>
                                          </el-select>
                                        </el-form-item>
@@ -1574,7 +1574,7 @@
                                     <el-button @click="cleanLincomycin">取消</el-button>
                                   </el-col>
                                    <el-col :span="4">
-                                    <el-button @click="SaveLincomycin('qualityFormTwo')">保存</el-button>
+                                    <el-button type="primary" @click="SaveLincomycin('qualityFormTwo')">保存</el-button>
                                   </el-col>
                                 </div>
                               </el-row>
@@ -1708,7 +1708,7 @@
                                     <el-button @click="cleanQuality">取消</el-button>
                                   </el-col>
                                    <el-col :span="4">
-                                    <el-button @click="SaveQualityControl('qualityFormThree')">保存</el-button>
+                                    <el-button type="primary" @click="SaveQualityControl('qualityFormThree')">保存</el-button>
                                   </el-col>
                                 </div>
                               </el-row>
@@ -1752,7 +1752,7 @@
                                           value-format="yyyy-MM-dd HH:mm"
                                           placeholder="选择时间"
                                           v-model="guaForm.start_time"
-                                          style="width:150px;">
+                                          style="width:185px;">
                                        </el-date-picker>
                                   </el-form-item>
                                </el-col>
@@ -1767,7 +1767,7 @@
                                           placeholder="请选择"
                                           format="yyyy-MM-dd"
                                           value-format="yyyy-MM-dd"
-                                          style="width:150px">
+                                          style="width:185px">
                                         </el-date-picker> -->
                                          <el-date-picker
                                           type="datetime"
@@ -1775,7 +1775,7 @@
                                           value-format="yyyy-MM-dd HH:mm"
                                           placeholder="选择时间"
                                           v-model="guaForm.arrive_time"
-                                          style="width:150px;">
+                                          style="width:185px;">
                                        </el-date-picker>
                                   </el-form-item>
                                </el-col>
@@ -1787,7 +1787,7 @@
                                           value-format="yyyy-MM-dd HH:mm"
                                           placeholder="选择时间"
                                           v-model="guaForm.finish_time"
-                                          style="width:150px;">
+                                          style="width:185px;">
                                        </el-date-picker>
                                   </el-form-item>
                                </el-col>
@@ -1864,11 +1864,12 @@
                                       :before-upload="beforeUploadFile"
                                       :limit="1"
                                       ref='upload'
+                                      accept=".jpg,.png,.gif"
                                       >
                                         <el-button size="small" type="primary">上传图片</el-button>
                                       </el-upload>
-                                     <a class="el-upload-list__item-name">
-                                        <i><a @click="toLink()">{{filename}}</a></i>
+                                     <a class="el-upload-list__item-name" v-show="classShow">
+                                        <i style="color:#0000EE"><a :href="guaForm.images" target="_blank">{{filename}}</a><span @click="hiddenShow"><li class="el-icon-circle-close"></li></span></i>
                                      </a>
                                   </el-form-item>
                                </el-col>
@@ -1947,10 +1948,10 @@
          <remander-form ref="remanderform"> </remander-form>
     <!-- 编辑消毒计划 -->
      <el-dialog title="编辑消毒计划" :visible.sync="dialogVisible" width="50%" center>
-       <el-form :model="machineform" ref="machineform">
+       <el-form :model="machineform" ref="machineform" :rules="planRules">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="设备型号:">
+            <el-form-item label="设备型号:" required prop = "device_type">
               <el-select style="width:135px" v-model="machineform.device_type">
                 <el-option
                   v-for="item in this.DeviceType"
@@ -1962,7 +1963,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="消毒时长:">
+            <el-form-item label="消毒时长:" required prop="disinfec_time">
               <el-input style="width:135px" v-model="machineform.disinfec_time"></el-input>
               <span>分钟</span>
             </el-form-item>
@@ -1970,7 +1971,7 @@
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="时间:">
+            <el-form-item label="时间:" required prop="time">
               <el-select
                 v-model="machineform.time"
                 placeholder="请选择时间"
@@ -1986,7 +1987,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="班次:">
+            <el-form-item label="班次:" required prop="class_time">
               <el-select
                 v-model="machineform.class_time"
                 placeholder="请选择时间"
@@ -2074,7 +2075,7 @@
   import { getAllSubregion, getAllMachine, getMachineDetailById,
     UpdateMachineInfo, getAllPlan, getAllPlanDetail, DeletePlans,
     getAllEquimentName, EditPlanDetail, UpdatePlanInfo, SaveInformation, getPatientInfo,
-    ChangeClass, getAllOrganization, getUserRegister, SaveQualityControl, getOrgName, SaveRepair, SaveBacteria, SaveLincomycin, getAutoData, getAllEquitType, UpdateMacheineTwo, getTotalNumber, getTimeWarning, getAllpatient, UpdateMachineInfoTwo, getPatientDetail, openDelete, getAllMode, selectChange, selectBed } from '@/api/manage'
+    ChangeClass, getAllOrganization, getUserRegister, SaveQualityControl, getOrgName, SaveRepair, SaveBacteria, SaveLincomycin, getAutoData, getAllEquitType, UpdateMacheineTwo, getTotalNumber, getTimeWarning, getTimeBeteen, getAllpatient, UpdateMachineInfoTwo, getPatientDetail, openDelete, getAllMode, selectChange, selectBed } from '@/api/manage'
   import { uParseTime } from '@/utils/tools'
   import { getToken } from '@/api/qiniu'
   import PlanForm from './components/PlanForm'
@@ -2247,7 +2248,14 @@ export default {
           fluid_path: [{ required: true, message: '请填写消毒方式' }],
           disinfectant: [{ required: true, message: '请填写消毒液' }],
           disinfection_status: [{ required: true, message: '消毒状态' }],
-          sign_name: [{ required: true, message: '请填写签名' }]
+          sign_name: [{ required: true, message: '请填写签名', trigger: ['change'] }],
+          classtype: [{ required: true, message: '请填写班次' }]
+        },
+        planRules: {
+          device_type: [{ required: true, message: '请输入设备型号' }],
+          disinfec_time: [{ required: true, message: '请输入消毒时长' }],
+          time: [{ required: true, message: '请输入时间' }],
+          class_time: [{ required: true, message: '请输入班次' }]
         },
         runOption: [
           { id: 1, name: '正常' },
@@ -2540,9 +2548,9 @@ export default {
         disableFour: true,
         disableFive: true,
         runDisable: true,
-        warnShow: true,
-        warnShowTwo: true,
-        warnShowThree: true,
+        warnShow: false,
+        warnShowTwo: false,
+        warnShowThree: false,
         bedZoneThree: [],
         bedNumberTwo: [],
         reverseMode: [
@@ -2554,7 +2562,8 @@ export default {
         deviceMode: [],
         zoneDisabled: false,
         bedid: '',
-        unitType: ''
+        unitType: '',
+        classShow: false
       }
     },
     methods: {
@@ -2656,10 +2665,29 @@ export default {
         getAllMachine(this.forms.zone_id, this.forms.device_type).then(response => {
           if (response.data.state === 1) {
             var addmahcer = response.data.data.addmahcer
-            console.log('addmacher是', addmahcer)
+            console.log('查找的数据', addmahcer)
+            for(let j=0;j<addmahcer.length;j++){
+              if(addmahcer[j].device_type == 1){
+                 addmahcer[j].bed_number = addmahcer[j].number
+              }
+              if(addmahcer[j].device_type == 2){
+                 addmahcer[j].bed_number = addmahcer[j].bed_number
+              }
+               if(addmahcer[j].device_type == 3){
+                 addmahcer[j].bed_number = addmahcer[j].bed_number
+              }
+            }
             this.tableDatatwo = addmahcer
             this.tabIndex = this.$route.query.index
-            this.$refs.singleTable.setCurrentRow(this.tableDatatwo[this.tabIndex])
+            var id = this.$route.query.id
+            for (let i = 0; i < this.tableDatatwo.length; i++) {
+              if (this.tableDatatwo[i].id == id) {
+                this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
+                break
+              }
+              
+            }
+            // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[this.tabIndex])
           }
         })
       },
@@ -2681,7 +2709,8 @@ export default {
         // 病人下机后插入数据
         this.getAutoData(val.id)
         this.getTotalNumber(val.id)
-        this.getTimeWarning(val.id)
+        // this.getTimeWarning(val.id)
+        this.getTimeBeteen(val.id)
         this.getData(val.bed_id)
       },
       getAutoData(id) {
@@ -2700,28 +2729,28 @@ export default {
             // console.log('warning', warning)
             var time = this.getTimestamp(this.userform.date) - warning.stime
             // console.log('时间', time)
-            if (time < 2678400 && warning.dialysis_checked === 1) {
-              this.warnShow = false
-            } else {
-              this.warnShow = true
-            }
+            // if (time < 2678400 && warning.dialysis_checked === 1) {
+            //   this.warnShow = false
+            // } else {
+            //   this.warnShow = true
+            // }
             var germ = response.data.data.germ
             // console.log('germ', germ)
             var timetwo = this.getTimestamp(this.userform.date) - germ.stime
             // console.log('时间', timetwo)
-            if (timetwo < 2678400 && germ.germ_checked === 1) {
-              this.warnShowTwo = false
-            } else {
-              this.warnShowTwo = true
-            }
+            // if (timetwo < 2678400 && germ.germ_checked === 1) {
+            //   this.warnShowTwo = false
+            // } else {
+            //   this.warnShowTwo = true
+            // }
             var clean = response.data.data.clean
             var timethree = this.getTimestamp(this.userform.date) - clean.stime
             // console.log('时间', timethree)
-            if (timethree < 2678400 && clean.clean === 1) {
-              this.warnShowThree = false
-            } else {
-              this.warnShowThree = true
-            }
+            // if (timethree < 2678400 && clean.clean === 1) {
+            //   this.warnShowThree = false
+            // } else {
+            //   this.warnShowThree = true
+            // }
             var number = response.data.data.number
             // console.log('number', number)
             this.Number = number
@@ -2833,7 +2862,7 @@ export default {
             this.form.service_manufacturer = addmacher.service_manufacturer
 
             // this.form.unit_type = addmacher.unit_type
-  
+
             this.form.unit_type = parseInt(addmacher.device_mode)
             this.form.use_section = addmacher.use_section
             this.form.section_number = addmacher.section_number
@@ -2853,7 +2882,7 @@ export default {
             this.form.machine_status = addmacher.machine_status
             this.form.user_total = addmacher.user_total
             this.form.remarks = addmacher.remarks
-
+            // this.form.device_mode = addmacher.device_mode
             if (addmacher.rubbish_date !== 0) {
               this.form.rubbish_date = uParseTime(addmacher.rubbish_date, '{y}-{m}-{d}')
             }
@@ -2964,11 +2993,25 @@ export default {
             // console.log('form', this.form)
             if (response.data.state === 1) {
               var addmacher = response.data.data.addmacher
+              // console.log('addmacher----', addmacher)
               this.$message.success('修改成功')
               // this.$router.push({ path: '/device/home?index=' + this.tabIndex })
-              this.getAllMachine()
-              this.getAllSubregion()
-              // this.$refs.singleTable.setCurrentRow(addmacher)
+              for (let i = 0; i < this.tableDatatwo.length; i++) {
+                if (this.tableDatatwo[i].id == addmacher.id) {
+                  for (let j = 0; j < this.deviceMode.length; j++) {
+                    if (this.deviceMode[j].id === parseInt(addmacher.unit_type)) {
+                      addmacher.device_mode = this.deviceMode[j].device_mode
+                      //   this.$forceUpdate()
+                    }
+                  }
+  
+                  this.tableDatatwo[i] = addmacher
+                  // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
+                }
+              }
+              // this.getAllMachine()
+              // this.getAllSubregion()
+              this.$refs.singleTable.setCurrentRow(addmacher)
               this.$forceUpdate()
             }
           })
@@ -3008,8 +3051,23 @@ export default {
                 // eslint-disable-next-line no-unused-vars
                 var addmacher = response.data.data.addmacher
                 this.$message.success('修改成功')
-                this.getAllMachine()
+                for (let i = 0; i < this.tableDatatwo.length; i++) {
+                  if (this.tableDatatwo[i].id == addmacher.id) {
+                    for (let j = 0; j < this.deviceMode.length; j++) {
+                      if (this.deviceMode[j].id === parseInt(addmacher.unit_type)) {
+                        addmacher.device_mode = this.deviceMode[j].device_mode
+                      //   this.$forceUpdate()
+                      }
+                    }
+  
+                    this.tableDatatwo[i] = addmacher
+                  // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
+                  }
+                }
+                // this.getAllMachine()
                 this.getAllSubregion()
+                this.$refs.singleTable.setCurrentRow(addmacher)
+                this.$forceUpdate()
               }
             })
           }
@@ -3035,10 +3093,25 @@ export default {
         this.$refs[formName].validate(valid => {
           UpdateMacheineTwo(this.form).then(response => {
             if (response.data.state === 1) {
-              var add = response.data.data.addmacher
+              var addmacher = response.data.data.addmacher
               this.$message.success('修改成功')
-              this.getAllMachine()
+              for (let i = 0; i < this.tableDatatwo.length; i++) {
+                if (this.tableDatatwo[i].id == addmacher.id) {
+                  for (let j = 0; j < this.deviceMode.length; j++) {
+                    if (this.deviceMode[j].id === parseInt(addmacher.unit_type)) {
+                      addmacher.device_mode = this.deviceMode[j].device_mode
+                      //   this.$forceUpdate()
+                    }
+                  }
+  
+                  this.tableDatatwo[i] = addmacher
+                  // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
+                }
+              }
+              // this.getAllMachine()
               this.getAllSubregion()
+              this.$refs.singleTable.setCurrentRow(addmacher)
+              this.$forceUpdate()
             }
           })
         })
@@ -3232,7 +3305,7 @@ export default {
         getAllPlanDetail(unit_type).then(response => {
           if (response.data.state === 1) {
             var plandetail = response.data.data.plandetail
-            console.log('plandetail', plandetail)
+            // console.log('plandetail', plandetail)
             for (let index = 0; index < plandetail.length; index++) {
               if (plandetail[index].time === 1) {
                 plandetail[index].time = '周一'
@@ -3384,11 +3457,16 @@ export default {
         var devicetype = this.machineform.device_type
         var devicetypes = parseInt(devicetype)
         this.machineform.device_type = devicetypes
-
-        var disinfectimes = this.machineform.disinfec_time
-        var disinfectime = parseInt(disinfectimes)
-        this.machineform.disinfec_time = disinfectime
-
+  
+        if (this.machineform.disinfec_time === '') {
+          this.machineform.disinfec_time = ''
+        }
+        if (this.machineform.disinfec_time !== '') {
+          var disinfectimes = this.machineform.disinfec_time
+          var disinfectime = parseInt(disinfectimes)
+          this.machineform.disinfec_time = disinfectime
+        }
+  
         var times = this.machineform.time
         var time = parseInt(times)
         this.machineform.time = time
@@ -3448,7 +3526,6 @@ export default {
             }
 
             DeletePlans({ ids: ids }).then(response => {
-              console.log('ids', ids)
               // eslint-disable-next-line eqeqeq
               if (response.data.state == 1) {
                 // eslint-disable-next-line no-unused-vars
@@ -3744,6 +3821,15 @@ export default {
                 this.userform.end_time = ''
                 this.userform.starttime = ''
                 this.userform.endtime = ''
+                this.userform.date = ''
+                this.userform.classtype = ''
+                this.userform.zone = ''
+                this.userform.patient_name = ''
+                this.userform.sign_name = ''
+                this.userform.bed_number = ''
+                this.userform.hyperfiltratio = ''
+                this.userform.weight_loss = ''
+                this.userform.dialysis_time = ''
                 this.$message.success('添加成功')
                 // this.$refs.child.getInformationData()
               }
@@ -3788,7 +3874,7 @@ export default {
         getUserRegister(id).then(response => {
           if (response.data.state === 1) {
             var information = response.data.data.information
-            console.log('使用登记', information)
+            // console.log('产讯使用登记', information)
             // eslint-disable-next-line no-unused-vars
             var role = response.data.data.role
             // console.log('role', role)
@@ -3816,9 +3902,25 @@ export default {
             // this.userform.dialysis_time = information.dialysis_hour
             // this.userform.hyperfiltratio = information.hyperfiltratio
             // this.userform.weight_loss = information.weight_loss
-            this.userform.dialysis_time = dislysis.actual_treatment_hour + 'h' + dislysis.actual_treatment_minute + 'min'
-            this.userform.hyperfiltratio = dislysis.actual_ultrafiltration
-            this.userform.weight_loss = dislysis.weight_loss
+            if (information.hyperfiltratio === '') {
+              this.userform.hyperfiltratio = dislysis.actual_ultrafiltration
+            } else {
+              this.userform.hyperfiltratio = information.hyperfiltratio
+            }
+            if (information.dialysis_hour === '') {
+              this.userform.dialysis_time = dislysis.actual_treatment_hour + 'h' + dislysis.actual_treatment_minute + 'min'
+            } else {
+              this.userform.dialysis_time = information.dialysis_hour
+            }
+            // this.userform.dialysis_time = dislysis.actual_treatment_hour + 'h' + dislysis.actual_treatment_minute + 'min'
+            // this.userform.hyperfiltratio = dislysis.actual_ultrafiltration
+            if (information.weight_loss === '') {
+              this.userform.weight_loss = dislysis.weight_loss
+            } else {
+              this.userform.weight_loss = information.weight_loss
+            }
+
+            // this.userform.weight_loss = dislysis.weight_loss
             this.userform.warning_value = information.warning_value
             this.userform.user_total = information.user_total
             if (information.move === 0) {
@@ -3862,7 +3964,7 @@ export default {
               this.userform.germ_checked = false
             }
 
-            if (information.germs_checked === 2) {
+            if (information.germ_checked === 2) {
               this.userform.germ_checked = false
             }
 
@@ -4060,7 +4162,19 @@ export default {
         }
       },
       beforeUploadFile(file) {
+        var testmsg = file.name.substring(file.name.lastIndexOf('.') + 1)
+        const extension = testmsg === 'jpg' || testmsg === 'JPG' || testmsg === 'png' || testmsg === 'PNG' || testmsg === 'gif' || testmsg === 'GIF'
+    	if (!extension) {
+      					// eslint-disable-next-line no-mixed-spaces-and-tabs
+      					this.$message({
+      						// eslint-disable-next-line no-mixed-spaces-and-tabs
+      						message: '上传文件只能是jpg或者png或者gif格式!',
+      						type: 'error'
+          })
+          return false// 必须加上return false; 才能阻止
+        }
         this.filename = file.name
+        this.classShow = true
         this.guaForm.imageName = file.name
         const isLt2M = file.size / 1024 / 1024 <= 2048
         var date = new Date()
@@ -4142,6 +4256,8 @@ export default {
                 this.guaForm.exclude = 0
                 this.guaForm.images = ''
                 this.guaForm.treatment_process = ''
+                this.classShow = false
+                this.guaForm.imageName = ''
               }
             })
           }
@@ -4227,12 +4343,9 @@ export default {
       getTimeWarning(id) {
         getTimeWarning(id).then(response => {
           if (response.data.state === 1) {
-            var information = response.data.data.informations
-            // console.log('码字', information)
-            // console.log('当前时间', this.getTimestamp(this.userform.date))
-            // console.log('存入时间', information.stime)
+            var information = response.data.data.information
             var time = this.getTimestamp(this.userform.date) - information.stime
-            console.log('时间', time)
+            // console.log('时间', time)
             // if (time < 2678400) {
             //   this.warnShow = false
             // }
@@ -4251,6 +4364,38 @@ export default {
           }
         })
       },
+      getTimeBeteen(id) {
+        var todayTime = moment(new Date()).format('YYYY-MM-DD')
+        // console.log('todayTime', todayTime)
+        getTimeBeteen(id, todayTime).then(response => {
+          if (response.data.state === 1) {
+            var timedata = response.data.data.timeData
+            if (timedata.length === 0) {
+              this.warnShow = true
+            }
+            if (timedata.length !== 0) {
+              this.warnShow = false
+            }
+            var todayTimeTwo = response.data.data.timeDataTwo
+            // console.log('todayTimeTwo', todayTimeTwo)
+            if (todayTimeTwo.length === 0) {
+              this.warnShowTwo = true
+            }
+            if (todayTimeTwo.length !== 0) {
+              this.warnShowTwo = false
+            }
+
+            var timeDataThree = response.data.data.timeDataThree
+            console.log('timeDataThree', timeDataThree)
+            if (timeDataThree.length === 0) {
+              this.warnShowThree = true
+            }
+            if (timeDataThree.length !== 0) {
+              this.warnShowThree = false
+            }
+          }
+        })
+      },
       getTimestamp(time) { // 把时间日期转成时间戳
         return (new Date(time)).getTime() / 1000
       },
@@ -4292,8 +4437,25 @@ export default {
             this.$forceUpdate()
             this.userform.bed_number = zone.id
             this.userform.zone = zone.zone_id
-            console.log('zone', zone)
+            // console.log('zone', zone)
+          }
+        })
+      },
+      hiddenShow() {
+        this.$confirm(
+          '确认要删除所选图片吗? <br>删除后,信息将无法恢复',
+          '删除提示',
+          {
+            dangerouslyUseHTMLString: true,
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
           }
+        ).then(() => {
+          this.filename = ''
+          this.guaForm.imageName = ''
+          this.guaForm.images = ''
+          this.classShow = false
         })
       }
     },
@@ -4381,7 +4543,7 @@ export default {
    .a{
      margin-bottom: 10px;
       margin-top: 6px;
-     
+
    }
 
    .b{

src/xt_pages/management/index.vue

@@ -255,16 +255,20 @@ export default {
       ).then(response => {
         if (response.data.state === 1) {
           var addmahcer = response.data.data.addmahcer;
+          console.log("addmacher", addmahcer);
           for (let index = 0; index < addmahcer.length; index++) {
             if (addmahcer[index].device_type === 1) {
               addmahcer[index].device_type = "透析机";
+              addmahcer[index].bed_number = addmahcer[index].number;
             }
             if (addmahcer[index].device_type === 2) {
               addmahcer[index].device_type = "水处理机";
+              addmahcer[index].bed_number = addmahcer[index].bed_number;
             }
 
             if (addmahcer[index].device_type === 3) {
               addmahcer[index].device_type = "其他";
+              addmahcer[index].bed_number = addmahcer[index].bed_number;
             }
 
             if (addmahcer[index].machine_status === 1) {