机房动环完毕

src/components/SD-school/Spring-frame/computerRoom.vue

@@ -1,6 +1,6 @@
 <template>
-    <div>
-        <el-row class="equipment commonWidth" v-if="devicedId == 'XDI1_R1'"><!--机房设备信息弹框-->
+  <div>
+        <el-row class="equipment commonWidth" v-if="XDI1_R1_h1">
             <el-col class="top">
                 <el-col class="title">
                     <img src="../../../assets/image/arrow.png" alt="" />
@@ -10,13 +10,49 @@
                 <p class="close" @click="close"></p>
             </el-col>
             <el-col class="contain">
-                <el-col class="title"><span class="type">红外1开关量：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">红外2开关量：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">红外3开关量：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">漏水1开关量：</span><span class="data">{{data[] : "--"}}</span></el-col>
+                <el-col class="title"><span class="type">红外1开关：</span><span class="data">{{ data.num[0] == "1" ? "开" : "关" }}</span></el-col>
             </el-col>
         </el-row>
-        <el-row class="equipment commonWidth" v-if="devicedId == 'XDO_R1'"><!--机房设备信息弹框-->
+        <el-row class="equipment commonWidth" v-if="XDI1_R1_h2">
+            <el-col class="top">
+                <el-col class="title">
+                    <img src="../../../assets/image/arrow.png" alt="" />
+                    <span>干接点模块</span>
+                    <img src="../../../assets/image/icon1.png" alt="" class="equipment-icon"/>
+                </el-col>
+                <p class="close" @click="close"></p>
+            </el-col>
+            <el-col class="contain">
+                <el-col class="title"><span class="type">红外2开关：</span><span class="data">{{ data.num[0] == "1" ? "开" : "关" }}</span></el-col>
+            </el-col>
+        </el-row>
+        <el-row class="equipment commonWidth" v-if="XDI1_R1_h3">
+            <el-col class="top">
+                <el-col class="title">
+                    <img src="../../../assets/image/arrow.png" alt="" />
+                    <span>干接点模块</span>
+                    <img src="../../../assets/image/icon1.png" alt="" class="equipment-icon"/>
+                </el-col>
+                <p class="close" @click="close"></p>
+            </el-col>
+            <el-col class="contain">
+                <el-col class="title"><span class="type">红外3开关：</span><span class="data">{{ data.num[0] == "1" ? "开" : "关" }}</span></el-col>
+            </el-col>
+        </el-row>
+        <el-row class="equipment commonWidth" v-if="XDI1_R1_l1">
+            <el-col class="top">
+                <el-col class="title">
+                    <img src="../../../assets/image/arrow.png" alt="" />
+                    <span>干接点模块</span>
+                    <img src="../../../assets/image/icon1.png" alt="" class="equipment-icon"/>
+                </el-col>
+                <p class="close" @click="close"></p>
+            </el-col>
+            <el-col class="contain">
+                <el-col class="title"><span class="type">漏水1开关：</span><span class="data">{{ data.num[0] == "1" ? "开" : "关" }}</span></el-col>
+            </el-col>
+        </el-row>
+        <el-row class="equipment commonWidth" v-if="XDO_R1">
             <el-col class="top">
                 <el-col class="title">
                     <img src="../../../assets/image/arrow.png" alt="" />
@@ -26,10 +62,24 @@
                 <p class="close" @click="close"></p>
             </el-col>
             <el-col class="contain">
-                <el-col class="title"><span class="type">声光报警：</span><span class="data">{{data[] : "--"}}</span></el-col>
+                <el-col class="title"><span class="type">机房声光报警开关：</span><span class="data">{{ data.num[0] == "1" ? "开" : "关" }}</span></el-col>
+            </el-col>
+        </el-row>
+        <el-row class="equipment commonWidth" v-if="WSD1_R1_1">
+            <el-col class="top">
+                <el-col class="title">
+                    <img src="../../../assets/image/arrow.png" alt="" />
+                    <span>机房温湿度</span>
+                    <img src="../../../assets/image/icon1.png" alt="" class="equipment-icon"/>
+                </el-col>
+                <p class="close" @click="close"></p>
+            </el-col>
+            <el-col class="contain">
+                <el-col class="title"><span class="type">温度1：</span><span class="data">{{ data.num[0]  || "--" }}℃</span></el-col>
+                <el-col class="title"><span class="type">湿度1：</span><span class="data">{{ data.num[1]  || "--" }}%</span></el-col>
             </el-col>
         </el-row>
