panxingxin 5 роки тому
батько
коміт
ecd7fc8e95

+ 1 - 1
dev.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.ionicframework.devSgZongLi" version="1.0.15" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.ionicframework.devSgZongLi" version="1.0.16" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>SG测试</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>

+ 1 - 1
prod.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.ionicframework.sgZongLi" version="1.0.15" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.ionicframework.sgZongLi" version="1.0.16" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>SG综礼</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>

+ 3 - 3
src/app/contract-detail/contract-detail.page.ts

@@ -67,14 +67,14 @@ export class ContractDetailPage implements OnInit {
       encodingType: this.camera.EncodingType.PNG,
       mediaType: this.camera.MediaType.PICTURE,
       targetWidth: 1500,
-      targetHeight: 1180
+      targetHeight: 1125
     }
 
     this.camera.getPicture(options).then((imageData) => {
       contract.imgList.push(
-        'data:image/jpeg;base64,' + imageData
+        'data:image/png;base64,' + imageData
       )
-      // contract.imgUrl = 'data:image/jpeg;base64,' + imageData
+      // contract.imgUrl = 'data:image/png;base64,' + imageData
       if (contract.imageData) {
         contract.imageData = contract.imageData + ',' + imageData
       } else {

+ 4 - 3
src/app/sample-detail/sample-detail.page.ts

@@ -47,6 +47,7 @@ export class SampleDetailPage implements OnInit {
             i.imgsrc = i.pictures[0].smallPicture
             let qadata = await this.userData.getSampleQAlog(i.sdpId)
             if (JSON.parse(qadata).data.length !== 0) {
+              console.log(qadata)
               for (let j of JSON.parse(qadata).data) {
                 i['qaIdList'].push(j.id) // qa记录的id数组
               }
@@ -71,14 +72,14 @@ export class SampleDetailPage implements OnInit {
       encodingType: this.camera.EncodingType.PNG,
       mediaType: this.camera.MediaType.PICTURE,
       targetWidth: 1500,
-      targetHeight: 1180
+      targetHeight: 1125
     }
 
     this.camera.getPicture(options).then((imageData) => {
       sample.imgList.push(
-        'data:image/jpeg;base64,' + imageData
+        'data:image/png;base64,' + imageData
       )
-      // sample.imgUrl = 'data:image/jpeg;base64,' + imageData
+      // sample.imgUrl = 'data:image/png;base64,' + imageData
       if (sample.imageData) {
         sample.imageData = sample.imageData + ',' + imageData
       } else {

+ 2 - 2
src/app/store-qc-detail/store-qc-detail.page.ts

@@ -99,12 +99,12 @@ export class StoreQCDetailPage implements OnInit {
       encodingType: this.camera.EncodingType.PNG,
       mediaType: this.camera.MediaType.PICTURE,
       targetWidth: 1500,
-      targetHeight: 1180
+      targetHeight: 1125
     }
 
     this.camera.getPicture(options).then((imageData) => {
       qc.qcimgList.push(
-        'data:image/jpeg;base64,' + imageData
+        'data:image/png;base64,' + imageData
       )
       if (qc.imageData) {
         qc.imageData = qc.imageData + ',' + imageData

+ 2 - 2
src/app/store-qc-scanning/store-qc-scanning.page.ts

@@ -194,12 +194,12 @@ export class StoreQCScanningPage implements OnInit {
       encodingType: this.camera.EncodingType.PNG,
       mediaType: this.camera.MediaType.PICTURE,
       targetWidth: 1500,
-      targetHeight: 1180
+      targetHeight: 1125
     }
 
     this.camera.getPicture(options).then((imageData) => {
       qc.qcimgList.push(
-        'data:image/jpeg;base64,' + imageData
+        'data:image/png;base64,' + imageData
       )
       if (qc.imageData) {
         qc.imageData = qc.imageData + ',' + imageData

+ 1 - 1
src/providers/user-data.ts

@@ -7,7 +7,7 @@ import { Router } from '@angular/router';
 import { AlertController } from '@ionic/angular';
 import { finalize } from 'rxjs/operators';
 import { queryForm } from './query';
-import { environment } from '../environments/environment.prod';
+import { environment } from '../environments/environment';
 
 
 @Injectable({