فهرست منبع

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

haojianlong 5 سال پیش
والد
کامیت
6ae0787a33

+ 19 - 26
src/components/ledger/details/detail/exhibitionBaseInformation.vue

@@ -2,13 +2,10 @@
 <div class="exhibition-baseInformation">
   <section v-for="(val,key,i) in exhibitionBaseInformation.information">
     <h4 class="base">{{key || '信息'}}</h4>
-    <div v-for="(value,keys,index) in val.paths"
-         :class="{'w47':exhibitionBaseInformation.style == 2,'w30':exhibitionBaseInformation.style==3,
-'w22':exhibitionBaseInformation.style == 4}"
-         style="display: inline-block;margin-left: 20px">
+    <div class="infoPoint-item" v-for="(value,keys,index) in val.paths">
       <span> {{value.InfoPointName}}:</span>
       <el-popover
-        v-if="value.Value && value.Value.length && value.Value.length>12 && value.Path=='EquipQRCode'"
+        v-if="value.Path == 'EquipQRCode' || value.Path == 'RoomQRCode' || value.Path == 'ShaftQRCode'"
         placement="top"
         width="360"
         trigger="hover">
@@ -16,10 +13,12 @@
         <div style="overflow:hidden;">
           <div style="float:left;width: 60%">
             <img
+              v-if="value.Value"
               style="width:200px;height:200px;"
               :src="'/image-service/common/file_get/'+ value.Value +'?systemId=dataPlatform'"
               alt="二维码"
             >
+            <span v-else>数据暂无</span>
           </div>
           <div style="float:right;width: 40%;margin-top: 30px">
             <span>{{value.Value}}</span>
@@ -44,28 +43,28 @@
         <el-button slot="reference" type="text">{{value.Value? '有':'-'}}</el-button>
       </el-popover>
       <el-popover
-        v-else-if="value.Value && value.Value.length && value.Value.length>12"
+        v-else-if="Array.isArray(value.Value) && value.InputMode=='N2'"
         placement="top"
-        width="160"
+        width="600"
         trigger="hover">
         <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{value.InfoPointName}}</p>
-        <p>{{value.Value}}</p>
+        <p style="height: 300px;overflow: auto">{{value.Value}}</p>
         <div style="text-align: center; margin: 0">
           <el-button type="text" size="mini" @click="handleCopy(value.Value)">复制</el-button>
         </div>
-        <el-button slot="reference" type="text">{{handleName(value.Value)}}</el-button>
+        <el-button slot="reference" type="text">{{value.Value ? '有' :'-'}}</el-button>
       </el-popover>
       <el-popover
-        v-else-if="Array.isArray(value.Value) && value.InputMode=='N2'"
+        v-else-if="value.Value && value.Value.length && `${value.InfoPointName}:${value.Value}`.length>23"
         placement="top"
-        width="600"
+        width="160"
         trigger="hover">
         <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{value.InfoPointName}}</p>
-        <p style="height: 300px;overflow: auto">{{value.Value}}</p>
+        <p>{{value.Value}}</p>
         <div style="text-align: center; margin: 0">
           <el-button type="text" size="mini" @click="handleCopy(value.Value)">复制</el-button>
         </div>
-        <el-button slot="reference" type="text">{{value.Value ? '有' :'-'}}</el-button>
+        <el-button slot="reference" type="text">{{handleName(value.InfoPointName, value.Value)}}</el-button>
       </el-popover>
       <span v-else>{{value.Value}}</span>
     </div>
@@ -94,8 +93,9 @@
         this.$message.success('复制成功')
         oInput.remove()
       },
-      handleName(val) {
-        return val.length > 12 ? val.substring(0, 12) + '...' : val
+      handleName(infoPoint, val) {
+        let text = `${infoPoint}:${val}`
+        return text.length > 23 ? val.substring(0, 23-`${infoPoint}:`.length) + '...' : val
       }
     }
   }
@@ -125,17 +125,10 @@
       text-indent: 10px;
     }
 
-    .w47 {
-      width: 47%;
-    }
-
-
-    .w30 {
-      width: 30%;
-    }
-
-    .w22 {
-      width: 22%;
+    .infoPoint-item {
+      width: 350px;
+      display: inline-block;
+      margin-left: 20px;
     }
   }
 </style>

+ 1 - 1
src/components/ledger/details/detail/exhibitionCrux.vue

@@ -86,7 +86,7 @@
         oInput.remove()
       },
       handleName(val) {
-        return val.length > 12 ? val.substring(0, 12) + '...' : val
+        return val.length > 10 ? val.substring(0, 10) + '...' : val
       }
     }
   }

+ 1 - 1
src/components/ledger/details/detail/lookFile.vue

