Bladeren bron

解决冲突

zhangyu 5 jaren geleden
bovenliggende
commit
eecd16b795

+ 2 - 2
src/components/ledger/cenote/elevationMap.vue

@@ -18,10 +18,10 @@
             :class="[spaceItem.IsAI?spaceItem.checked?'saga-spaceItem-checked':'saga-spaceItem-ai':'']" 
             v-for="spaceItem in group.spaceList" 
             :key="spaceItem.RoomID"
-            :title="spaceItem.RoomLocalName"
+            :title="spaceItem.RoomLocalName?spaceItem.RoomLocalName:spaceItem.RoomName"
             @click="handleClickCheck(spaceItem)"
             >
-            {{spaceItem.RoomLocalName}}
+            {{spaceItem.RoomLocalName?spaceItem.RoomLocalName:spaceItem.RoomName}}
             </div>
           </div>
         </div>

+ 20 - 20
src/components/point/report/integrateStatistics.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="integrateStatistics">
     <!-- 环形表 -->
-    <div class="statistics-chart">
-      <div class="chart-title">表号功能号总数量:{{ pointData.tabFuncNumSum }} <span style="float:right">目前可能断数的数量:{{ pointData.disConn }}</span></div>
+    <div class="statistics-chart" v-loading="loopchartLoading">
+      <div class="chart-title">表号功能号总数量:{{ tabFuncNumSum }} <span style="float:right">目前可能断数的数量:{{ disConn }}</span></div>
       <hr style="width:90%" />
       <div ref="loopchart" class="chart" id="loopchart"></div>
     </div>
@@ -10,9 +10,9 @@
     <div class="statistics-chart" style="border-top:5px solid #eee;min-height: calc(65% - 3px);">
       <div class="chart-title">共包含原始点位:{{ originalPoint }} 个</div>
       <div style="padding:15px 20px;line-height:2;">
-        1点位对多表号功能号:{{ pointData.oneToM.toString() }}
+        1点位对多表号功能号:{{oneToM+''}}
         <br />
-        多点位对1表号功能号:{{ pointData.mToOne.toString() }}
+        多点位对1表号功能号:{{mToOne+''}}
         <!-- 查看表号功能号一对多多对一总览 -->
         <el-button @click="showOverview" type="info" icon="el-icon-arrow-right" circle
           style="margin:-25px 0 0 50px;background:rgb(121, 187, 255);color:rgb(225, 228, 229);border:none;"></el-button>
