|
@@ -67,60 +67,62 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="main_top_right">
|
|
|
- <div class="weather_top">
|
|
|
- <div class="weather_top_l">
|
|
|
- <div class="box1">
|
|
|
- <img src="../img/weather/304.png">
|
|
|
+ <template v-if="weatherList.length>0">
|
|
|
+ <div class="weather_top">
|
|
|
+ <div class="weather_top_l">
|
|
|
+ <div class="box1">
|
|
|
+ <img src="../img/weather/304.png">
|
|
|
+ </div>
|
|
|
+ <div class="box2">
|
|
|
+ <p class="p1">Today</p>
|
|
|
+ <p class="p2">{{weatherList[0].Thundershower}}</p>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- <div class="box2">
|
|
|
- <p class="p1">Today</p>
|
|
|
- <p class="p2">{{weatherList[0].Thundershower}}</p>
|
|
|
+ <div class="weather_top_r">
|
|
|
+ <div class="box1">
|
|
|
+ <img src="../img/sunrise.png">
|
|
|
+ <p class="p2">{{weatherList[0].sr}}</p>
|
|
|
+ </div>
|
|
|
+ <div class="box2">
|
|
|
+ <img src="../img/sunset.png">
|
|
|
+ <p class="p2">{{weatherList[0].ss}}</p>
|
|
|
+ </div>
|
|
|
+ <div class="box3"><span>{{(new Date().format('HH:MM'))}}</span></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="weather_top_r">
|
|
|
- <div class="box1">
|
|
|
- <img src="../img/sunrise.png">
|
|
|
- <p class="p2">{{weatherList[0].sr}}</p>
|
|
|
+ <div class="weather_top_bottom" v-if="weatherList.length>1">
|
|
|
+ <div class="li">
|
|
|
+ <p class="p1">{{weatherList[1].dateStr}}</p>
|
|
|
+ <img :src="require('../img/weather/'+weatherList[1].code+'.png')">
|
|
|
+ <p class="p2">{{weatherList[1].maxTmp+'/'+weatherList[1].minTmp}}</p>
|
|
|
</div>
|
|
|
- <div class="box2">
|
|
|
- <img src="../img/sunset.png">
|
|
|
- <p class="p2">{{weatherList[0].ss}}</p>
|
|
|
+ <div class="li">
|
|
|
+ <p class="p1">{{weatherList[2].dateStr}}</p>
|
|
|
+ <img :src="require('../img/weather/'+weatherList[2].code+'.png')">
|
|
|
+ <p class="p2">{{weatherList[2].maxTmp+'/'+weatherList[2].minTmp}}</p>
|
|
|
+ </div>
|
|
|
+ <div class="li">
|
|
|
+ <p class="p1">{{weatherList[3].dateStr}}</p>
|
|
|
+ <img :src="require('../img/weather/'+weatherList[3].code+'.png')">
|
|
|
+ <p class="p2">{{weatherList[3].maxTmp+'/'+weatherList[3].minTmp}}</p>
|
|
|
+ </div>
|
|
|
+ <div class="li">
|
|
|
+ <p class="p1">{{weatherList[4].dateStr}}</p>
|
|
|
+ <img :src="require('../img/weather/'+weatherList[4].code+'.png')">
|
|
|
+ <p class="p2">{{weatherList[4].maxTmp+'/'+weatherList[4].minTmp}}</p>
|
|
|
+ </div>
|
|
|
+ <div class="li">
|
|
|
+ <p class="p1">{{weatherList[5].dateStr}}</p>
|
|
|
+ <img :src="require('../img/weather/'+weatherList[2].code+'.png')">
|
|
|
+ <p class="p2">{{weatherList[5].maxTmp+'/'+weatherList[5].minTmp}}</p>
|
|
|
+ </div>
|
|
|
+ <div class="li">
|
|
|
+ <p class="p1">{{weatherList[6].dateStr}}</p>
|
|
|
+ <img :src="require('../img/weather/'+weatherList[6].code+'.png')">
|
|
|
+ <p class="p2">{{weatherList[6].maxTmp+'/'+weatherList[6].minTmp}}</p>
|
|
|
</div>
|
|
|
- <div class="box3"><span>{{(new Date().format('HH:MM'))}}</span></div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="weather_top_bottom" v-if="weatherList.length>1">
|
|
|
- <div class="li">
|
|
|
- <p class="p1">{{weatherList[1].dateStr}}</p>
|
|
|
- <img :src="require('../img/weather/'+weatherList[1].code+'.png')">
|
|
|
- <p class="p2">{{weatherList[1].maxTmp+'/'+weatherList[1].minTmp}}</p>
|
|
|
- </div>
|
|
|
- <div class="li">
|
|
|
- <p class="p1">{{weatherList[2].dateStr}}</p>
|
|
|
- <img :src="require('../img/weather/'+weatherList[2].code+'.png')">
|
|
|
- <p class="p2">{{weatherList[2].maxTmp+'/'+weatherList[2].minTmp}}</p>
|
|
|
- </div>
|
|
|
- <div class="li">
|
|
|
- <p class="p1">{{weatherList[3].dateStr}}</p>
|
|
|
- <img :src="require('../img/weather/'+weatherList[3].code+'.png')">
|
|
|
- <p class="p2">{{weatherList[3].maxTmp+'/'+weatherList[3].minTmp}}</p>
|
|
|
- </div>
|
|
|
- <div class="li">
|
|
|
- <p class="p1">{{weatherList[4].dateStr}}</p>
|
|
|
- <img :src="require('../img/weather/'+weatherList[4].code+'.png')">
|
|
|
- <p class="p2">{{weatherList[4].maxTmp+'/'+weatherList[4].minTmp}}</p>
|
|
|
- </div>
|
|
|
- <div class="li">
|
|
|
- <p class="p1">{{weatherList[5].dateStr}}</p>
|
|
|
- <img :src="require('../img/weather/'+weatherList[2].code+'.png')">
|
|
|
- <p class="p2">{{weatherList[5].maxTmp+'/'+weatherList[5].minTmp}}</p>
|
|
|
- </div>
|
|
|
- <div class="li">
|
|
|
- <p class="p1">{{weatherList[6].dateStr}}</p>
|
|
|
- <img :src="require('../img/weather/'+weatherList[6].code+'.png')">
|
|
|
- <p class="p2">{{weatherList[6].maxTmp+'/'+weatherList[6].minTmp}}</p>
|
|
|
</div>
|
|
|
- </div>
|
|
|
+ </template>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="main_table">
|
|
@@ -480,10 +482,10 @@
|
|
|
<el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'protocoltype'" @keyup.native="lampKeydown($event)">
|
|
|
<el-option :key="0" label="mqtt" :value="0"></el-option>
|
|
|
</el-select>
|
|
|
- <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'poName'" @keyup.native="lampKeydown($event)">
|
|
|
+ <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'poName'&&role != 2&&role != 4" @keyup.native="lampKeydown($event)">
|
|
|
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in companyNavPO"></el-option>
|
|
|
</el-select>
|
|
|
- <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'supplierName'" @keyup.native="lampKeydown($event)">
|
|
|
+ <el-select v-model="lightControlData[item.model]" placeholder="please choose" v-if="item.type == 'select' && item.model == 'supplierName'&&role != 2" @keyup.native="lampKeydown($event)">
|
|
|
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in companyNavSupplier"></el-option>
|
|
|
</el-select>
|
|
|
|
|
@@ -3268,11 +3270,8 @@
|
|
|
message:data.msg,
|
|
|
type: 'success'
|
|
|
});
|
|
|
- if(this.projectId){
|
|
|
- // this.getProjectNav(this.projectId,this.companyId)
|
|
|
- }else{
|
|
|
- // this.getProjectNav('init')
|
|
|
- }
|
|
|
+ let searchType = storage.getItem("searchType");
|
|
|
+ this.sideBarCompanyList('',searchType)
|
|
|
this.addItemDialog = false;
|
|
|
this.projectSaveLoading = false;
|
|
|
},
|