@@ -153,7 +153,7 @@
 
     .file-box {
       border: 1px solid #eee;
-   margin: 10px;
+      margin: 10px;
       height: 88px;
 
       .file-box-left {

+ 4 - 6
src/components/ledger/details/detail/lookImage.vue

@@ -3,11 +3,11 @@
     <div class="saga-upload-images">
       <div v-if="Object.keys(exhibitionImage.list).length">
         <div v-for="(val,key,i) in exhibitionImage.list" :key="i">
-          <div class="point-view" v-for="(j,index) in val">
+          <div class="" v-for="(j,index) in val">
             <p class="title">{{key}}</p>
             <div v-if="j.PicList !=undefined && j.PicList.length >0">
               <template v-for="item in j.PicList">
-                <div class="point-image">
+                <div class="point-look-image">
                   <img @click="lookImg" :src="imageGetUrl + '&key=' +item.Key" alt v-load style="margin-bottom: 5px">
                   <p class="pic-name">{{handleName(item.Name)}}</p>
                 </div>
@@ -44,7 +44,7 @@
     },
     methods: {
       handleName(val) {
-        return val && val.length > 12 ? val.substr(1, 12) + '...' : val
+        return val && val.length > 10 ? val.substring(1, 10) + '...' : val
       },
       //查看图片
       lookImg() {
@@ -262,7 +262,6 @@
         }
       }
     }
-    .point-view {
       .pic-name {
         position: absolute;
         right: 72px;
@@ -274,8 +273,7 @@
         border-radius: 8px;
         bottom: 5px;
       }
-    }
-    .point-image {
+    .point-look-image {
       height: 180px;
       margin-bottom: 10px;
       position: relative;

+ 4 - 5
src/components/ledger/details/detail/lookVideo.vue

@@ -3,11 +3,11 @@
     <div class="saga-upload-images">
       <div v-if="Object.keys(exhibitionVideo.list).length">
         <div v-for="(val,key,i) in exhibitionVideo.list" :key="i">
-          <div class="point-view" v-for="(j,index) in val">
+          <div class="" v-for="(j,index) in val">
             <p class="title">{{key}}</p>
             <div v-if="j.PicList !=undefined && j.PicList.length">
               <template v-for="(item,index) in j.PicList">
-                <div class="point-image">
+                <div class="point-look-video">
                   <video
                     width="100%"
                     height="100%;"
@@ -263,7 +263,6 @@
         }
       }
     }
-    .point-view {
       .pic-name {
         position: absolute;
         right: 72px;
@@ -275,8 +274,8 @@
         border-radius: 8px;
         bottom: 5px;
       }
-    }
-    .point-image {
+
+    .point-look-video {
       height: 180px;
       position: relative;
       overflow: hidden;

+ 6 - 3
src/components/relation/overview/CardList.vue

@@ -133,7 +133,7 @@
                           v-if="relation.IsSource"
                         >
                           <el-button
-                            @click="equipment"
+                            @click="equipment(relation)"
                             type="primary"
                             plain
                             circle
@@ -184,6 +184,7 @@
           cancel: '取消',
           confirm: '确定',
           back: '返回',
+          preservation:'保存',
           promptly: '立即计算',
           placeholder: '请选择',
           download: '下载模板(含数据)',
@@ -205,7 +206,8 @@
           dataFailed: '数据文件验证失败',
           allUpdateSuccess: 'xxxx全部更新成功',
           portionUpdateSuccess: ' xxxx关系部分更新成功',
-          downloadFile: ' 下载报告文件'
+          downloadFile: ' 下载报告文件',
+          equipmentSetting:''
         },
         isComputed: {}, // 当前要计算的对象
         ManualMaintenance: {},//手动编辑对象
@@ -238,7 +240,8 @@
           return false
         }
       },