@@ -68,17 +68,16 @@ export default {
     return {
       //环形图
       loopChart: null,
+      loopchartLoading: false,
       //环形图数据
       loopChartData: [],
       //条形图数据
       barChartData: [],
       //点位-标号功能号数据
-      pointData: {
-        tabFuncNumSum: 0,//总数
-        oneToM: 0,//一对多
-        mToOne: 0,//多对一
-        disConn: 0//可能断数数量
-      },
+      tabFuncNumSum: 0,//总数
+      oneToM: 0,//一对多
+      mToOne: 0,//多对一
+      disConn: 0,//可能断数数量
       //原始点数量
       originalPoint: null,
       pointInSum: 0, //左侧柱形图已接入
@@ -88,22 +87,22 @@ export default {
   methods: {
     //加载图表数据
     loadChart() {
+      let that = this;
+      that.loopchartLoading = true;
       //获取环形图数据
       getIntegrateStatisticsToLoop({}, res => {
         //设置点位-表号功能号数据
-        this.pointData = {
-          tabFuncNumSum: res.Content[0].Sum,
-          oneToM: res.Content[0].OtoM,
-          mToOne: res.Content[0].MtoO,
-          disConn: res.Content[0].Disconn
-        };
+        const tempData = res.Content[0];
+        that.tabFuncNumSum = tempData.Sum
+        that.oneToM = tempData.OToM
+        that.mToOne = tempData.MToO
+        that.disConn = tempData.Disconn
         //设置环形表数据
-        this.loopChartData = [
-          { value: res.Content[0].RelatedCount, name: "已对实例数量" },
-          { value: res.Content[0].Sum - res.Content[0].RelatedCount, name: "未对应实例数量" }
+        that.loopChartData = [
+          { value: tempData.RelatedCount, name: "已对实例数量" },
+          { value: tempData.Sum - tempData.RelatedCount, name: "未对应实例数量" }
         ];
 
-        let that = this;
         //环形图参数
         let loopOption = {
           tooltip: {
@@ -188,6 +187,7 @@ export default {
             }
           });
         }, 100);
+        that.loopchartLoading = false;
 
       })
 

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

@@ -253,6 +253,7 @@
           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 弹窗
@@ -261,6 +262,7 @@
             // })
             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 {

+ 1 - 0
src/components/relation/relationShip/Modal/addRelationShip.vue

@@ -121,6 +121,7 @@
       }
       var codeList = (rule, value, callback) => {
         //TODO
+        console.log(value)
         callback()
       }
       return {

+ 25 - 51
src/views/model/report/index.vue

@@ -64,84 +64,62 @@
             </el-table-column>
             <el-table-column prop="ElementRangeCheck" label='构件范围检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.ElementRangeCheck" class="item" type='danger' v-if="scope.row.ElementRangeCheck">-->
-                <!--                </el-badge>-->
+                <el-badge :value="scope.row.ElementRangeCheck" class="item" type='danger'
+                          v-if="scope.row.ElementRangeCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.ElementRangeCheck<=0"></i>
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.ElementRangeCheck"></i>
               </template>
             </el-table-column>
             <el-table-column prop="FamilyNameCheck" label='设备族编码检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.FamilyNameCheck" class="item" type='danger' v-if="scope.row.FamilyNameCheck">-->
-                <!--                </el-badge>-->
+                <el-badge :value="scope.row.FamilyNameCheck" class="item" type='danger'
+                          v-if="scope.row.FamilyNameCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.FamilyNameCheck<=0"></i>
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.FamilyNameCheck"></i>
               </template>
             </el-table-column>
             <el-table-column prop="EquipPartLocationCheck" label='部件所在位置检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.EquipPartLocationCheck" class="item" type='danger' v-if="scope.row.EquipPartLocationCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.EquipPartLocationCheck"></i>
-
+                <el-badge :value="scope.row.EquipPartLocationCheck" class="item" type='danger'
+                          v-if="scope.row.EquipPartLocationCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.EquipPartLocationCheck<=0"></i>
               </template>
             </el-table-column>
             <el-table-column prop="ColumnCheck" label='柱边界检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.ColumnCheck" class="item" type='danger' v-if="scope.row.ColumnCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.ColumnCheck"></i>
-
+                <el-badge :value="scope.row.ColumnCheck" class="item" type='danger' v-if="scope.row.ColumnCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.ColumnCheck<=0"></i>
               </template>
             </el-table-column>
             <el-table-column prop="ConnectorCheck" label='连接件检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.ConnectorCheck" class="item" type='danger' v-if="scope.row.ConnectorCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.ConnectorCheck"></i>
-
+                <el-badge :value="scope.row.ConnectorCheck" class="item" type='danger' v-if="scope.row.ConnectorCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.ConnectorCheck<=0"></i>
               </template>
             </el-table-column>
             <el-table-column prop="SystemNameCheck" label='系统类型名称检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.SystemNameCheck" class="item" type='danger' v-if="scope.row.SystemNameCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.SystemNameCheck"></i>
-
+                <el-badge :value="scope.row.SystemNameCheck" class="item" type='danger'
+                          v-if="scope.row.SystemNameCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.SystemNameCheck<=0"></i>
               </template>
             </el-table-column>
             <el-table-column prop="EquipInSpaceCheck" label='未在空间中的设备' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.EquipInSpaceCheck" class="item" type='danger' v-if="scope.row.EquipInSpaceCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.EquipInSpaceCheck"></i>
-
+                <el-badge :value="scope.row.EquipInSpaceCheck" class="item" type='danger'
+                          v-if="scope.row.EquipInSpaceCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.EquipInSpaceCheck<=0"></i>
               </template>
             </el-table-column>
             <el-table-column prop="PipeCheck" label='管段检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.PipeCheck" class="item" type='danger' v-if="scope.row.PipeCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;" v-if="scope.row.PipeCheck"></i>
+                <el-badge :value="scope.row.PipeCheck" class="item" type='danger' v-if="scope.row.PipeCheck"/>
+
 
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.PipeCheck<=0"></i>
@@ -149,22 +127,17 @@
             </el-table-column>
             <el-table-column prop="SystemReferEquipCheck" label='管网及相关设备检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.SystemReferEquipCheck" class="item" :type='scope.row.SystemReferEquipCheck?"danger":"success"'-->
-                <!--                  v-if="scope.row.SystemReferEquipCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.SystemReferEquipCheck"></i>
-
+                <el-badge :type='scope.row.SystemReferEquipCheck?"danger":"success"' :value="scope.row.SystemReferEquipCheck"
+                          class="item"
+                          v-if="scope.row.SystemReferEquipCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.SystemReferEquipCheck<=0"></i>
               </template>
             </el-table-column>
             <el-table-column prop="ParameterIntegrityCheck" label='Revit族参数完整性检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.ParameterIntegrityCheck" class="item" type='danger' v-if="scope.row.ParameterIntegrityCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.ParameterIntegrityCheck"></i>
+                <el-badge :value="scope.row.ParameterIntegrityCheck" class="item" type='danger'
+                          v-if="scope.row.ParameterIntegrityCheck"/>
 
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.ParameterIntegrityCheck<=0"></i>
@@ -172,11 +145,8 @@
             </el-table-column>
             <el-table-column prop="XyzOverlapCheck" label='xyz坐标重叠检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.XyzOverlapCheck" class="item" type='danger' v-if="scope.row.XyzOverlapCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.XyzOverlapCheck"></i>
-
+                <el-badge :value="scope.row.XyzOverlapCheck" class="item" type='danger'
+                          v-if="scope.row.XyzOverlapCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.XyzOverlapCheck<=0"></i>
               </template>
@@ -570,6 +540,10 @@
       }
     }
 
+    /deep/ .el-badge__content--danger {
+      background-color: #F56C6C60;
+    }
+
   }
 
 </style>

+ 33 - 15
src/views/relation/relationShip/index.vue

@@ -46,6 +46,8 @@
             placeholder="请输入"
             @keyup.enter.native="queryTable(1)"
             v-model="mainValue"
+            style="margin-left: 5px"
+            class="min-margin"
           >
             <i
               slot="suffix"
@@ -79,6 +81,8 @@
             placeholder="请输入"
             @keyup.enter.native="queryTable(2)"
             v-model="formValue"
+            style="margin-left: 5px"
+            class="min-margin"
           >
             <i
               slot="suffix"
@@ -96,8 +100,8 @@
       <el-table
         :data="tableData"
         :span-method="objectSpanMethod"
-        border
-        :header-cell-style="{background:'#eef1f6',color:'#606266', lineHeight: '30px'}"
+
+        :header-cell-style="{background:'#e1e4e5',color:'#2b2b2b', lineHeight: '30px'}"
         :cell-style="cellStyle"
         class="table"
       >
@@ -105,31 +109,36 @@
           prop="Name"
           label="全局名称"
           width="180"
-          align="center"
+          align="left"
+          min-width="100"
         >
         </el-table-column>
         <el-table-column
           prop="LocalId"
           label="本地编码"
-          align="center"
+          align="left"
+          min-width="100"
         >
         </el-table-column>
         <el-table-column
           prop="LocalName"
           label="本地名称"
-          align="center"
+          align="left"
+          min-width="100"
         >
         </el-table-column>
         <el-table-column
           prop="CADID"
           label="CADID"
-          align="center"
+          align="left"
+          min-width="100"
         >
         </el-table-column>
         <el-table-column
           label="对象详情"
           prop="btn"
-          align="center"
+          align="left"
+          min-width="90"
         >
           <template slot-scope="scope">
             <el-button
@@ -140,33 +149,34 @@
           </template>
         </el-table-column>
         <el-table-column
+          class-name="td-bl"
           prop="cName"
           label="全局名称"
           width="180"
-          align="center"
+          align="left"
         >
         </el-table-column>
         <el-table-column
           prop="cLocalId"
-          align="center"
+          align="left"
           label="本地编码"
         >
         </el-table-column>
         <el-table-column
           prop="cLocalName"
           label="本地名称"
-          align="center"
+          align="left"
         >
         </el-table-column>
         <el-table-column
           prop="cCADID"
           label="CADID"
-          align="center"
+          align="left"
         >
         </el-table-column>
         <el-table-column
           label="对象详情"
-          align="center"
+          align="left"
         >
           <template slot-scope="scope">
             <el-button
@@ -178,7 +188,7 @@
         </el-table-column>
         <el-table-column
           label="操作"
-          align="center"
+          align="left"
         >
           <template slot-scope="scope">
             <!--            <el-button-->
@@ -238,7 +248,7 @@
         total: 0,
         values: {
           relation_maintenance: '关系维护',
-          optionTips: '请下载最新最新 xxxx 数据进行手动维护', //请下载最新最新 xxxx 数据进行手动维护
+          optionTips: `请下载最新最新<${localStorage.getItem('RelationTypeName')}>数据进行手动维护`, //请下载最新最新 xxxx 数据进行手动维护
           currentNum: '当前关系数量:',
           download: '下载模板(含数据)',
           lastTime: '最后更新时间为', //最后更新时间为
@@ -324,7 +334,7 @@
         path: '/relation/overview'
       },
         {
-          label: '设备控制关系',
+          label: localStorage.getItem('RelationTypeName'),
         },
       ])
       this.init()
@@ -514,6 +524,12 @@
 
 <style scoped lang="less">
   .relation-ship {
+    @media screen and (max-width: 1500px) {
+      .min-margin{
+        margin-top: 10px;
+      }
+    }
+
     .cursor {
       cursor: pointer;
     }
@@ -525,6 +541,8 @@
     /deep/ .el-input {
       width: auto;
     }
+    /deep/.el-table__body-wrappe {
+    }
 
     .table-list {
       width: 100%;