-        <el-row class="equipment commonWidth" v-if="devicedId == 'WSD1_R1'"><!--机房设备信息弹框-->
+        <el-row class="equipment commonWidth" v-if="WSD1_R1_2">
             <el-col class="top">
                 <el-col class="title">
                     <img src="../../../assets/image/arrow.png" alt="" />
@@ -39,13 +89,11 @@
                 <p class="close" @click="close"></p>
             </el-col>
             <el-col class="contain">
-                <el-col class="title"><span class="type">温湿度1温度测量值：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">温湿度1湿度测量值：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">温湿度2温度测量值：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">温湿度2湿度测量值：</span><span class="data">{{data[] : "--"}}</span></el-col>
+                <el-col class="title"><span class="type">温度2：</span><span class="data">{{ data.num[0]  || "--" }}℃</span></el-col>
+                <el-col class="title"><span class="type">湿度2：</span><span class="data">{{ data.num[1]  || "--" }}%</span></el-col>
             </el-col>
         </el-row>
-        <el-row class="equipment commonWidth" v-if="devicedId == 'DLY1_R1'"><!--机房设备信息弹框-->
+        <el-row class="equipment commonWidth" v-if="DLY1_R1">
             <el-col class="top">
                 <el-col class="title">
                     <img src="../../../assets/image/arrow.png" alt="" />
@@ -55,39 +103,115 @@
                 <p class="close" @click="close"></p>
             </el-col>
             <el-col class="contain">
-                <el-col class="title"><span class="type">电量仪1_A相电压（单位V）：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">电量仪1_B相电压（单位V）：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">电量仪1_C相电压（单位V）：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">电量仪1_AB线电压（单位V）：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">电量仪1_BC线电压（单位V）：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">电量仪1_AC线电压（单位V）：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">电量仪1_A相电流（单位A）：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">电量仪1_B相电流（单位A）：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">电量仪1_C相电流（单位A）：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">电量仪1_频率：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">电量仪1_A相有功功率：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">电量仪1_B相有功功率：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">电量仪1_C相有功功率：</span><span class="data">{{data[] : "--"}}</span></el-col>
-                <el-col class="title"><span class="type">电量仪1_总功率：</span><span class="data">{{data[] : "--"}}</span></el-col>
+                <el-col class="title"><span class="type">A相电压：</span><span class="data">{{ Number(data.num[0]).toFixed(2)  || "--" }}V</span></el-col>
+                <el-col class="title"><span class="type">B相电压：</span><span class="data">{{ Number(data.num[1]).toFixed(2)  || "--" }}V</span></el-col>
+                <el-col class="title"><span class="type">C相电压：</span><span class="data">{{ Number(data.num[2]).toFixed(2)  || "--" }}V</span></el-col>
+                <el-col class="title"><span class="type">AB线电压：</span><span class="data">{{ Number(data.num[3]).toFixed(2)  || "--" }}V</span></el-col>
+                <el-col class="title"><span class="type">BC线电压：</span><span class="data">{{ Number(data.num[4]).toFixed(2)  || "--" }}V</span></el-col>
+                <el-col class="title"><span class="type">AC线电压：</span><span class="data">{{ Number(data.num[5]).toFixed(2)  || "--" }}V</span></el-col>
+                <el-col class="title"><span class="type">A相电流：</span><span class="data">{{ Number(data.num[6]).toFixed(2)  || "--" }}V</span></el-col>
+                <el-col class="title"><span class="type">B相电流：</span><span class="data">{{ Number(data.num[7]).toFixed(2)  || "--" }}A</span></el-col>
+                <el-col class="title"><span class="type">C相电流：</span><span class="data">{{ Number(data.num[8]).toFixed(2)  || "--" }}A</span></el-col>
+                <el-col class="title"><span class="type">A相有功功率：</span><span class="data">{{ Number(data.num[9]).toFixed(2)  || "--" }}V</span></el-col>
+                <el-col class="title"><span class="type">B相有功功率：</span><span class="data">{{ Number(data.num[10]).toFixed(2)  || "--" }}V</span></el-col>
+                <el-col class="title"><span class="type">C相有功功率：</span><span class="data">{{ Number(data.num[11]).toFixed(2)  || "--" }}V</span></el-col>
             </el-col>
         </el-row>
