Browse Source

Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

陈少旭 1 year ago
parent
commit
c1230ada43

+ 150 - 13
src/xt_pages/dialysis/bloodPresssWatch.vue View File

@@ -525,9 +525,9 @@
525 525
         </div>
526 526
       </div>
527 527
       
528
-      <!-- <div style="margin-left: 1050px; margin-bottom: 10px;">
528
+      <div style="margin-left: 1050px; margin-bottom: 10px;">
529 529
         <el-button type="primary" size="small" @click="toExport">导出</el-button>
530
-      </div> -->
530
+      </div>
531 531
 
532 532
       <el-table
533 533
         :row-style="{ color: '#303133' }"
@@ -2220,6 +2220,7 @@ export default {
2220 2220
         
2221 2221
          if(this.SchedualPatientsTableData!=null){
2222 2222
           for(let i=0;i<this.SchedualPatientsTableData.length;i++){
2223
+
2223 2224
              this.SchedualPatientsTableData[i].index = i + 1
2224 2225
              this.SchedualPatientsTableData[i].start_time_one = ""
2225 2226
              this.SchedualPatientsTableData[i].start_time_two = ""
@@ -2228,46 +2229,181 @@ export default {
2228 2229
              this.SchedualPatientsTableData[i].start_time_five = ""
2229 2230
              this.SchedualPatientsTableData[i].start_time_six = ""
2230 2231
              this.SchedualPatientsTableData[i].start_time_seven = ""
2232
+
2233
+             this.SchedualPatientsTableData[i].blood_press_one = ""
2234
+             this.SchedualPatientsTableData[i].blood_press_two = ""
2235
+             this.SchedualPatientsTableData[i].blood_press_three = ""
2236
+             this.SchedualPatientsTableData[i].blood_press_four = ""
2237
+             this.SchedualPatientsTableData[i].blood_press_five = ""
2238
+             this.SchedualPatientsTableData[i].blood_press_six = ""
2239
+             this.SchedualPatientsTableData[i].blood_press_seven = ""
2240
+
2241
+
2242
+             this.SchedualPatientsTableData[i].temperature_one = ""
2243
+             this.SchedualPatientsTableData[i].temperature_two = ""
2244
+             this.SchedualPatientsTableData[i].temperature_three = ""
2245
+             this.SchedualPatientsTableData[i].temperature_four = ""
2246
+             this.SchedualPatientsTableData[i].temperature_five = ""
2247
+             this.SchedualPatientsTableData[i].temperature_six = ""
2248
+             this.SchedualPatientsTableData[i].temperature_seven = ""
2249
+
2250
+             this.SchedualPatientsTableData[i].breathing_rate_one = ""
2251
+             this.SchedualPatientsTableData[i].breathing_rate_two = ""
2252
+             this.SchedualPatientsTableData[i].breathing_rate_three = ""
2253
+             this.SchedualPatientsTableData[i].breathing_rate_four = ""
2254
+             this.SchedualPatientsTableData[i].breathing_rate_five = ""
2255
+             this.SchedualPatientsTableData[i].breathing_rate_six = ""
2256
+             this.SchedualPatientsTableData[i].breathing_rate_seven = ""
2257
+
2258
+             this.SchedualPatientsTableData[i].pulse_frequency_one = ""
2259
+             this.SchedualPatientsTableData[i].pulse_frequency_two = ""
2260
+             this.SchedualPatientsTableData[i].pulse_frequency_three = ""
2261
+             this.SchedualPatientsTableData[i].pulse_frequency_four = ""
2262
+             this.SchedualPatientsTableData[i].pulse_frequency_five = ""
2263
+             this.SchedualPatientsTableData[i].pulse_frequency_six = ""
2264
+             this.SchedualPatientsTableData[i].pulse_frequency_seven = ""
2265
+
2266
+
2267
+
2268
+
2269
+
2231 2270
              if(this.SchedualPatientsTableData[i].monitoring_record!=null&&this.SchedualPatientsTableData[i].monitoring_record.length>0){
2232 2271
              
2233
-              if(this.SchedualPatientsTableData[i].monitoring_record.length ==1){
2272
+              if(this.SchedualPatientsTableData[i].monitoring_record.length >=1){
2234 2273
                 if(this.SchedualPatientsTableData[i].monitoring_record[0].operate_time!=undefined){
2235 2274
                 this.SchedualPatientsTableData[i].start_time_one =this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[0].operate_time) 
2236 2275
                }
2276
+               if(this.SchedualPatientsTableData[i].monitoring_record[0].systolic_blood_pressure!=undefined &&this.SchedualPatientsTableData[i].monitoring_record[0].diastolic_blood_pressure!=undefined ){
2277
+                this.SchedualPatientsTableData[i].blood_press_one = this.SchedualPatientsTableData[i].monitoring_record[0].systolic_blood_pressure + "/" +this.SchedualPatientsTableData[i].monitoring_record[0].diastolic_blood_pressure
2278
+               }
2279
+               if(this.SchedualPatientsTableData[i].monitoring_record[0].temperature!=undefined){
2280
+                this.SchedualPatientsTableData[i].temperature_one =   this.SchedualPatientsTableData[i].monitoring_record[0].temperature
2281
+               }
2282
+               if(this.SchedualPatientsTableData[i].monitoring_record[0].breathing_rate!=undefined){
2283
+                 this.SchedualPatientsTableData[i].breathing_rate_one = this.SchedualPatientsTableData[i].monitoring_record[0].breathing_rate
2284
+               }
2285
+
2286
+               if(this.SchedualPatientsTableData[i].monitoring_record[0].pulse_frequency!=undefined){
2287
+                this.SchedualPatientsTableData[i].pulse_frequency_one = this.SchedualPatientsTableData[i].monitoring_record[0].pulse_frequency
2288
+               }
2289
+               
2237 2290
               }
2238
-              if(this.SchedualPatientsTableData[i].monitoring_record.length ==2){
2291
+              if(this.SchedualPatientsTableData[i].monitoring_record.length >=2){
2239 2292
                 if(this.SchedualPatientsTableData[i].monitoring_record[1].operate_time!=undefined){
2240 2293
                 this.SchedualPatientsTableData[i].start_time_two = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[1].operate_time)
2241 2294
                }
2295
+               if(this.SchedualPatientsTableData[i].monitoring_record[1].systolic_blood_pressure!=undefined &&this.SchedualPatientsTableData[i].monitoring_record[1].diastolic_blood_pressure!=undefined ){
2296
+                this.SchedualPatientsTableData[i].blood_press_two = this.SchedualPatientsTableData[i].monitoring_record[1].systolic_blood_pressure + "/" +this.SchedualPatientsTableData[i].monitoring_record[1].diastolic_blood_pressure
2297
+               }
2298
+               if(this.SchedualPatientsTableData[i].monitoring_record[1].temperature!=undefined){
2299
+                this.SchedualPatientsTableData[i].temperature_two =   this.SchedualPatientsTableData[i].monitoring_record[1].temperature
2300
+               }
2301
+               if(this.SchedualPatientsTableData[i].monitoring_record[1].breathing_rate!=undefined){
2302
+                 this.SchedualPatientsTableData[i].breathing_rate_two = this.SchedualPatientsTableData[i].monitoring_record[1].breathing_rate
2303
+               }
2304
+               if(this.SchedualPatientsTableData[i].monitoring_record[1].pulse_frequency!=undefined){
2305
+                this.SchedualPatientsTableData[i].pulse_frequency_two = this.SchedualPatientsTableData[i].monitoring_record[1].pulse_frequency
2306
+               }
2242 2307
               }
2243 2308
 
2244
-              if(this.SchedualPatientsTableData[i].monitoring_record.length==3){
2309
+              if(this.SchedualPatientsTableData[i].monitoring_record.length>=3){
2245 2310
                 if(this.SchedualPatientsTableData[i].monitoring_record[2].operate_time!=undefined){
2246 2311
                  this.SchedualPatientsTableData[i].start_time_three = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[2].operate_time) 
2247 2312
                }   
2313
+               if(this.SchedualPatientsTableData[i].monitoring_record[2].systolic_blood_pressure!=undefined &&this.SchedualPatientsTableData[i].monitoring_record[2].diastolic_blood_pressure!=undefined ){
2314
+                this.SchedualPatientsTableData[i].blood_press_three = this.SchedualPatientsTableData[i].monitoring_record[2].systolic_blood_pressure + "/" +this.SchedualPatientsTableData[i].monitoring_record[2].diastolic_blood_pressure
2315
+               }
2316
+               if(this.SchedualPatientsTableData[i].monitoring_record[2].temperature!=undefined){
2317
+                this.SchedualPatientsTableData[i].temperature_three =   this.SchedualPatientsTableData[i].monitoring_record[2].temperature
2318
+               }
2319
+
2320
+               if(this.SchedualPatientsTableData[i].monitoring_record[2].breathing_rate!=undefined){
2321
+                 this.SchedualPatientsTableData[i].breathing_rate_three = this.SchedualPatientsTableData[i].monitoring_record[2].breathing_rate
2322
+               }
2323
+               if(this.SchedualPatientsTableData[i].monitoring_record[2].pulse_frequency!=undefined){
2324
+                this.SchedualPatientsTableData[i].pulse_frequency_three= this.SchedualPatientsTableData[i].monitoring_record[2].pulse_frequency
2325
+               }
2248 2326
               }
2249 2327
               
2250
-              if(this.SchedualPatientsTableData[i].monitoring_record.length ==4){
2328
+              if(this.SchedualPatientsTableData[i].monitoring_record.length >=4){
2251 2329
                 if(this.SchedualPatientsTableData[i].monitoring_record[3].operate_time!=undefined){
2252 2330
                   this.SchedualPatientsTableData[i].start_time_four = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[3].operate_time)
2253 2331
                 }
2332
+                if(this.SchedualPatientsTableData[i].monitoring_record[3].systolic_blood_pressure!=undefined &&this.SchedualPatientsTableData[i].monitoring_record[3].diastolic_blood_pressure!=undefined ){
2333
+                this.SchedualPatientsTableData[i].blood_press_four = this.SchedualPatientsTableData[i].monitoring_record[3].systolic_blood_pressure + "/" +this.SchedualPatientsTableData[i].monitoring_record[3].diastolic_blood_pressure
2334
+               }
2335
+               if(this.SchedualPatientsTableData[i].monitoring_record[3].temperature!=undefined){
2336
+                this.SchedualPatientsTableData[i].temperature_four = this.SchedualPatientsTableData[i].monitoring_record[3].temperature
2337
+               }
2338
+
2339
+               if(this.SchedualPatientsTableData[i].monitoring_record[3].breathing_rate!=undefined){
2340
+                 this.SchedualPatientsTableData[i].breathing_rate_four = this.SchedualPatientsTableData[i].monitoring_record[3].breathing_rate
2341
+               }
2342
+               if(this.SchedualPatientsTableData[i].monitoring_record[3].pulse_frequency!=undefined){
2343
+                this.SchedualPatientsTableData[i].pulse_frequency_four= this.SchedualPatientsTableData[i].monitoring_record[3].pulse_frequency
2344
+               }
2254 2345
               }
2255 2346
             
2256
-              if(this.SchedualPatientsTableData[i].monitoring_record.length ==5){
2347
+              if(this.SchedualPatientsTableData[i].monitoring_record.length >=5){
2257 2348
                 if(this.SchedualPatientsTableData[i].monitoring_record[4].operate_time!=undefined){
2258 2349
                   this.SchedualPatientsTableData[i].start_time_five = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[4].operate_time) 
2259 2350
                 }
2351
+                if(this.SchedualPatientsTableData[i].monitoring_record[4].systolic_blood_pressure!=undefined &&this.SchedualPatientsTableData[i].monitoring_record[4].diastolic_blood_pressure!=undefined ){
2352
+                this.SchedualPatientsTableData[i].blood_press_five = this.SchedualPatientsTableData[i].monitoring_record[4].systolic_blood_pressure + "/" +this.SchedualPatientsTableData[i].monitoring_record[4].diastolic_blood_pressure
2353
+               }
2354
+               if(this.SchedualPatientsTableData[i].monitoring_record[4].temperature!=undefined){
2355
+                this.SchedualPatientsTableData[i].temperature_five =   this.SchedualPatientsTableData[i].monitoring_record[4].temperature
2356
+               }
2357
+
2358
+               if(this.SchedualPatientsTableData[i].monitoring_record[4].breathing_rate!=undefined){
2359
+                 this.SchedualPatientsTableData[i].breathing_rate_five = this.SchedualPatientsTableData[i].monitoring_record[4].breathing_rate
2360
+               }
2361
+
2362
+               if(this.SchedualPatientsTableData[i].monitoring_record[4].pulse_frequency!=undefined){
2363
+                this.SchedualPatientsTableData[i].pulse_frequency_five= this.SchedualPatientsTableData[i].monitoring_record[4].pulse_frequency
2364
+               }
2260 2365
               }
2261 2366
               
2262
-              if(this.SchedualPatientsTableData[i].monitoring_record.length ==6){
2367
+              if(this.SchedualPatientsTableData[i].monitoring_record.length >=6){
2263 2368
                 if(this.SchedualPatientsTableData[i].monitoring_record[5].operate_time!=undefined){
2264 2369
                 this.SchedualPatientsTableData[i].start_time_six = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[5].operate_time) 
2265 2370
                }
2371
+               if(this.SchedualPatientsTableData[i].monitoring_record[5].systolic_blood_pressure!=undefined &&this.SchedualPatientsTableData[i].monitoring_record[5].diastolic_blood_pressure!=undefined ){
2372
+                this.SchedualPatientsTableData[i].blood_press_six = this.SchedualPatientsTableData[i].monitoring_record[5].systolic_blood_pressure + "/" +this.SchedualPatientsTableData[i].monitoring_record[5].diastolic_blood_pressure
2373
+               }
2374
+
2375
+               if(this.SchedualPatientsTableData[i].monitoring_record[5].temperature!=undefined){
2376
+                this.SchedualPatientsTableData[i].temperature_six =   this.SchedualPatientsTableData[i].monitoring_record[5].temperature
2377
+               }
2378
+
2379
+               if(this.SchedualPatientsTableData[i].monitoring_record[5].breathing_rate!=undefined){
2380
+                 this.SchedualPatientsTableData[i].breathing_rate_six = this.SchedualPatientsTableData[i].monitoring_record[5].breathing_rate
2381
+               }
2382
+
2383
+               if(this.SchedualPatientsTableData[i].monitoring_record[5].pulse_frequency!=undefined){
2384
+                this.SchedualPatientsTableData[i].pulse_frequency_six= this.SchedualPatientsTableData[i].monitoring_record[5].pulse_frequency
2385
+               }
2386
+
2387
+
2266 2388
               }
2267
-              if(this.SchedualPatientsTableData[i].monitoring_record.length == 7){
2389
+              if(this.SchedualPatientsTableData[i].monitoring_record.length >= 7){
2268 2390
                 if(this.SchedualPatientsTableData[i].monitoring_record[6].operate_time!=undefined){
2269 2391
                  this.SchedualPatientsTableData[i].start_time_seven = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[6].operate_time) 
2270 2392
                }
2393
+               if(this.SchedualPatientsTableData[i].monitoring_record[6].systolic_blood_pressure!=undefined &&this.SchedualPatientsTableData[i].monitoring_record[6].diastolic_blood_pressure!=undefined ){
2394
+                this.SchedualPatientsTableData[i].blood_press_seven = this.SchedualPatientsTableData[i].monitoring_record[6].systolic_blood_pressure + "/" +this.SchedualPatientsTableData[i].monitoring_record[6].diastolic_blood_pressure
2395
+               }
2396
+               if(this.SchedualPatientsTableData[i].monitoring_record[6].temperature!=undefined){
2397
+                this.SchedualPatientsTableData[i].temperature_seven =   this.SchedualPatientsTableData[i].monitoring_record[6].temperature
2398
+               }
2399
+
2400
+               if(this.SchedualPatientsTableData[i].monitoring_record[6].breathing_rate!=undefined){
2401
+                 this.SchedualPatientsTableData[i].breathing_rate_seven = this.SchedualPatientsTableData[i].monitoring_record[6].breathing_rate
2402
+               }
2403
+
2404
+               if(this.SchedualPatientsTableData[i].monitoring_record[6].pulse_frequency!=undefined){
2405
+                this.SchedualPatientsTableData[i].pulse_frequency_seven= this.SchedualPatientsTableData[i].monitoring_record[6].pulse_frequency
2406
+               }
2271 2407
               }
2272 2408
            
2273 2409
             
@@ -2278,10 +2414,11 @@ export default {
2278 2414
           
2279 2415
          }
2280 2416
          console.log("监测统计",this.SchedualPatientsTableData)
2281
-         const multiHeader = [['序号','机号','排班日期','上机时间','透析号','姓名','透析模式','目标超滤量','透前血压','干体重','透前称重','透后称重','监测时间']]
2282
-         const header = ['','','','','','','','','','','','1','2','3','4','5','6','7']
2283
-         const merges = ['A1:A2', 'B1:B2', 'C1:C2', 'D1:D2', 'E1:E2','F1:F2','G1:G2','H1:H2', 'I1:I2','J1:J2','K1:K2','L1:L2','M1:S1']
2284
-          const filterVal = ['index', 'number', 'sch_time', 'start_time', 'dialysis_no', 'name', 'mode_name', 'target_ultrafiltration', 'pressure_name', 'dry_weight', 'dialysis_before_weight', 'dialysis_after_weight','start_time_one','start_time_one','start_time_one','start_time_one','start_time_one','start_time_one','start_time_one']
2417
+        
2418
+         const multiHeader = [['序号','机号','排班日期','上机时间','透析号','姓名','透析模式','目标超滤量','透前血压','干体重','透前称重','透后称重','监测时间','','','','','','','透中血压','','','','','','','体温','','','','','','','呼吸','','','','','','','脉搏','','','','','','']]
2419
+         const header = ['','','','','','','','','','','','','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次',]
2420
+         const merges = ['A1:A2', 'B1:B2', 'C1:C2', 'D1:D2', 'E1:E2','F1:F2','G1:G2','H1:H2', 'I1:I2','J1:J2','K1:K2','L1:L2','M1:S1','T1:Z1','AA1:AG1','AH1:AN1','AO1:AU1']
2421
+        const filterVal = ['index', 'number', 'sch_time', 'start_time', 'dialysis_no', 'name', 'mode_name', 'target_ultrafiltration', 'pressure_name', 'dry_weight', 'dialysis_before_weight', 'dialysis_after_weight','start_time_one','start_time_two','start_time_three','start_time_four','start_time_five','start_time_six','start_time_seven','blood_press_one','blood_press_two','blood_press_three','blood_press_four','blood_press_five','blood_press_six','blood_press_seven','temperature_one','temperature_two','temperature_three','temperature_four','temperature_five','temperature_six','temperature_seven','breathing_rate_one','breathing_rate_two','breathing_rate_three','breathing_rate_four','breathing_rate_five','breathing_rate_six','breathing_rate_seven','pulse_frequency_one','pulse_frequency_two','pulse_frequency_three','pulse_frequency_four','pulse_frequency_five','pulse_frequency_six','pulse_frequency_seven']
2285 2422
      
2286 2423
          const data = this.formatJson(filterVal, this.SchedualPatientsTableData) 
2287 2424
          const filename = '监测数据'

+ 1 - 1
src/xt_pages/outpatientTool/components/detailStatistics.vue View File

@@ -48,7 +48,7 @@
48 48
         </el-date-picker>
49 49
         <el-button type="primary" size="small" @click="toPrint">打印</el-button>
50 50
 
51
-        <el-button type="primary" size="small" @click="toExport">导出</el-button>
51
+        <!-- <el-button type="primary" size="small" @click="toExport">导出</el-button> -->
52 52
 
53 53
       </div>
54 54
       <div></div>

+ 21 - 3
src/xt_pages/role/admin.vue View File

@@ -57,15 +57,24 @@
57 57
           size="small"
58 58
           icon="el-icon-circle-plus-outline"
59 59
           style="float:left"
60
-          @click="toTestThree">创建合同</el-button> -->
60
+          @click="toTestThree">创建合同</el-button>
61 61
 
62
-          <!-- <el-button
62
+          <el-button
63 63
           type="primary"
64 64
           size="small"
65 65
           icon="el-icon-circle-plus-outline"
66 66
           style="float:left"
67 67
           @click="toTestSeven">添加合同签署人</el-button> -->
68 68
 
69
+         
70
+         <!-- <el-button
71
+          type="primary"
72
+          size="small"
73
+          icon="el-icon-circle-plus-outline"
74
+          style="float:left"
75
+          @click="toTestNight">后台签署</el-button> -->
76
+          
77
+
69 78
           <!-- <el-button   type="primary"
70 79
           size="small"
71 80
           icon="el-icon-circle-plus-outline"
@@ -227,7 +236,7 @@
227 236
 </template>
228 237
 
229 238
 <script>
230
-import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight } from "@/api/role/admin";
239
+import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight } from "@/api/role/admin";
231 240
 import { getRoles } from "@/api/role/role";
232 241
 
233 242
 import { parseTime } from "@/utils";
@@ -581,6 +590,15 @@ export default {
581 590
            this.$message.success("保存")
582 591
         }
583 592
       })
593
+    },
594
+    toTestNight(){
595
+      toTestNight().then(response=>{
596
+        if(response.data.state == 1){
597
+          var sign =  response.data.data.sign
598
+          console.log("sign",sign)
599
+          this.$message.success("保存")
600
+        }
601
+      })
584 602
     }
