heyang

pages/login.vue

@@ -4,12 +4,6 @@
     <!-- <img class="login-max-big" src="@/images/img_bg_dl.png"> -->
     <img class="login-max-big" :src="loginBanner">
     <view class="login-box">
-	  <view class="tabTitle">
-	  	<view class="tabTitle_li" @tap="tabClick(index)"  :key="index" v-for="(item,index) in tabText">
-	  		<view :class="{on:curTab==index}" class="tabTitle_text">{{item}}</view>
-	  	    <view :class="{on:curTab==index}" class="tabTitle_across"></view>
-	  	</view>
-	  </view>
       <view class="input-max-box-one">
         <view class="input-box">
           <img src="@/images/img_log_in_account.png"/>
@@ -28,12 +22,14 @@
         <view>记住我</view>
       </view>
       <view class="button-box" @click="login">登录</view>
-      <view class="supplier" v-if="curTab==1">
+      <view class="supplier" v-if="identityStatus==2">
         <view class="supplier_l" @click="handleClick('forget')">忘记密码</view>
         <view class="supplier_r" @click="handleClick('register')">没有账号，<text>立即注册</text></view>
       </view>
+      <!-- 供应商 -->
+      <view class="switch_btn" @click="switchClick()">{{identityStatus==2?'师生登录':'供应商登录'}}<img  src="@/images/Version3.0/icon_ssdl_qh.png"/></view>
     </view>
-    <!-- <img class="top-back" src="@/images/img_sys_bg.png"/> -->
+    <img class="top-back" src="@/images/img_sys_bg.png"/>
   </view>
 </template>
 
@@ -50,8 +46,6 @@ export default {
       checkedType:false,
       loginBanner:uni.getStorageSync('loginBanner'),
       infoList:[],//模板消息Id
-	  tabText:['师生登录','供应商登录'],
-	  curTab:0,
     }
   },
 
@@ -74,11 +68,6 @@ export default {
 
   },
   methods: {
-	  //顶部tab点击
-	  tabClick(index) {
-	  	this.curTab = index;
-	
-	  },
     //获取openID
     async getOpenId(){
       let _this=this;
@@ -264,56 +253,15 @@ export default {
     z-index:0;
   }
   .login-box{
-    z-index:3;
+    z-index:1;
     position: absolute
     top:446rpx;
     left:46rpx;
     width:658rpx;
     height:700rpx;
     // background #fff
-	/* 切换按钮 */
-	.tabTitle{
-		display flex;
-		width:100%;
-		height: 100rpx;
-		position: absolute;
-		top: 50rpx;
-		justify-content: center;
-		>view:nth-of-type(1){
-			margin-right: 100rpx;
-		}
-		.tabTitle_li{
-			width:168rpx;
-			text-align center;
-			.tabTitle_text{
-				display: inline-block;
-				font-size: 32rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				line-height: 90rpx;
-				&.on{
-					color:#0183FA;
-				}
-			}
-			.tabTitle_across{
-				width: 100rpx;
-				height: 4rpx;
-				background: #0183FA;
-				border-radius: 2rpx;
-				margin-left 30rpx;
-				display none;
-				&.on{
-					display block;
-				}
-			}
-	
-		}
-	}
     border-radius:20rpx;
     .input-max-box-one{
-		overflow: hidden;
-		margin-top:68rpx;
       .input-box{
         display flex
         width:600rpx;

pages_manage/workbench/laboratory/laboratoryInfo.vue

@@ -112,26 +112,39 @@
             <view>{{itemData.safeInfo.safeUser[0]?"":"未设置"}}</view>
           </view>
            <view class="text-min-box" v-for="(item,index) in itemData.safeInfo.safeUser" :key="index">
-			  <view style="color:#999;">{{item.name}}</view>
-			  <view>{{item.phone?item.phone:'未填写'}}</view>
-			</view>
+    		  <view style="color:#999;">{{item.name}}</view>
+    		  <view>{{item.phone?item.phone:'未填写'}}</view>
+    		</view>
         </view>
-        <view class="safety-max-box" v-if="item.privateList.length>0 && item.classifyType==1" v-for="(item,index) in  itemData.classifyList">
-          <view class="max-for-box">
-            <view class="title-box">{{item.classifyName}}</view>
-            <view class="for-box" v-for="(item2,index2) in item.privateList" :key="index2">● {{item2.infoName}}</view>
+        <view class="safety-max-box" v-if="itemData.hazardCategory[0]||itemData.riskMeasure[0]||itemData.outfire[0]">
+          <view class="max-for-box" v-if="itemData.hazardCategory[0]">
+            <view class="title-box">主要危险类别</view>
+            <view class="for-box" v-for="(item,index1) in itemData.hazardCategory" :key="index1">● {{item}}</view>
+          </view>
+          <view class="max-for-box" v-if="itemData.riskMeasure[0]">
+            <view class="title-box">风险防控措施</view>
+            <view class="for-box" v-for="(item,index1) in itemData.riskMeasure" :key="index1">● {{item}}</view>
+          </view>
+          <view class="max-for-box" v-if="itemData.outfire[0]">
+            <view class="title-box">灭火要点</view>
+            <view class="for-box" v-for="(item,index1) in itemData.outfire" :key="index1">● {{item}}</view>
           </view>
         </view>
-        <view class="img-bottom-box" v-if="item.privateList.length>0 && item.classifyType==2" v-for="(item,index) in  itemData.classifyList">
-          <view class="title-box">{{item.classifyName}}</view>
+        <view class="img-bottom-box" v-if="itemData.safeSigns[0]||itemData.qrCode">
+          <view class="title-box">安全警示标识</view>
           <view class="for-box">
-			  <img class="img-ojb" :src="baseUrl+item2.infoContent" v-for="(item2,index2) in item.privateList" :key="index2">
-			  <img v-if="itemData.safeInfo.qrCodeUrl" class="code-img" :src="itemData.safeInfo.qrCodeUrl">
+            <img class="img-ojb" src="@/pages_manage/images/icon_aqxxp_jzxy.png" v-if="item == 'xiyan'" v-for="(item,index) in itemData.safeSigns" :key="index">
+            <img class="img-ojb" src="@/pages_manage/images/icon_aqxxp_jzys.png" v-if="item == 'yinshi'" v-for="(item,index) in itemData.safeSigns" :key="index">
+            <img class="img-ojb" src="@/pages_manage/images/icon_aqxxp_dxaq.png" v-if="item == 'anquan'" v-for="(item,index) in itemData.safeSigns" :key="index">
+            <img class="img-ojb" src="@/pages_manage/images/icon_aqxxp_gzf.png" v-if="item == 'gongzuofu'" v-for="(item,index) in itemData.safeSigns" :key="index">
+            <img class="img-ojb" src="@/pages_manage/images/icon_aqxxp_gbmc.png" v-if="item == 'menchuang'" v-for="(item,index) in itemData.safeSigns" :key="index">
+            <img class="img-ojb" src="@/pages_manage/images/icon_aqxxp_gbsd.png" v-if="item == 'shuidian'" v-for="(item,index) in itemData.safeSigns" :key="index">
+            <img v-if="itemData.safeInfo.qrCodeUrl" class="code-img" :src="itemData.safeInfo.qrCodeUrl">
           </view>
         </view>
       </view>
     </view>
-	<!-- 一键灭火遮罩-->
+    <!-- 一键灭火遮罩-->
 	<view class="shade-outfire" v-if="dialogVisible">
 	  <view class="null-box" @click="dialogOutfire()"></view>
 	  <view class="shade-outfire-n">