heyang

pages/earlyWarningManage/earlyWarningDetail.vue

@@ -170,7 +170,7 @@
 			</view>
 		</view>
 		<view v-if="form.warningType==3 &&form.dispose==0" class="sub_btn" @click="submitForm()">确认处理</view>
-		<view  class="bottom_btn" v-if="timeStatus && (form.warningSubType!=2 && form.warningSubType!=3 && form.warningSubType!=4)" @click="handleClick('','monitor')">查看监控</view>
+		<view  class="bottom_btn" v-if="timeStatus && form.warningType!=3&& (form.warningSubType!=2 && form.warningSubType!=3 && form.warningSubType!=4)" @click="handleClick('','monitor')">查看监控</view>
 	</scroll-view>	
   </view>
 

pages/gasBottle/stockList/storageAdd.vue

@@ -62,7 +62,7 @@
 </template>
 
 <script>
-    import {gasApplyDetailDrkDetail,gasApplyStorageAdd,getSubjectDict,airbottleStockEnter} from '@/api/index.js'
+    import {gasApplyDetailDrkDetail,gasApplyStorageAdd,getSubjectDict,airbottleStockEnter,subjectList} from '@/api/index.js'
 	import { config } from '@/api/request/config.js'
     export default {
         data() {
@@ -232,7 +232,7 @@
 			//实验室列表
 			async getSubjectDict(){
 				let self = this;
-				let {data} = await getSubjectDict()
+				let {data} = await subjectList()
 				if(data.code == 200){
 					if(data.data[0]){
 						let list = [];