dedsudiyu пре 11 месеци
родитељ
комит
ca3fc00e3c

+ 2 - 2
api/request/config.js

@@ -1,5 +1,5 @@
 const config = {
-	// base_url: 'http://192.168.1.8/api',//V3
+	base_url: 'http://192.168.1.8/api',//V3
 	 // base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.24:8080',//林总
 	// base_url: 'http://192.168.1.7:8080',//刘波
@@ -7,7 +7,7 @@ const config = {
 	// base_url: 'http://192.168.1.20:8080',//志伟
 	// base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
-	base_url: 'http://192.168.1.43/api', //43服务器
+	// base_url: 'http://192.168.1.43/api', //43服务器
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
 	// base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上

+ 6 - 6
pages_manage/emergencyEvacuationBig.vue

@@ -8,7 +8,7 @@
 						<view></view>
 						<view>楼栋</view>
 					</view>
-					<picker @change="buildingChange" :range-key="'name'" :value="id" :range="buildingList">
+					<picker @change="buildingChange" :range-key="'name'" :range="buildingList">
 						<view class="picker-min-box">
 							<view>{{buildingName?buildingName:'请选择楼栋'}}</view>
 							<img src="@/images/basicsModules/icon_06.png">
@@ -20,7 +20,7 @@
 						<view></view>
 						<view>楼层</view>
 					</view>
-					<picker @change="floorChange" :disabled="!buildingId" :range-key="'name'" :value="id"
+					<picker @change="floorChange" :disabled="!buildingId" :range-key="'name'" 
 						:range="floorList">
 						<view class="picker-min-box">
 							<view>{{floorName?floorName:'请选择楼层'}}</view>
@@ -33,7 +33,7 @@
 						<view></view>
 						<view>实验室</view>
 					</view>
-					<picker @change="fjListChange" :disabled="!floorId" :range-key="'subName'" :value="subId"
+					<picker @change="fjListChange" :disabled="!floorId" :range-key="'subName'" 
 						:range="fjListArray">
 						<view class="picker-min-box">
 							<view>{{subName?subName:'请选择实验室'}}</view>
@@ -65,9 +65,9 @@
 							:style="'width:'+mapWidth+'rpx;height:'+mapHeight+'rpx;transform: scale('+zoomData+');margin-top:-'+mapHeight/2+'rpx;margin-left:-'+mapWidth/2+'rpx;'">
 							<view class="map-max-box" :style="'width:'+mapWidth+'rpx;height:'+mapHeight+'rpx;'">
 								<view class="map-max-for-box for-map-box" v-if="item.type == 1"
-									v-for="(item,index) in mapList" :key="index" :class="!item.policeType && checkSubId ==item.subId ? 'room-type-one':(
-									item.policeType && checkSubId !=item.subId ? 'room-type-two':(
-									item.policeType && checkSubId ==item.subId ? 'room-type-three':(
+									v-for="(item,index) in mapList" :key="index" :class="!item.policeType && subId ==item.subId ? 'room-type-one':(
+									item.policeType && subId !=item.subId ? 'room-type-two':(
+									item.policeType && subId ==item.subId ? 'room-type-three':(
 									!item.loginAdmin ? 'room-type-noe':'')))"
 									:style="'top:'+item.y+'rpx;left:'+item.x+'rpx;width:'+(item.w-4)+'rpx;height:'+(item.h-4)+'rpx;'">
 									<view class="map-max-for-min-box">

+ 0 - 5
pages_safetyExamine/safetyExamineWorkbench.vue

@@ -218,19 +218,14 @@
         </view>
       </view>
     </view>
-    <tab-bar></tab-bar>
   </view>
 </template>
 
 <script>
 import { config } from '@/api/request/config.js'
-import { tabBar } from '@/components/tabBar.vue'
 import {checkPlanList,getCheckStatusCount,getManageStatusCount,dataStatistics,checkManageList,checkHazardAppList,checkClapList,getCheckPlanBySubId} from '@/api/apiDemo/index.js'
 export default {
   name: "rectifyList",
-  components: {
-    tabBar
-  },
   data() {
     return {
       pageType:1,//人员类型 3整改人 2检查人 1管理员