xiaoming_global 5 years ago
parent
commit
7f6741ca2d

+ 1 - 1
config/index.js View File

@@ -20,7 +20,7 @@ module.exports = {
20 20
     // host: 'xt.test.sgjyun.com',
21 21
     // host: 'xt.kuyicloud.com',
22 22
     host: 'xt.test.sgjyun.com',
23
-    port: 9526, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
23
+    port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
24 24
     autoOpenBrowser: true,
25 25
     errorOverlay: true,
26 26
     notifyOnErrors: false,

+ 30 - 11
package-lock.json View File

@@ -4740,7 +4740,8 @@
4740 4740
         "ansi-regex": {
4741 4741
           "version": "2.1.1",
4742 4742
           "bundled": true,
4743
-          "dev": true
4743
+          "dev": true,
4744
+          "optional": true
4744 4745
         },
4745 4746
         "aproba": {
4746 4747
           "version": "1.2.0",
@@ -4763,13 +4764,15 @@
4763 4764
         "balanced-match": {
4764 4765
           "version": "1.0.0",
4765 4766
           "bundled": true,
4766
-          "dev": true
4767
+          "dev": true,
4768
+          "optional": true
4767 4769
         },
4768 4770
         "brace-expansion": {
4769 4771
           "version": "1.1.11",
4770 4772
           "resolved": false,
4771 4773
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
4772 4774
           "dev": true,
4775
+          "optional": true,
4773 4776
           "requires": {
4774 4777
             "balanced-match": "^1.0.0",
4775 4778
             "concat-map": "0.0.1"
@@ -4785,19 +4788,22 @@
4785 4788
         "code-point-at": {
4786 4789
           "version": "1.1.0",
4787 4790
           "bundled": true,
4788
-          "dev": true
4791
+          "dev": true,
4792
+          "optional": true
4789 4793
         },
4790 4794
         "concat-map": {
4791 4795
           "version": "0.0.1",
4792 4796
           "resolved": false,
4793 4797
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
4794
-          "dev": true
4798
+          "dev": true,
4799
+          "optional": true
4795 4800
         },
4796 4801
         "console-control-strings": {
4797 4802
           "version": "1.1.0",
4798 4803
           "resolved": false,
4799 4804
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
4800
-          "dev": true
4805
+          "dev": true,
4806
+          "optional": true
4801 4807
         },
4802 4808
         "core-util-is": {
4803 4809
           "version": "1.0.2",
@@ -4927,7 +4933,8 @@
4927 4933
         "inherits": {
4928 4934
           "version": "2.0.3",
4929 4935
           "bundled": true,
4930
-          "dev": true
4936
+          "dev": true,
4937
+          "optional": true
4931 4938
         },
4932 4939
         "ini": {
4933 4940
           "version": "1.3.5",
@@ -4941,6 +4948,7 @@
4941 4948
           "resolved": false,
4942 4949
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
4943 4950
           "dev": true,
4951
+          "optional": true,
4944 4952
           "requires": {
4945 4953
             "number-is-nan": "^1.0.0"
4946 4954
           }
@@ -4957,6 +4965,7 @@
4957 4965
           "resolved": false,
4958 4966
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
4959 4967
           "dev": true,
4968
+          "optional": true,
4960 4969
           "requires": {
4961 4970
             "brace-expansion": "^1.1.7"
4962 4971
           }
@@ -4964,13 +4973,15 @@
4964 4973
         "minimist": {
4965 4974
           "version": "0.0.8",
4966 4975
           "bundled": true,
4967
-          "dev": true
4976
+          "dev": true,
4977
+          "optional": true
4968 4978
         },
4969 4979
         "minipass": {
4970 4980
           "version": "2.3.5",
4971 4981
           "resolved": false,
4972 4982
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
4973 4983
           "dev": true,
4984
+          "optional": true,
4974 4985
           "requires": {
4975 4986
             "safe-buffer": "^5.1.2",
4976 4987
             "yallist": "^3.0.0"
@@ -4991,6 +5002,7 @@
4991 5002
           "resolved": false,
4992 5003
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
4993 5004
           "dev": true,
5005
+          "optional": true,
4994 5006
           "requires": {
4995 5007
             "minimist": "0.0.8"
4996 5008
           }
@@ -5078,7 +5090,8 @@
5078 5090
         "number-is-nan": {
5079 5091
           "version": "1.0.1",
5080 5092
           "bundled": true,
5081
-          "dev": true
5093
+          "dev": true,
5094
+          "optional": true
5082 5095
         },
5083 5096
         "object-assign": {
5084 5097
           "version": "4.1.1",
@@ -5092,6 +5105,7 @@
5092 5105
           "resolved": false,
5093 5106
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
5094 5107
           "dev": true,
5108
+          "optional": true,
5095 5109
           "requires": {
5096 5110
             "wrappy": "1"
5097 5111
           }
@@ -5186,7 +5200,8 @@
5186 5200
         "safe-buffer": {
5187 5201
           "version": "5.1.2",
5188 5202
           "bundled": true,
5189
-          "dev": true
5203
+          "dev": true,
5204
+          "optional": true
5190 5205
         },
5191 5206
         "safer-buffer": {
5192 5207
           "version": "2.1.2",
@@ -5228,6 +5243,7 @@
5228 5243
           "resolved": false,
5229 5244
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
5230 5245
           "dev": true,
5246
+          "optional": true,
5231 5247
           "requires": {
5232 5248
             "code-point-at": "^1.0.0",
5233 5249
             "is-fullwidth-code-point": "^1.0.0",
@@ -5249,6 +5265,7 @@
5249 5265
           "resolved": false,
5250 5266
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
5251 5267
           "dev": true,
5268
+          "optional": true,
5252 5269
           "requires": {
5253 5270
             "ansi-regex": "^2.0.0"
5254 5271
           }
@@ -5296,13 +5313,15 @@
5296 5313
         "wrappy": {
5297 5314
           "version": "1.0.2",
5298 5315
           "bundled": true,
5299
-          "dev": true
5316
+          "dev": true,
5317
+          "optional": true
5300 5318
         },
5301 5319
         "yallist": {
5302 5320
           "version": "3.0.3",
5303 5321
           "resolved": false,
5304 5322
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
5305
-          "dev": true
5323
+          "dev": true,
5324
+          "optional": true
5306 5325
         }
5307 5326
       }
5308 5327
     },

+ 9 - 0
src/api/manage.js View File

@@ -86,3 +86,12 @@ export function getAllEquimentName(params) {
86 86
     params: params
87 87
   });
88 88
 }
89
+
90
+export function savePlan(data) {
91
+  console.log("data是什么", data);
92
+  return request({
93
+    url: "/api/management/saveplan",
94
+    method: "Post",
95
+    data: data
96
+  });
97
+}

+ 58 - 44
src/xt_pages/management/components/PlanForm.vue View File

@@ -1,20 +1,11 @@
1 1
 <template>
2 2
   <div id="plan-form">
3
-    <el-dialog
4
-      title="新增计划"
5
-      :visible.sync="dialogVisible"
6
-      width="44%"
7
-      center
8
-    >
9
-      <el-form>
3
+    <el-dialog title="新增计划" :visible.sync="dialogVisible" width="44%" center>
4
+      <el-form ref="form" :model="form">
10 5
         <el-row>
11 6
           <el-col :span="10">
12 7
             <el-form-item label="设备型号:">
13
-              <el-select
14
-                style="width:135px"
15
-                v-model="form.device_type"
16
-                @change="changeDeviceType"
17
-              >
8
+              <el-select style="width:135px" v-model="form.device_type">
18 9
                 <el-option
19 10
                   v-for="item in this.DeviceType"
20 11
                   :key="item.id"
@@ -26,7 +17,8 @@
26 17
           </el-col>
27 18
           <el-col :span="10">
28 19
             <el-form-item label="消毒时长:">
29
-              <el-input style="width:135px"></el-input>
20
+              <el-input style="width:135px" v-model="form.disinfec_time"></el-input>
21
+              <span>分钟</span>
30 22
             </el-form-item>
31 23
           </el-col>
32 24
         </el-row>
@@ -34,9 +26,12 @@
34 26
           <el-col :span="10">
35 27
             <el-form-item label="时间:">
36 28
               <el-select
37
-                style="width:135px"
38
-                v-model="form.device_type"
39
-                @change="changeDeviceType"
29
+                v-model="form.time"
30
+                multiple
31
+                filterable
32
+                allow-create
33
+                default-first-option
34
+                placeholder="请选择时间"
40 35
               >
41 36
                 <el-option
42 37
                   v-for="item in this.timeType"
@@ -50,9 +45,12 @@
50 45
           <el-col :span="10">
51 46
             <el-form-item label="班次:">
52 47
               <el-select
53
-                style="width:135px"
54
-                v-model="form.device_type"
55
-                @change="changeDeviceType"
48
+                v-model="form.class_time"
49
+                multiple
50
+                filterable
51
+                allow-create
52
+                default-first-option
53
+                placeholder="请选择时间"
56 54
               >
57 55
                 <el-option
58 56
                   v-for="item in this.classType"
@@ -67,11 +65,7 @@
67 65
         <el-row>
68 66
           <el-col :span="10">
69 67
             <el-form-item label="机表消毒方式:">
70
-              <el-select
71
-                style="width:135px"
72
-                v-model="form.device_type"
73
-                @change="changeDeviceType"
74
-              >
68
+              <el-select style="width:135px" v-model="form.way">
75 69
                 <el-option
76 70
                   v-for="item in this.disinfectType"
77 71
                   :key="item.id"
@@ -85,7 +79,7 @@
85 79
             <el-form-item label="机表消毒液:">
86 80
               <el-select
87 81
                 style="width:135px"
88
-                v-model="form.device_type"
82
+                v-model="form.machine_disinfectant"
89 83
                 @change="changeDeviceType"
90 84
               >
91 85
                 <el-option
@@ -101,11 +95,7 @@
101 95
         <el-row>
102 96
           <el-col :span="10">
103 97
             <el-form-item label="液路消毒方式:">
104
-              <el-select
105
-                style="width:135px"
106
-                v-model="form.device_type"
107
-                @change="changeDeviceType"
108
-              >
98
+              <el-select style="width:135px" v-model="form.disinfectant_way">
109 99
                 <el-option
110 100
                   v-for="item in this.sterilizeType"
111 101
                   :key="item.id"
@@ -117,11 +107,7 @@
117 107
           </el-col>
118 108
           <el-col :span="10">
119 109
             <el-form-item label="液路消毒液:">
120
-              <el-select
121
-                style="width:135px"
122
-                v-model="form.device_type"
123
-                @change="changeDeviceType"
124
-              >
110
+              <el-select style="width:135px" v-model="form.disinfectant">
125 111
                 <el-option
126 112
                   v-for="item in this.fluidPathType"
127 113
                   :key="item.id"
@@ -135,24 +121,30 @@
135 121
       </el-form>
136 122
       <span slot="footer" class="dialog-footer">
137 123
         <el-button @click="dialogVisible = false">取 消</el-button>
138
-        <el-button type="primary" @click="dialogVisible = false"
139
-          >确 定</el-button
140
-        >
124
+        <el-button type="primary" @click="savePlan('form')">保存</el-button>
141 125
       </span>
142 126
     </el-dialog>
143 127
   </div>
144 128
 </template>
145 129
 
146 130
 <script>
147
-import { getAllEquimentName } from "@/api/manage";
131
+import { getAllEquimentName, savePlan } from "@/api/manage";
148 132
 export default {
149 133
   name: "PlanForm",
150 134
   data() {
151 135
     return {
152 136
       dialogVisible: false,
153 137
       form: {
154
-        device_type: ""
138
+        device_type: "",
139
+        disinfec_time: "",
140
+        time: [],
141
+        class_time: [],
142
+        way: "",
143
+        machine_disinfectant: "",
144
+        disinfectant_way: "",
145
+        disinfectant: ""
155 146
       },
147
+      value: [],
156 148
       timeType: [
157 149
         { id: 1, name: "周一" },
158 150
         { id: 2, name: "周二" },
@@ -167,10 +159,7 @@ export default {
167 159
         { id: 2, name: "下午" },
168 160
         { id: 3, name: "晚上" }
169 161
       ],
170
-      disinfectType: [
171
-        { id: 1, name: "擦拭" },
172
-        { id: 2, name: "化学消毒" }
173
-      ],
162
+      disinfectType: [{ id: 1, name: "擦拭" }, { id: 2, name: "化学消毒" }],
174 163
       disinfectantType: [
175 164
         { id: 1, name: "0.22%季铵盐" },
176 165
         { id: 2, name: "500mg/l含氯消毒剂" },
@@ -212,6 +201,31 @@ export default {
212 201
           this.DeviceType = equit;
213 202
         }
214 203
       });
204
+    },
205
+    savePlan(formName) {
206
+      var devicetype = this.form.device_type;
207
+      var devicetypes = parseInt(devicetype);
208
+      this.form.device_type = devicetypes;
209
+
210
+      var ways = this.form.way;
211
+      var way = parseInt(ways);
212
+      this.form.way = way;
213
+
214
+      var machinedisinfectant = this.form.machine_disinfectant;
215
+      var machinedisinfectants = parseInt(machinedisinfectant);
216
+      this.form.machine_disinfectant = machinedisinfectants;
217
+
218
+      var disinfectantways = this.form.disinfectant_way;
219
+      var disinfectantway = parseInt(disinfectantways);
220
+      this.form.disinfectant_way = disinfectantway;
221
+
222
+      var disinfectants = this.form.disinfectant;
223
+      var disinfectant = parseInt(disinfectants);
224
+      this.form.disinfectant = disinfectant;
225
+      savePlan(this.form).then(response => {
226
+        if (response.data.state == 1) {
227
+        }
228
+      });
215 229
     }
216 230
   },
217 231
   created() {

+ 3 - 1
src/xt_pages/management/home.vue View File

@@ -879,6 +879,8 @@ export default {
879 879
             console.log('addmacher是什么东西', addmacher)
880 880
             var mode = response.data.data.mode
881 881
             console.log('mode', mode)
882
+            var zone = response.data.data.zone
883
+            console.log('zone', zone)
882 884
             const arr1 = []
883 885
             //  const cityOptions = ['HD', 'HDF', 'HD+HP', 'HP', 'HF', 'SCUF', 'IUF', 'HFHD+HP', 'HFR', 'HDF+HP', 'GRRT', '腹水回收']
884 886
             for (let index = 0; index < mode.length; index++) {
@@ -936,7 +938,7 @@ export default {
936 938
             this.form.id = addmacher.id
937 939
             this.form.serial_number = addmacher.serial_number
938 940
             this.form.device_type = addmacher.device_type
939
-            this.form.bed_number = addmacher.bed_number
941
+            this.form.bed_number = zone.name + addmacher.bed_number
940 942
             this.form.device_name = addmacher.device_name
941 943
             this.form.manufacture_factory = addmacher.manufacture_factory
942 944
             this.form.service_manufacturer = addmacher.service_manufacturer