shaun-sheep 5 年 前
コミット
797887489b

+ 1 - 8
src/components/ledger/details/tableDisplay.vue

@@ -33,15 +33,8 @@
           <!--          设备信息点-->
           <div class="grid-content bgc-white">
             <selectRadio :selectRadio="selectRadio"/>
-            <el-row>
-              <!--              :span的值可以根据条件改变 是一个24 or 两个 16:8-->
-              <el-col :span="16">
                 <exhibitionBaseInformation/>
-              </el-col>
-              <el-col :span="8">
-                能耗信息点
-              </el-col>
-            </el-row>
+
 
           </div>
         </el-col>

+ 7 - 0
src/components/relation/overview/CardList.vue

@@ -253,12 +253,19 @@
           this.$refs.maintain.dialogManualTip = true
         }
         if (Manual === 3) {
+          // if (relation.RelManualType) {
           if (relation.RelationType) {
             this.values = {...this.values, optionTips, lastTime}
             this.$refs.maintain.dialogManualOption = true //导出excel 弹窗
             // this.$router.push({
             //   path:"relationShip"
             // })
+            console.log(relation,'relation')
+          // localStorage.setItem('RelManualType',relation.RelManualType)
+          // localStorage.setItem('RelationTypeName',relation.RelationTypeName)
+          // localStorage.setItem('RelationType',relation.RelationType)
+          // localStorage.setItem('ZoneType',relation.ZoneType
+
           } else {
             this.$message.warning("设计中")
             return false