-      equipment() {
+      equipment(relation) { //配置源端末端
+        this.values.equipmentSetting=`${relation.RelationTypeName} 源末端关系设置`
         this.$refs.maintain.dialogEquipment = true
       },
       manual(relation) {

+ 54 - 11
src/components/relation/overview/Modal/RelationMaintain.vue

@@ -29,9 +29,9 @@
       >
         <p class="font-big">{{values.existComputed}}</p>
         <p class="exist-title">{{values.existTitle}}</p>
-        <el-row :span="24">
+        <el-row :span="24" style="margin-top: 10px">
           <el-col :span="8">
-            <span class="demonstration">{{values.originEquipment}}</span>
+            <p class="demonstration">{{values.originEquipment}}</p>
             <el-cascader
                 :key="isResouceShow"
                 :options="list"
@@ -43,7 +43,7 @@
             />
           </el-col>
           <el-col :span="8">
-            <span class="demonstration">{{values.endEquipment}}</span>
+            <p class="demonstration">{{values.endEquipment}}</p>
 
             <el-cascader
                 :options="list"
@@ -71,19 +71,62 @@
       </div>
     </el-dialog>
     <!--设定设备对象源/末端-->
+    <!--    <el-dialog-->
+    <!--        :title="values.title"-->
+    <!--        :visible.sync="dialogEquipment"-->
+    <!--    >-->
+    <!--      <span class="font-big">{{values.underDesign}}</span>-->
+    <!--      <footer-->
+    <!--          slot="footer"-->
+    <!--          class="dialog-footer"-->
+    <!--      >-->
+    <!--        <el-button-->
+    <!--            type="primary"-->
+    <!--            @click="dialogEquipment = false"-->
+    <!--        >{{values.confirm}}-->
+    <!--        </el-button>-->
+    <!--      </footer>-->
+    <!--    </el-dialog> -->
     <el-dialog
-        :title="values.title"
-        :visible.sync="dialogEquipment"
+      :title="values.title"
+      :visible.sync="dialogEquipment"
     >
-      <span class="font-big">{{values.underDesign}}</span>
+      <h4>{{values.equipmentSetting}}</h4>
+      <el-row :span="24" style="margin-top: 15px">
+        <el-col :span="8">
+          <p class="">{{values.originEquipment}}</p>
+          <el-cascader
+            :key="isResouceShow"
+            :options="list"
+            v-model="ops"
+            :props="props"
+            collapse-tags
+            clearable
+          />
+        </el-col>
+        <el-col :span="8">
+          <p class="">{{values.endEquipment}}</p>
+          <el-cascader
+            :options="list"
+            v-model="filterOps"
+            :key="isResouceShow"
+            :props="props"
+            collapse-tags
+            clearable
+          />
+        </el-col>
+      </el-row>
+
       <footer
-          slot="footer"
-          class="dialog-footer"
+        slot="footer"
+        class="dialog-footer"
       >
+        <el-button @click="dialogEquipment = false">{{values.cancel}}</el-button>
+
         <el-button
-            type="primary"
-            @click="dialogEquipment = false"
-        >{{values.confirm}}
+          type="primary"
+          @click="dialogEquipment = false"
+        >{{values.preservation}}
         </el-button>
       </footer>
     </el-dialog>

+ 1 - 2
src/views/ledger/cenotelist/cenoteDetail/index.vue

@@ -71,8 +71,7 @@
         pointData: [], //信息点数据
         exampleData: {}, //实例数据
         exhibitionBaseInformation: {
-          information: {},
-          style: 4
+          information: {}
         },
         selectRadio: {
           information: '设备信息点',

+ 7 - 4
src/views/ledger/facility/details/index.vue

@@ -2,7 +2,7 @@
   <div class="tableDisplay">
     <div class="header">
       <el-button style="float:left;" size="small" type="default" icon="el-icon-back" @click="goBack"></el-button>
-      <span class="details-title"><b>{{name}} - {{code}}</b></span>
+      <span :title="`${name} - ${code}`" class="details-title"><b>{{name}} - {{code}}</b></span>
     </div>
     <div class="content">
       <div class="content-left">
@@ -127,8 +127,7 @@
           ]
         },
         exhibitionBaseInformation: {
-          information: {},
-          style:2
+          information: {}
         },
         exhibitionEnergy: {
           title: '能耗信息',
@@ -444,11 +443,15 @@
   .tableDisplay {
     .header {
       padding-bottom: 10px;
+      overflow: hidden;
+      text-overflow:ellipsis;
+      white-space: nowrap;
       .details-title {
         color: #333;
         font-size: 16px;
         margin-left: 20px;
         line-height: 32px;
+        cursor: pointer;
       }
     }
 
@@ -489,7 +492,7 @@
           }
 
           .content-point-right {
-            width: 400px;
+            width: 350px;
             border-left: 1px solid #ccc;
           }
         }

+ 6 - 3
src/views/ledger/property/details/index.vue

@@ -2,7 +2,7 @@
   <div class="tableDisplay">
     <div class="header">
       <el-button style="float:left;" size="small" type="default" icon="el-icon-back" @click="goBack"></el-button>
-      <span class="details-title"><b>{{name}} - {{code}}</b></span>
+      <span :title="`${name} - ${code}`" class="details-title"><b>{{name}} - {{code}}</b></span>
     </div>
     <div class="content">
       <div class="content-left">
@@ -114,8 +114,7 @@
           ]
         },
         exhibitionBaseInformation: {
-          information: {},
-          style:3
+          information: {}
         },
         exhibitionFile: {
           title: '文件',
@@ -384,11 +383,15 @@
   .tableDisplay {
     .header {
       padding-bottom: 10px;
+      overflow: hidden;
+      text-overflow:ellipsis;
+      white-space: nowrap;
       .details-title {
         color: #333;
         font-size: 16px;
         margin-left: 20px;
         line-height: 32px;
+        cursor: pointer;
       }
     }
 

+ 2 - 3
src/views/ledger/spacelist/spaceDetail/index.vue

@@ -120,8 +120,7 @@
           ]
         },
         exhibitionBaseInformation: {
-          information: {},
-          style:2
+          information: {}
         },
         exhibitionEnergy: {
           title: '能耗信息',
@@ -526,7 +525,7 @@
             flex: 1;
           }
           .content-point-right {
-            width: 400px;
+            width: 350px;
             border-left: 1px solid #ccc;
           }
         }

+ 1 - 2
src/views/ledger/system/systemDetail/index.vue

@@ -117,8 +117,7 @@
           ]
         },
         exhibitionBaseInformation: {
-          information: {},
-          style: 3
+          information: {}
         },
         exhibitionEnergy: {
           title: '能耗信息',