585 603
   },
586 604
   watch: {

+ 14 - 14
src/xt_pages/user/inspection.vue View File

@@ -131,7 +131,7 @@
131 131
                 min-width="180"
132 132
               >
133 133
                 <template slot-scope="scope">
134
-                 <span v-if="scope.row.item_name!=''"> {{ scope.row.item_name }} {{ scope.row.item_name_addition }}</span> 
134
+                 <span v-if="scope.row.item_name!=''"> {{ scope.row.item_name }} {{ scope.row.item_name_addition }}</span>
135 135
                 </template>
136 136
               </el-table-column>
137 137
 
@@ -192,7 +192,7 @@
192 192
                 <el-col :span="7" :key="index">
193 193
                   <div style=" margin: 5px;">
194 194
                     <el-row :gutter="20">
195
-                      <el-col :span="8" style="width: 100%;height: 150px;">
195
+                      <el-col :span="8" style="width: 100%;">
196 196
                         <div style="width: 100%;height: 150px;" >
197 197
                           <div @click="imgClicks(item.value)">
198 198
                             <el-tooltip
@@ -448,7 +448,7 @@
448 448
       <div slot="footer" class="dialog-footer">
449 449
         <el-upload
450 450
           :data="uploadData"
451
-          :multiple="false"
451
+          :multiple="true"
452 452
           action="https://upload.qiniup.com"
453 453
           :show-file-list="false"
454 454
           :on-error="handleAvatarError"
@@ -815,12 +815,12 @@ export default {
815 815
       this.dialogRemindFormVisible = true
816 816
       // this.temp_remind_cycle = this.
817 817
 
818
-    },openPic() {
818
+    },
819
+    openPic() {
819 820
       if (this.project == null) {
820 821
         this.$message.error('请先选择项目')
821 822
         return false
822 823
       }
823
-
824 824
       this.form.pic_method = 'add'
825 825
       this.formTitle = '新增' + this.project.project_name
826 826
       this.form.project_id = this.project.project_id
@@ -1297,22 +1297,22 @@ export default {
1297 1297
             var items = this.project.inspection_reference
1298 1298
             console.log("i5ems2323232wo",items)
1299 1299
             for (var index in items) {
1300
-             
1300
+
1301 1301
              console.log("obj",items[index])
1302 1302
               // console.log("inspectionsMap",inspectionsMap[items[index].item_id])
1303 1303
               var item = {}
1304
-            
1304
+
1305 1305
               for (var key in items[index]) {
1306 1306
                 //  console.log("key",key,items[index][key])
1307 1307
                 //  console.log("item[key]",item[key])
1308 1308
                 item[key] = items[index][key]
1309 1309
               }
1310
-             
1310
+
1311 1311
               if (item.item_id > 0) {
1312
-                 
1312
+
1313 1313
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
1314
-                  
1315
-                 
1314
+
1315
+
1316 1316
 
1317 1317
                   if(this.org_id == 10121 || this.org_id == 0 ){
1318 1318
                     item.value = inspectionsMap[items[index].id].inspect_value
@@ -1323,13 +1323,13 @@ export default {
1323 1323
                   }
1324 1324
 
1325 1325
                 } else {
1326
-                 
1326
+
1327 1327
                   item.value = inspectionsMap[items[index].item_id].inspect_value
1328 1328
                   item.item_name = inspectionsMap[items[index].item_id].item_name
1329 1329
 
1330 1330
                 }
1331 1331
               } else {
1332
-               
1332
+
1333 1333
                 item.value = inspectionsMap[items[index].id].inspect_value
1334 1334
                 item.item_name = inspectionsMap[items[index].id].item_name
1335 1335
 
@@ -1351,7 +1351,7 @@ export default {
1351 1351
               if(item.item_name!=""){
1352 1352
                 this.items.push(item)
1353 1353
               }
1354
-            
1354
+
1355 1355
               console.log("items232232332wo",this.items)
1356 1356
 
1357 1357
               if(item.value.indexOf("http") >= 0){

+ 34 - 6
src/xt_pages/user/inspectionCheck.vue View File

@@ -117,9 +117,23 @@
117 117
             <el-row>
118 118
               <template v-for="(item, index) in items">
119 119
                 <el-col :span="7" :key="index">
120
-                  <div style="width: 400px">
120
+                  <div style="margin: 5px;">
121 121
                     <el-row>
122
-                      <img  :src="item.value" alt="">
122
+                      <el-col :span="8" style="width: 100%;">
123
+                        <div style="width: 100%;height: 150px;" >
124
+                          <div @click="imgClicks(item.value)">
125
+                            <el-tooltip
126
+                              class="item"
127
+                              effect="dark"
128
+                              :hide-after="2000"
129
+                              content="点击查看大图"
130
+                              placement="top-start"
131
+                              >
132
+                                <img style="width: 300px;height: 150px;" :src="item.value" alt="">
133
+                              </el-tooltip>
134
+                          </div>
135
+                        </div>
136
+                      </el-col>
123 137
                     </el-row>
124 138
                     <el-row>
125 139
                       <div style="word-break: break-all;word-wrap: break-word">{{item.item_name}}</div>
@@ -266,7 +280,7 @@
266 280
       <div slot="footer" class="dialog-footer">
267 281
         <el-upload
268 282
           :data="uploadData"
269
-          :multiple="false"
283
+          :multiple="true"
270 284
           action="https://upload.qiniup.com"
271 285
           :show-file-list="false"
272 286
           :on-error="handleAvatarError"
@@ -322,15 +336,19 @@
322 336
         >
323 337
       </div>
324 338
     </el-dialog>
325
-
339
+    <el-image-viewer
340
+        v-if="showViewer"
341
+        :on-close="closeViewer"
342
+        :url-list="imgs"
343
+      ></el-image-viewer>
326 344
   </div>
327 345
 
328 346
 </template>
329 347
 
330 348
 <script>
331 349
 import PatientSidebar from './components/PatientSidebar'
350
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
332 351
 import { getToken } from '@/api/qiniu'
333
-
334 352
 import {
335 353
   CreatePatientInspection,
336 354
   CreatePatientPICInspection,
@@ -345,7 +363,7 @@ import { getFileExtension, uParseTime } from '@/utils/tools'
345 363
 
346 364
 export default {
347 365
   name: 'Inspection',
348
-  components: { PatientSidebar },
366
+  components: { PatientSidebar,ElImageViewer },
349 367
   data() {
350 368
     return {
351 369
       temp_remind_cycle:"",
@@ -353,6 +371,7 @@ export default {
353 371
       check_content:"",
354 372
       qiniuDomain: 'https://images.shengws.com/',
355 373
       isPic:false,
374
+      showViewer:false,
356 375
       uploadData: { token: '', key: '' },
357 376
       pageLoading: true,
358 377
       itemLoading: false,
@@ -395,6 +414,15 @@ export default {
395 414
     }
396 415
   },
397 416
   methods: {
417
+    imgClicks(val){
418
+      console.log('asdasgg',val);
419
+      this.imgs = []
420
+      this.imgs.push(val)
421
+      this.showViewer = true
422
+    },
423
+    closeViewer(){
424
+      this.showViewer = false
425
+    },
398 426
     beforeAvatarUpload(file) {
399 427
       // const isJPG = file.type === "image/jpeg";
400 428
       var fileType = file.type