heyang 2 jaren geleden
bovenliggende
commit
ba01290e66
3 gewijzigde bestanden met toevoegingen van 4 en 66 verwijderingen
  1. 2 2
      api/request/config.js
  2. 0 63
      pages/mine.vue
  3. 2 1
      pages_safetyExamine/examineManage/examineAddTow.vue

+ 2 - 2
api/request/config.js

@@ -9,8 +9,8 @@ const config = {
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
-	base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
-     //base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
+	 base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
+    // base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
 	 //base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址
       // base_url: 'https://lab.zjznai.com/labSaasSystem/', //矿大化工
 	// base_url: 'https://lab.zjznai.com/jdlabSystem/', //交大地址

+ 0 - 63
pages/mine.vue

@@ -31,77 +31,14 @@
             <view class="name-box-user">{{userData.professional}}丨{{userData.deptName}}</view>
           </view>
         </view>
-        <view class="num-max-box">
-          <view class="min-num-box" @click="goUserPage(1)">
-            <view class="min-num-view color-one">{{creditScore}}</view>
-            <view class="bottom-min-num-view">
-              <img class="img-one" src="@/images/icon_wd_xyf.png">
-              <view>信用分</view>
-            </view>
-          </view>
-          <view class="null-p"></view>
-          <view class="min-num-box" @click="goUserPage(2)">
-            <view class="min-num-view color-two">{{bonusPoints}}</view>
-            <view class="bottom-min-num-view">
-              <img class="img-two" src="@/images/icon_wd_jlf.png">
-              <view>奖励分</view>
-            </view>
-          </view>
-          <view class="null-p"></view>
-          <view class="min-num-box" @click="goUserPage(3)">
-            <view class="min-num-view">扫一扫</view>
-            <view class="bottom-min-num-view">
-              <img class="img-two" src="@/images/icon_wd_dh.png">
-              <view>兑换礼品</view>
-            </view>
-          </view>
-        </view>
       </view>
       <view class="button-max-big-box">
-        <view class="button-max-box" @click="goPage('alarm')" v-if="userType==1">
-          <img class="left-img" src="@/images/icon_003.png">
-          <view>安全报警</view>
-          <view class="view-three-one" v-if="securityAlertNum>0">{{securityAlertNum}}</view>
-          <img class="right-img" src="@/images/icon_04.png">
-        </view>
-        <view class="button-max-box" @click="goPage('laboratory')" v-if="userType==1">
-          <img class="left-img" src="@/images/icon_002.png">
-          <view>我的实验室</view>
-          <view class="view-three-two" v-if="adminSubCount>0">{{adminSubCount}}</view>
-          <img class="right-img" src="@/images/icon_04.png">
-        </view>
-        <view class="button-max-box" @click="goPage('record')" v-if="userType==1">
-          <img class="left-img" src="@/images/icon_004.png">
-          <view>预案执行记录</view>
-          <view class="view-three-two" v-if="wranDoCount>0">{{wranDoCount}}</view>
-          <img class="right-img" src="@/images/icon_04.png">
-        </view>
-        <view class="button-max-box" @click="goPage('faceImage')">
-          <img class="left-img" src="@/images/icon_001.png">
-          <view>身份验证</view>
-          <view class="view-three-type" :class="!ifFaceFeature?'colorA':'marginType'">{{!ifFaceFeature?'去认证':'已认证'}}</view>
-          <img class="right-img" src="@/images/icon_04.png">
-        </view>
         <view class="button-max-box" @click="goPage('signature')">
           <img class="left-img" src="@/images/icon_wd_dzqm.png">
           <view>电子签名</view>
           <view class="view-three-type" :class="!isUpload?'colorA':'marginType'">{{!isUpload?'未上传':'已上传'}}</view>
           <img class="right-img" src="@/images/icon_04.png">
         </view>
-        <view class="button-max-box" @click="goPage('upStudentCard')" v-if="userType==2&&certification.auditStatus">
-          <img class="left-img" src="@/images/icon_03.png">
-          <view>学生卡绑定</view>
-          <view class="view-three-type" :class="certification.auditStatus.code == 2 || certification.auditStatus.code == 3?'colorA':'marginType'">
-            {{certification.auditStatus.code == 0?'待审核':(certification.auditStatus.code == 1?'已绑定':(certification.auditStatus.code == 2?'未通过':(certification.auditStatus.code == 3?'去绑定':'')))}}
-          </view>
-          <img class="right-img" v-if="certification.auditStatus.code == 2 || certification.auditStatus.code == 3" src="@/images/icon_04.png">
-        </view>
-        <view class="button-max-box" @click="fingerprintClick()">
-          <img class="left-img" src="@/images/icon_wd_zw.png">
-          <view>指纹</view>
-          <view class="view-three-type" :class="Quantity>0?'marginType':'colorA'">{{Quantity>0?'已配置'+Quantity+'个':''}}</view>
-          <img class="right-img" src="@/images/icon_04.png">
-        </view>
 		<view class="button-max-box" @click="goPage('snapshot')">
 		  <img class="left-img" src="@/images/snapshot_icon.png">
 		  <view>随手拍</view>

+ 2 - 1
pages_safetyExamine/examineManage/examineAddTow.vue

@@ -533,13 +533,14 @@
 							return
 						}
 					}
+					
 					this.submitForm();
 				}
             },
 			//提交
 			async submitForm(){
 				let self = this;
-				let obj=self.form;
+				let obj=JSON.parse(JSON.stringify(self.form));
 				//语音备注JSON对象转字符串
 				for(let i=0;i<obj.checkHazardDtoList.length;i++){
 					if(obj.checkHazardDtoList[i].voiceRemark){