heyang пре 2 година
родитељ
комит
3dcbc3ee7f

+ 1 - 4
pages/gradingControl/gradingControlAdd.vue

@@ -18,9 +18,7 @@
 									<view class="list_li_b_t_t_r" v-if="control.isExpired==1">(过期未完成)</view>
 									<view class="list_li_b_t_t_rr" >{{control.endDate}}</view>
 								</view>
-								<!-- <img class="list_li_b_t_t_img" src="@/images/icon_04.png"> -->
 							</view>
-							<!-- <view class="list_li_b_t_b">{{control.ruleRemark}}</view> -->
 						</view>
 						<view class="flex-view">
 							<view><text style="margin-right: 20rpx;"></text>执行方式:</view>
@@ -33,7 +31,7 @@
 						<view class="list_li_b_b2"><text style="position: relative;top: 4rpx;color: #f00;margin-right: 10rpx;">*</text>执行描述:</view>
 						<textarea class="list_li_b_b3" v-model="param.detail.remark" maxlength="30" placeholder-class="placeholder-style" placeholder="请输入执行描述"></textarea>
 						<view class="list_li_b_b4" v-if="control.isUpload==1"><text style="position: relative;top: 4rpx;color: #f00;margin-right: 10rpx;">*</text>执行材料:<label @click="itemUpData(item)">+ 请上传执行材料</label></view>
-						<!-- <view class="list_li_b_b5" v-if="upList.length>0" v-for="item in upList">执行材料:<label>{{item.name}}</label></view> -->
+					
 						<view class="list_li_b_b6" v-if="upList.length>0" v-for="(item,index) in upList" :key="index">
 							<view @click="download(item)">{{item.name}}</view>
 							<view @click="delImg(index)">
@@ -43,7 +41,6 @@
 					</view>
 				</view>
 			</view>
-           <!-- <view class="get-null-box" v-if="getData.nullDataType">暂无更多数据</view> -->
         </scroll-view>
         <view class="bottom-button-box" @click="goSafeAccess">完成</view>
     </view>

+ 0 - 6
pages/gradingControl/gradingControlDetail.vue

@@ -15,10 +15,8 @@
 								<view class="list_li_b_t_t_n">
 									<view class="list_li_b_t_t_l" :class="[infoList.ruleType== '日管控' ? 'purple': '', infoList.ruleType=='周管控'? 'blue': '',infoList.ruleType=='月管控'? 'orange': '',infoList.ruleType=='年管控'? 'green': '',]">{{infoList.ruleType}}</view>
 									<view class="list_li_b_t_t_c">{{infoList.ruleName}}</view>
-									<!-- <view class="list_li_b_t_t_r">(过期未完成)</view> -->
 								</view>
 								<view class="list_li_b_t_t_n_r">{{infoList.endDate}}</view>
-								<!-- <img class="list_li_b_t_t_img" src="@/images/icon_04.png"> -->
 							</view>
 							<view class="list_li_b_t_b" style="display: flex;"><label style="width:150rpx;">执行方式:</label>{{infoList.isAll==1?'多人执行':'单人执行'}}</view>
 							<view class="list_li_b_t_b" style="display: flex;"><label style="width:150rpx;">规则描述:</label>{{infoList.ruleRemark}}</view>
@@ -34,10 +32,7 @@
 								<view style="flex:1;word-wrap:break-word;word-break:break-all;overflow: hidden;">{{infoList.detail.remark}}</view>
 							</view>
 						</view>
-						<!-- <view class="list_li_b_b">执行时间:<label>{{infoList.carryTime}}</label></view>
-						<view class="list_li_b_b2"><label>执行描述:</label>{{infoList.detail.remark}}</view> -->
 						<view class="list_li_b_b4" v-if="infoList.status == 2">
-							<!-- <label @click="lockImg(infoList.detail.imgUrl)">{{infoList.detail.imgName}}</label> -->
 							<label>执行材料:</label>
 							<view class="list_li_b_b4_n">
 								<view class="list_li_b_b4_r" v-for="(item,index) in upList" :key="index" @click="lookItem(item)">
@@ -55,7 +50,6 @@
 			</view>
 
         </scroll-view>
-       <!-- <view class="bottom-button-box" @click="goSafeAccess">完成记录</view> -->
     </view>
 </template>
 

+ 0 - 5
pages/studentWorkbench.vue

@@ -1,7 +1,6 @@
 <!-- 学生端工作台 -->
 <template>
   <view class="user-workbench">
-    <!-- <img class="top-big-img" src="@/images/Version2.2/ing_bg_banner.png"> -->
     <img class="top-big-img" :src="homepageBanner">
     <view class="min-icon-button-box">
       <view @click="goPage('casuallyPat')">
@@ -20,10 +19,6 @@
         <img src="@/images/Version2.2/icon_sy_aqjc.png">
         <view>安全检查</view>
       </view>
-      <!-- <view @click="goNull">
-        <img src="@/images/Version2.2/icon_sy_aqxx.png">
-        <view>安全学习</view>
-      </view> -->
       <view @click="goPage('photoInspection')">
         <img src="@/images/icon_dzt_pzjc.png">
         <view>拍照检查</view>

+ 1 - 4
pages_manage/workbench/laboratory/monitor.vue

@@ -42,10 +42,7 @@
         </view>
         <view class="broadcast_m">
           <view class="broadcast_m_t" :class="liveType?'broadcast_m_t_back_a':'broadcast_m_t_back_b'" @longpress.stop="recordButton" @touchmove.stop="cancelButton"  @touchend.stop="sendButton">
-            <!-- <img src="@/images/icon_sskz_azsh.png" v-if="!liveType">
-            <img src="@/images/icon_sskz_skfs.png" v-if="liveType"> -->
-            <!-- <label class="slip_color" v-if="!liveType">按住说话</label>
-            <label class="press_color" v-if="liveType">松开发送</label> -->
+        
             {{liveType?'松开发送':'按住说话'}}
           </view>
           <view class="broadcast_m_b" v-if="!liveType">按住说话,录入广播内容</view>