+        
   </div>
 </template>
 <script>
+import { movingRing } from "@/plugins/api";
 export default {
     props:['resInfo'],
     data() {
         return {
+            XDI1_R1_h1:false,
+            XDI1_R1_h2:false,
+            XDI1_R1_h3:false,
+            XDI1_R1_l1:false,
+            XDO_R1:false,
+            WSD1_R1_1:false,
+            WSD1_R1_2:false,
+            DLY1_R1:false,
             devicedId:undefined,
-            data:[],
+            data:{
+ 
+            },
         }
     },
     mounted(){
         this.getData()
     },
     methods: {
+
+
         getData(){//获取数据赋值
+            this.XDI1_R1_h1 = false
+            this.XDI1_R1_h2 = false
+            this.XDI1_R1_h3 = false
+            this.XDI1_R1_l1 = false
+            this.XDO_R1 = false
+            this.WSD1_R1_1 = false
+            this.WSD1_R1_2 = false
+            this.DLY1_R1 = false
             this.data = this.resInfo
+            this.data.num = []
+            let url = "http://10.108.56.30:80/html5/GETTAGVAL/"
+            if(this.data.registerDeviceId == "XDI1_R1_h1"){
+                movingRing({url:`${url}XDI1_R1.红外1`,deviceId:this.data.registerDeviceId}).then(res =>{ 
+                    this.data.num.push(res.data.split(",")[1])
+                    this.XDI1_R1_h1 = true
+                })
+            }else if(this.data.registerDeviceId == "XDI1_R1_h2"){
+                movingRing({url:`${url}XDI1_R1.红外2`,deviceId:this.data.registerDeviceId}).then(res =>{ 
+                    this.data.num.push(res.data.split(",")[1])
+                    this.XDI1_R1_h2 = true
+                })
+            }else if(this.data.registerDeviceId == "XDI1_R1_h3"){
+                movingRing({url:`${url}XDI1_R1.红外3`,deviceId:this.data.registerDeviceId}).then(res =>{ 
+                    this.data.num.push(res.data.split(",")[1])
+                    this.XDI1_R1_h3 = true
+                })
+            }else if(this.data.registerDeviceId == "XDI1_R1_l1"){
+                movingRing({url:`${url}XDI1_R1.漏水1`,deviceId:this.data.registerDeviceId}).then(res =>{ 
+                    this.data.num.push(res.data.split(",")[1])
+                    this.XDI1_R1_l1 = true
+                })
+            }else if(this.data.registerDeviceId == "XDO_R1"){
+                movingRing({url:`${url}XDO_R1.声光报警1`,deviceId:this.data.registerDeviceId}).then(res =>{ 
+                    this.data.num.push(res.data.split(",")[1])
+                    this.XDO_R1 = true
+                })
+            }else if(this.data.registerDeviceId == "WSD1_R1_1"){
+                movingRing({url:`${url}WSD1_R1.温湿度1_温度,WSD1_R1.温湿度1_湿度`,deviceId:this.data.registerDeviceId}).then(res =>{ 
+                    let arr = res.data.split("|")
+                    for(let i = 0;i<arr.length;i++){
+                        this.data.num.push(arr[i].split(",")[1])
+                    }
+                    this.WSD1_R1_1 = true
+                })
+            }else if(this.data.registerDeviceId == "WSD1_R1_2"){
+                movingRing({url:`${url}WSD1_R1.温湿度2_温度,WSD1_R1.温湿度2_湿度`,deviceId:this.data.registerDeviceId}).then(res =>{ 
+                    let arr = res.data.split("|")
+                    for(let i = 0;i<arr.length;i++){
+                        this.data.num.push(arr[i].split(",")[1])
+                    }
+                    this.WSD1_R1_2 = true
+                })
+            }else if(this.data.registerDeviceId == "DLY1_R1"){
+                // ,DLY1_R1.电量仪1_频率,DLY1_R1.电量仪1_总功率
+                movingRing({url:`${url}DLY1_R1.电量仪1_A相电压,DLY1_R1.电量仪1_B相电压,DLY1_R1.电量仪1_C相电压,DLY1_R1.电量仪1_AB线电压,DLY1_R1.电量仪1_BC线电压,DLY1_R1.电量仪1_AC线电压,DLY1_R1.电量仪1_A相电流,DLY1_R1.电量仪1_B相电流,DLY1_R1.电量仪1_C相电流,DLY1_R1.电量仪1_A相有功功率,DLY1_R1.电量仪1_B相有功功率,DLY1_R1.电量仪1_C相有功功率`,deviceId:this.data.registerDeviceId}).then(res =>{ 
+                    let arr = res.data.split("|")
+                    for(let i = 0;i<arr.length;i++){
+                        this.data.num.push(arr[i].split(",")[1])
+                    }
+                    this.DLY1_R1 = true
+                })
+            }else{
+
+            }
+            
         },
         close(){//关闭
             this.state = false
@@ -153,12 +277,12 @@ export default {
             font-size: 14px;
             letter-spacing: 1px;
             .type{
-                width:25%;
+                width:40%;
                 text-align: right;
                 display: inline-block;
             }
             .data{
-                width:75%;
+                width:60%;
                 text-align: left;
                 display: inline-block;
                 vertical-align: top;

src/components/SD-school/Spring-frame/index.vue

@@ -37,6 +37,10 @@
             <transition name="fade">
                 <room v-if="room" :resInfo="item" @close="itemClose"/><!--房间信息弹框-->
             </transition>
+            <transition name="fade">
+                <computerRoom v-if="computerRoom" :resInfo="item" @close="itemClose"/><!--机房设备信息弹框-->
+            </transition>
+            
             <!-- <el-row class="music commonWidth" v-if="music.state">
                 <el-col class="top">
                     <el-col class="title">
@@ -71,6 +75,7 @@ import vehicleInformation from "./vehicleInformation";
 import yongtian from "./yongtian";
 import energy from "./energy";
 import room from './room.vue';
+import computerRoom from './computerRoom.vue';
 export default {
     props:['resInfo',"close2"],
     components: {
@@ -84,7 +89,8 @@ export default {
         yongtian,
         vehicleInformation,
         energy,
-        room
+        room,
+        computerRoom,
     },
     data() {
         return {
@@ -102,6 +108,7 @@ export default {
             yongtian:false,
             energy:false,
             room:false,
+            computerRoom:false,
             time:[],
             
         }
@@ -154,6 +161,9 @@ export default {
         }else if(this.resInfo.roomState){//房间
             this.room = true
             this.item = this.resInfo.roomMessage
+         }else if(this.resInfo.computerRoomState){//房间
+            this.computerRoom= true
+            this.item = this.resInfo.computerRoomMessage
         }else{
 
         }

src/components/SD-school/computer-room/echart.js

@@ -1,18 +1,18 @@
 import * as echarts from "echarts";
 
 export default function getData(params) {
-    let resList = params.map(val => {
-        return {
-            computerRoom: val.name,
-            temperature: val.temperature
-        }
-    })
+    // let resList = params.map(val => {
+    //     return {
+    //         computerRoom: val.name,
+    //         temperature: val.temperature
+    //     }
+    // })
     return {
         series: [
             {
                 type: 'gauge',
                 center: ['50%', '60%'],
-                radius: "70%", // 半径
+                radius: "80%", // 半径
                 startAngle: 200,
                 endAngle: -20,
                 min: -20,
@@ -66,14 +66,14 @@ export default function getData(params) {
                   lineHeight: 40,
                   borderRadius: 8,
                   offsetCenter: [0, '-15%'],
-                  fontSize: 10,
+                  fontSize: 12,
                   fontWeight: 'bolder',
-                  formatter: '20.2°C',
+                  formatter: params + '°C',
                   color: 'auto'
                 },
                 data: [
                   {
-                    value: 20
+                    value: params
                   }
                 ]
               },

src/components/SD-school/computer-room/echart2.js

@@ -1,12 +1,6 @@
 import * as echarts from "echarts";
 
 export default function getData(params) {
-    let resList = params.map(val => {
-        return {
-            computerRoom: val.name,
-            temperature: val.temperature
-        }
-    })
     return {
         series: [
             {
@@ -66,14 +60,14 @@ export default function getData(params) {
                   lineHeight: 40,
                   borderRadius: 8,
                   offsetCenter: [0, '-15%'],
-                  fontSize: 10,
+                  fontSize: 12,
                   fontWeight: 'bolder',
-                  formatter: '30°C',
+                  formatter: params + '%',
                   color: 'auto'
                 },
                 data: [
                   {
-                    value: 30
+                    value: params
                   }
                 ]
               },

src/components/SD-school/computer-room/index.vue

@@ -40,8 +40,8 @@ export default {
   methods:{
     async getData(){
       let data = []
-      data.push((this.resInfo[0] + this.resInfo[1]) / 2) //温度
-      data.push((this.resInfo[2] + this.resInfo[3]) / 2) //湿度
+      data.push(Number(((Number(this.resInfo[0]) + Number(this.resInfo[2])) / 2).toFixed(2))) //温度
+      data.push(Number(((Number(this.resInfo[1]) + Number(this.resInfo[3])) / 2).toFixed(2))) //湿度
       echarts.init(this.$refs.echartD).setOption(echartsGet(data[0]))
       echarts.init(this.$refs.echartD2).setOption(echartsGet2(data[1]))
 	  },

src/views/Home.vue

@@ -7,13 +7,13 @@
 				<info class="info" :resInfo="data.info" :websocket="data.winfo" />
 				<!-- <access-control class="accessControl" v-else-if="item.styleValue === 2" :key="item.styleValue" :resInfo="item"></access-control> -->
 				<parking-lot class="parkingLot"  :resInfo="data.parkingLot" :websocket="data.wparkingLot" />
-				<!-- <monitor class="monitor" /> -->
+				<monitor class="monitor" />
 				<!-- <conference-room class="conferenceRoom" v-else-if="item.styleValue === 5" :key="item.styleValue" :resInfo="item"></conference-room>
 				<give-an-alarm class="giveAnAlarm" v-else-if="item.styleValue === 6" :key="item.styleValue" :resInfo="item"></give-an-alarm> -->
 			</template>
 		</el-row>
 		<el-row class="contnetCenter" >
-			<!-- <iframe src="https://www.thingjs.com/s/cd7b1592538e0f4a9572c55e?params=105b0f77fd24654d4eebc434e9" frameborder="0" id="iframe" ></iframe> -->
+			<iframe src="https://www.thingjs.com/s/cd7b1592538e0f4a9572c55e?params=105b0f77fd24654d4eebc434e9" frameborder="0" id="iframe" ></iframe>
 		</el-row>
 		<el-row class="contentClass contnetRight">
 			<energy class="energy"   @energyClick="energyClick" />
@@ -215,7 +215,7 @@ export default {
 								arr.hotelCode = "ff80808179c6599a0179c65caf9a0001"
 								let url = "http://www.limark.net:81/api/hotel/control/device/list.do?" + "hotelCode=ff80808179c6599a0179c65caf9a0001" + "&roomNo=" + id 
 								btRoomGet({url:url}).then(res =>{
-									console.log(JSON.parse(res.data))
+									
 									if(JSON.parse(res.data).return_code == "-1"){
 										Message({
 											message:JSON.parse(res.data).return_msg,
@@ -304,7 +304,6 @@ export default {
 			arr.num = params.room_no
 			goldResult({url:"http://10.108.35.110:2016/api/v2/base/getrooominfo",param:JSON.stringify(params)}).then(res =>{ //设备信息查询
 				let data = JSON.parse((res.data.split('\">')[1]).split('</string>')[0])
-				console.log(data)
 				let roomStatus = data.data.list[0].original_room_state_code
 				arr.roomStatus = data.data.list[0].original_room_state_code
 				arr.hotelCode = "ff80808179c6599a0179c65caf9a0001"
@@ -314,7 +313,6 @@ export default {
 				}
 				let url = "http://www.limark.net:81/api/hotel/control/device/list.do?" + "hotelCode=ff80808179c6599a0179c65caf9a0001" + "&roomNo=" + "402"
 				btRoomGet({url:url}).then(res =>{
-					console.log(JSON.parse(res.data))
 					arr.data = JSON.parse(res.data)
 					let that = this
 					that.SpringFrameChange()
@@ -325,9 +323,6 @@ export default {
 					},2)
 				})
 			})
-		},
-		ceshi2(){
-
 		},
 		btn2(){
 			let parmas = encrypt(123)
@@ -394,7 +389,7 @@ export default {
 				this.ws = new WebSocket("ws://" + this.$store.state.wsUrl + "/top/WS/alarmPush");
 				// console.log(this.ws)
 				this.ws.onopen = ()=> {
-				console.log("websocket连接成功");
+				// console.log("websocket连接成功");
 				//this.sendWs({aa:22});
 				};
 				this.ws.onmessage = (res) => { //接收websocket消息
@@ -442,22 +437,26 @@ export default {
 		},
 		//机房数据获取
 		getComputerRoom(){
-			movingRing({url:"http://10.108.56.30:80/html5/GETTAGVAL/WSD1_R1.温湿度1_湿度"}).then(res =>{ // 机房温度、湿度平均值
-				console.log(res)
-				this.data.computerRoom = res.data
-				let arr = res.data.split("|")
+			movingRing({url:"http://10.108.56.30:80/html5/GETTAGVAL/WSD1_R1.温湿度1_温度,WSD1_R1.温湿度1_湿度",deviceId:"WSD1_R1_1"}).then(res =>{ // 机房温度、湿度平均值
+				let arr1 = res.data.split("|")
 				let arrData = []
-				for(let i = 0;i<arr.length;i++){
-					arrData.push(arr[1])
+				for(let i = 0;i<arr1.length;i++){
+					arrData.push(arr1[i].split(",")[1])
 				}
-				this.data.computerRoom = arrData
+				movingRing({url:"http://10.108.56.30:80/html5/GETTAGVAL/WSD1_R1.温湿度2_温度,WSD1_R1.温湿度2_湿度",deviceId:"WSD1_R1_2"}).then(res2 =>{ // 机房温度、湿度平均值
+					let arr2 = res2.data.split("|")
+					for(let i = 0;i<arr2.length;i++){
+						arrData.push(arr2[i].split(",")[1])
+					}
+					this.data.computerRoom = arrData
+				})
 			})
 		},
 		
 		sendWs(val){
 			if (this.ws && this.ws.readyState == 1) {
 				this.ws.send(JSON.stringify(val));
-				console.log('发送成功')
+				// console.log('发送成功')
 			} else {
 				setTimeout(() => {
 				this.sendWs(val);
@@ -481,7 +480,6 @@ export default {
 			},0)
 			setTimeout(()=>{	
 				this.item.energyMessage = val
-				console.log(this.item.energyMessage)
 				this.item.energyState = true
 				this.springFrameState = true
 			},1)