“yueshang” 1 rok temu
rodzic
commit
0ea586bac7

+ 2 - 2
config.js

@@ -2,8 +2,8 @@
 module.exports = {
 	baseUrl: 'http://api-security.byants.com',
 	// baseUrlImg:'http://security.byants.com/static/appimg',
-	// baseUrl: 'https://byant.jujutong.cloud',
-	baseUrlImg: 'http://byant.jujutong.cloud/static/appimg',
+	baseUrl: 'https://byant.jujutong.cloud',
+	baseUrlImg: 'https://byant.jujutong.cloud/static/appimg',
 	// baseUrl: 'http://192.168.1.24:48081', 
 	// baseUrl:'http://192.168.1.10:48081',
 	// baseUrl:'http://api-security.byants.com/app-api/s9/task/self-page',

+ 2 - 2
pages/index.vue

@@ -338,12 +338,12 @@
 				],
 				goodsStreet: [{
 						name: '街道消防检查',
-						thumbnail: `${baseUrlImg}/meirixuncha.png`,
+						thumbnail: `${baseUrlImg}/fire_street.png`,
 						menuUrl: '/pagesA/fire/fire_inspetItem/fire_inspetItem'
 					},
 					{
 						name: '消防工作档案',
-						thumbnail: `${baseUrlImg}/zhudongjiancha.png`,
+						thumbnail: `${baseUrlImg}/renwuguanli.png`,
 						menuUrl: `/pagesA/fire/archive/nav`
 					},
 					{

+ 5 - 7
pagesA/fire/fire_device/index.vue

@@ -53,11 +53,11 @@
 					</template>
 					<view class="titles">{{ item.buildingName }}</view>
 					<!-- 简要内容 -->
-					<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
+				<!-- 	<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
 						<text>设备状态:</text>
 						<text v-if="item.fpdStatus==0" class="conts">正常</text>
 						<text v-if="item.fpdStatus==1" class="conts">有问题</text>
-					</view>
+					</view> -->
 					<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
 						<text>所在位置:</text>
 						<text class="conts">{{ item.fpdLocal }}</text>
@@ -332,11 +332,9 @@
 					console.log(this.tableData, '获得消防设施详细信息',this.typeDict	);
 					// 根据返回值,显示记录类型的中文名称
 					this.tableData.map(i => {
-						this.typeDict.map(k=>{
-							
-							if(i.fpdType==k.fpdType){
-								console.log(i.fpdType,'i.fpdType');
-								i.i.fpdTypeName=k.fpdName
+						this.typeDict.map(k=>{					
+							if(i.fpdType==k.value){					
+								i.fpdTypeName=k.label
 							}
 						})
 					})

+ 2 - 2
pagesA/fire/personnel_permissions/index.vue

@@ -32,10 +32,10 @@
 						<uni-row class="demo-uni-row  " :gutter="20" width="100%">
 							<uni-col :span="24">
 								<view class="card-actions">
-									<view class="card-actions-item" @click="editClick(item)">
+							<!-- 		<view class="card-actions-item" @click="editClick(item)">
 										<u-icon name="edit-pen" color="#999" size="18"></u-icon>
 										<text class="card-actions-item-text">编辑</text>
-									</view>
+									</view> -->
 									<view class="card-actions-item" @click="roleClick(item)">
 										<u-icon name="setting" color="#999" size="18"></u-icon>
 										<text class="card-actions-item-text">分配角色</text>

+ 2 - 0
pagesA/fire/unit_info/unit_info_details/unit_info_details.vue

@@ -145,7 +145,9 @@
 			const eventChannel = this.getOpenerEventChannel();
 			eventChannel.on('acceptDataFromOpenerPage', function(val) {
 				that.id = val.id;
+				console.log(val,'valva');
 				getOrg().then(res => {
+					console.log(res,'res');
 					res.data.map(i => {
 						if (val.sjxfgxdw && i.id == val.sjxfgxdw) {
 							console.log('2555', i.name);

BIN
static/appimg/fire_street.png


BIN
static/appimg/meirixuncha.png


BIN
static/appimg/renwuguanli.png


BIN
static/appimg/yinhuanguanli.png


BIN
static/appimg/zhudongjiancha.png