更新

package-lock.json

@@ -477,8 +477,8 @@
     },
     "async-validator": {
       "version": "1.8.5",
-      "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz",
-      "integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
+      "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
       "requires": {
         "babel-runtime": "6.x"
       }
@@ -3187,8 +3187,8 @@
     },
     "deepmerge": {
       "version": "1.5.2",
-      "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz",
-      "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M="
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
+      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
     },
     "define-properties": {
       "version": "1.1.3",
@@ -3515,9 +3515,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npm.taobao.org/element-ui/download/element-ui-2.12.0.tgz",
-      "integrity": "sha1-qJO8Ea5Pfbt+nVQWBvI+ZD8THuQ=",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.0.tgz",
+      "integrity": "sha512-KYsHWsBXYbLELS8cdfvgJTOMSUby3UEjvsPV1V1VmgJ/DdkOAS4z3MiOrPxrT9w2Cc5lZ4eVSQiGhYFR5NVChw==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -7943,7 +7943,7 @@
     },
     "normalize-wheel": {
       "version": "1.0.1",
-      "resolved": "http://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
     },
     "normalize.css": {
@@ -11900,8 +11900,8 @@
     },
     "resize-observer-polyfill": {
       "version": "1.5.1",
-      "resolved": "http://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
+      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
     },
     "resolve": {
       "version": "1.10.0",
@@ -13556,8 +13556,8 @@
     },
     "throttle-debounce": {
       "version": "1.1.0",
-      "resolved": "http://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz",
-      "integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0="
+      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
+      "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
     },
     "through": {
       "version": "2.3.8",

package.json

@@ -46,7 +46,7 @@
     "driver.js": "0.5.2",
     "dropzone": "5.2.0",
     "echarts": "3.8.5",
-    "element-ui": "^2.12.0",
+    "element-ui": "^2.13.0",
     "file-saver": "1.3.3",
     "font-awesome": "4.7.0",
     "js-cookie": "2.2.0",

src/api/manage.js

@@ -150,6 +150,7 @@ export function EditPlanDetail(id, params) {
 }
 
 export function UpdatePlanInfo(data) {
+  console.log('data', data)
   return request({
     url: '/api/manage/updateplaninfo',
     method: 'Post',
@@ -451,9 +452,6 @@ export function UpdateForm(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,
@@ -462,6 +460,7 @@ export function queryInfo(zone, bed, startime, endtime, limit, page) {
     limit: limit,
     page: page
   }
+  console.log('params', params)
   return request({
     url: '/api/manage/queryinfo',
     method: 'Get',
@@ -486,7 +485,6 @@ export function getAllEquitType(params) {
 }
 
 export function getUserForm(id, limit, page) {
-  console.log('limit', limit)
   const params = {
     id: id,
     limit: limit,
@@ -508,6 +506,7 @@ export function UpdateMacheineTwo(data) {
 }
 
 export function getBedForm(id, params) {
+  console.log('设备-id', id)
   return request({
     url: '/api/manage/getbedform?id=' + id,
     method: 'get',

src/xt_pages/management/components/MultipleForm.vue

@@ -6,11 +6,11 @@
       width="95%"
       center
     >
-      <el-form style="height:100%">
+      <el-form style="height: 100%;">
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item label="透析分区:">
-              <el-select style="width:110px" v-model="form.zone">
+              <el-select style="width: 110px;" v-model="form.zone">
                 <el-option
                   v-for="item in this.DeviceType"
                   :key="item.id"
@@ -22,7 +22,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="机号:">
-              <el-select style="width:110px" v-model="form.device_number">
+              <el-select style="width: 110px;" v-model="form.device_number">
                 <el-option
                   v-for="item in this.Numbers"
                   :key="item.id"
@@ -34,7 +34,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="设备类型:">
-              <el-select style="width:110px" v-model="form.device_type">
+              <el-select style="width: 110px;" v-model="form.device_type">
                 <el-option
                   v-for="item in this.EquitmentType"
                   :key="item.id"
@@ -46,7 +46,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="设备型号:">
-              <el-select style="width:110px" v-model="form.device_model">
+              <el-select style="width: 110px;" v-model="form.device_model">
                 <el-option
                   v-for="item in this.EquitmentName"
                   :key="item.id"
@@ -58,7 +58,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="使用年限:">
-              <el-select style="width:110px" v-model="form.user_year">
+              <el-select style="width: 110px;" v-model="form.user_year">
                 <el-option
                   v-for="item in this.userYear"
                   :key="item.id"
@@ -122,8 +122,8 @@
         <el-table
           :data="tableData"
           border
-          style="width:100%"
-          height="80%"
+          style="width: 100%;"
+          height="330"
           :row-style="{ color: '#303133' }"
           :header-cell-style="{
             backgroundColor: 'rgb(245, 247, 250)',
@@ -184,7 +184,7 @@
             width="100"
             align="center"
           >
-            <template slot-scope="scope">{{ scope.row.unit_type }}</template>
+            <template slot-scope="scope">{{ scope.row.device_mode }}</template>
           </el-table-column>
           <el-table-column
             prop="address"
@@ -328,10 +328,7 @@ export default {
       DeviceType: [{ id: 0, name: "不限" }],
       Numbers: [{ id: 0, number: "不限" }],
       EquitmentName: [{ id: 0, equitment_name: "全部" }],
-      runOptions: [
-        { value: "1", label: "正常" },
-        { value: "2", label: "故障" }
-      ]
+      runOptions: [{ value: "1", label: "正常" }, { value: "2", label: "故障" }]
     };
   },
   methods: {
@@ -384,7 +381,7 @@ export default {
       getComprehensive(params).then(response => {
         if (response.data.state === 1) {
           var macher = response.data.data.macher;
-          console.log("设备型号5555", macher);
+
           for (let index = 0; index < macher.length; index++) {
             if (macher[index].device_type === 1) {
               macher[index].device_type = "透析机";
@@ -428,7 +425,7 @@ export default {
       getTotalCount().then(response => {
         if (response.data.state === 1) {
           var total = response.data.data.total;
-          // console.log('total ========', total)
+
           this.failure_times = total;
         }
       });

src/xt_pages/management/components/UserForm.vue

@@ -1002,6 +1002,7 @@ export default {
       limit: 10,
       page: 1,
       total: 0,
+      value: "",
       classType: [
         { id: 1, name: "上午" },
         { id: 2, name: "下午" },
@@ -1066,14 +1067,8 @@ export default {
         { id: 8, name: "50%冰醋酸" },
         { id: 9, name: "5%次氯酸钠" }
       ],
-      runOption: [
-        { id: 1, name: "正常" },
-        { id: 2, name: "故障" }
-      ],
-      runOptions: [
-        { id: 1, name: "达标" },
-        { id: 2, name: "未达标" }
-      ],
+      runOption: [{ id: 1, name: "正常" }, { id: 2, name: "故障" }],
+      runOptions: [{ id: 1, name: "达标" }, { id: 2, name: "未达标" }],
       faultPhase: [
         { id: 1, name: "开机启动" },
         { id: 2, name: "自检" },
@@ -1081,14 +1076,8 @@ export default {
         { id: 4, name: "治疗" },
         { id: 5, name: "消毒" }
       ],
-      Disinfectant: [
-        { id: 1, name: "有" },
-        { id: 2, name: "无" }
-      ],
-      potency: [
-        { id: 1, name: "达标" },
-        { id: 2, name: "未达标" }
-      ],
+      Disinfectant: [{ id: 1, name: "有" }, { id: 2, name: "无" }],
+      potency: [{ id: 1, name: "达标" }, { id: 2, name: "未达标" }],
       disinfection: [
         { id: 1, name: "已消毒" },
         { id: 2, name: "未消毒" },
@@ -1153,7 +1142,8 @@ export default {
         germ_number: "", // 数量
         clean: "", // 清洁
         sign_name: "", // 签名
-        patient_id: ""
+        patient_id: "",
+        equiment_id: ""
       },
       hiddenShow: false,
       searchArray: [],
@@ -1438,11 +1428,13 @@ export default {
     },
     handleSizeChange(limit) {
       this.limit = limit;
-      this.queryInfo();
+      //this.queryInfo();
+      this.getUserForm(this.value);
     },
     handleCurrentChange(page) {
       this.page = page;
-      this.queryInfo();
+      // this.queryInfo();
+      this.getUserForm(this.value);
     },
     getTime(time) {
       return uParseTime(time, "{y}-{m}-{d}");
@@ -1474,7 +1466,7 @@ export default {
       EditUser(id, patientid).then(response => {
         if (response.data.state === 1) {
           var device = response.data.data.device;
-          // console.log('device', device)
+          console.log("device", device);
           var patients = response.data.data.patients;
           // console.log('patients', patients)
           // eslint-disable-next-line no-sequences
@@ -1485,7 +1477,7 @@ export default {
             ));
           this.userform.patient_id = device.patient_id;
           this.userform.classtype = device.class;
-          this.userform.zone = device.zone;
+          this.userform.zone = device.zone_id;
           this.userform.bed_number = device.bed_number;
           this.userform.contagion = device.contagion;
           this.userform.patient_name = patients.name;
@@ -1531,6 +1523,7 @@ export default {
           // )
           this.userform.starttime = this.updateTimes(device.disinfec_startime);
           this.userform.endtime = this.updateTimes(device.disinfec_endtime);
+          this.userform.equiment_id = device.equiment_id;
           if (device.dialysis_checked === 1) {
             this.userform.dialysis_checked = true;
           }
@@ -1701,6 +1694,7 @@ export default {
       ).then(response => {
         if (response.data.state === 1) {
           var information = response.data.data.infor;
+          console.log("information", information);
           for (let index = 0; index < information.length; index++) {
             if (information[index].class === 0) {
               information[index].class = "";
@@ -2231,6 +2225,7 @@ export default {
             // this.form.bed = information[index].bed_number
           }
           var total = response.data.data.total;
+          console.log("total", total);
           this.tableData = information;
           this.total = total;
         }
@@ -2242,8 +2237,9 @@ export default {
           var addmacher = response.data.data.addmacher;
           console.log("addmacher=============", addmacher);
           var number = response.data.data.number;
-          // console.log('number', number)
-          this.form.zone = addmacher.zone_id;
+          console.log("number", number);
+          //改动
+          this.form.zone = number[0].zone_id;
           this.form.bed = addmacher.bed_id;
 
           var bed = [{ id: 0, number: "全部" }];
@@ -2360,6 +2356,7 @@ export default {
       console.log("newvalue是什么", newvalue);
       this.getUserForm(newvalue);
       this.getBedForm(newvalue);
+      this.value = newvalue;
     }
   }
 };

src/xt_pages/management/home.vue

@@ -493,7 +493,7 @@
                                         </el-select>
                                      </el-form-item>
                                 </el-col>
-                                 <el-col :span="7">      
+                                 <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>
@@ -2685,7 +2685,7 @@ export default {
                 this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
                 break
               }
-              
+
             }
             // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[this.tabIndex])
           }
@@ -3004,7 +3004,7 @@ export default {
                       //   this.$forceUpdate()
                     }
                   }
-  
+
                   this.tableDatatwo[i] = addmacher
                   // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
                 }
@@ -3013,6 +3013,8 @@ export default {
               // this.getAllSubregion()
               this.$refs.singleTable.setCurrentRow(addmacher)
               this.$forceUpdate()
+            }else{
+             this.$message.error("修改失败");
             }
           })
         })
@@ -3059,7 +3061,7 @@ export default {
                       //   this.$forceUpdate()
                       }
                     }
-  
+
                     this.tableDatatwo[i] = addmacher
                   // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
                   }
@@ -3103,7 +3105,7 @@ export default {
                       //   this.$forceUpdate()
                     }
                   }
-  
+
                   this.tableDatatwo[i] = addmacher
                   // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
                 }
@@ -3449,7 +3451,7 @@ export default {
             this.machineform.machine_disinfectant = plan.machine_disinfectant
             this.machineform.disinfectant_way = plan.disinfectan_way
             this.machineform.disinfectant = plan.disinfectant
-            this.getPatientDetail(this.unitType, this.$route.query.bedid)
+           // this.getPatientDetail(this.unitType, this.$route.query.bedid)
           }
         })
       },
@@ -3457,7 +3459,7 @@ export default {
         var devicetype = this.machineform.device_type
         var devicetypes = parseInt(devicetype)
         this.machineform.device_type = devicetypes
-  
+
         if (this.machineform.disinfec_time === '') {
           this.machineform.disinfec_time = ''
         }
@@ -3466,7 +3468,7 @@ export default {
           var disinfectime = parseInt(disinfectimes)
           this.machineform.disinfec_time = disinfectime
         }
-  
+
         var times = this.machineform.time
         var time = parseInt(times)
         this.machineform.time = time
@@ -3874,7 +3876,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)
@@ -3936,7 +3938,7 @@ export default {
             this.userform.machine_run = information.machine_run
             this.userform.fluid_path = information.fluid_path
             this.userform.disinfectant = information.disinfectant
-            this.userform.disinfectant = information.disinfection_status
+            this.userform.disinfection_status = information.disinfection_status
             this.userform.disinfection_residue = information.disinfection_residue
             this.userform.longtime = information.long_time
             this.userform.starttime = this.updateTimes(information.disinfec_startime)
@@ -4386,7 +4388,7 @@ export default {
             }
 
             var timeDataThree = response.data.data.timeDataThree
-            console.log('timeDataThree', timeDataThree)
+            //console.log('timeDataThree', timeDataThree)
             if (timeDataThree.length === 0) {
               this.warnShowThree = true
             }
@@ -4410,6 +4412,7 @@ export default {
       getAllMode() {
         getAllMode().then(response => {
           var mode = response.data.data.mode
+
           this.deviceMode = mode
         })
       },