Browse Source

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

haojianlong 4 years ago
parent
commit
73b2268b86

+ 6 - 2
src/components/point/dynamicdata/buildRules.vue

@@ -40,8 +40,12 @@
       </el-row>
     </div>
     <el-row>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">点位表中出现的所有{{typeName}}</el-col>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">对应物理世界中的{{typeName}}实例</el-col>
+      <el-col :span="12" style="margin-left:-5px;font-size:13px;">
+        <span class="iconfont icon-juxing"></span>
+        点位表中出现的所有{{typeName}}</el-col>
+      <el-col :span="12" style="font-size:13px;">
+        <span class="iconfont icon-juxing"></span>
+        对应物理世界中的{{typeName}}实例</el-col>
     </el-row>
     <!-- 列表区域 -->
     <div class="table-area">

+ 6 - 2
src/components/point/dynamicdata/equipRules.vue

@@ -40,8 +40,12 @@
       </el-row>
     </div>
     <el-row>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">点位表中出现的所有{{typeName}}</el-col>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">对应物理世界中的{{typeName}}实例</el-col>
+      <el-col :span="12" style="font-size:13px;margin-left: -5px;">
+        <span class="iconfont icon-juxing"></span>
+        点位表中出现的所有{{typeName}}</el-col>
+      <el-col :span="12" style="font-size:13px;">
+        <span class="iconfont icon-juxing"></span>
+        对应物理世界中的{{typeName}}实例</el-col>
     </el-row>
     <!-- 列表区域 -->
     <div class="table-area">

+ 6 - 2
src/components/point/dynamicdata/floorRules.vue

@@ -40,8 +40,12 @@
       </el-row>
     </div>
     <el-row>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">点位表中出现的所有{{typeName}}</el-col>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">对应物理世界中的{{typeName}}实例</el-col>
+      <el-col :span="12" style="margin-left:-5px;font-size:13px;">
+        <span class="iconfont icon-juxing"></span>
+        点位表中出现的所有{{typeName}}</el-col>
+      <el-col :span="12" style="font-size:13px;">
+        <span class="iconfont icon-juxing"></span>
+        对应物理世界中的{{typeName}}实例</el-col>
     </el-row>
     <!-- 列表区域 -->
     <div class="table-area">

+ 6 - 2
src/components/point/dynamicdata/partsRules.vue

@@ -39,8 +39,12 @@
       </el-row>
     </div>
     <el-row>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">点位表中出现的所有{{typeName}}</el-col>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">对应物理世界中的{{typeName}}实例</el-col>
+      <el-col :span="12" style="margin-left:-5px;font-size:13px;">
+        <span class="iconfont icon-juxing"></span>
+        点位表中出现的所有{{typeName}}</el-col>
+      <el-col :span="12" style="font-size:13px">
+        <span class="iconfont icon-juxing"></span>
+        对应物理世界中的{{typeName}}实例</el-col>
     </el-row>
     <!-- 列表区域 -->
     <div class="table-area">

+ 6 - 2
src/components/point/dynamicdata/projectRules.vue

@@ -39,8 +39,12 @@
       </el-row>
     </div>
     <el-row>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">点位表中出现的所有{{typeName}}</el-col>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">对应物理世界中的{{typeName}}实例</el-col>
+      <el-col :span="12" style="margin-left:-5px;font-size:13px">
+        <span class="iconfont icon-juxing"></span>
+        点位表中出现的所有{{typeName}}</el-col>
+      <el-col :span="12" style="font-size:13px;">
+        <span class="iconfont icon-juxing"></span>
+        对应物理世界中的{{typeName}}实例</el-col>
     </el-row>
     <!-- 列表区域 -->
     <div class="table-area">

+ 6 - 2
src/components/point/dynamicdata/spaceRules.vue

@@ -39,8 +39,12 @@
       </el-row>
     </div>
     <el-row>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">点位表中出现的所有{{typeName}}</el-col>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">对应物理世界中的{{typeName}}实例</el-col>
+      <el-col :span="12" style="margin-left:-5px;font-size:13px;">
+        <span class="iconfont icon-juxing"></span>
+        点位表中出现的所有{{typeName}}</el-col>
+      <el-col :span="12" style="font-size:13px;">
+        <span class="iconfont icon-juxing"></span>
+        对应物理世界中的{{typeName}}实例</el-col>
     </el-row>
     <!-- 列表区域 -->
     <div class="table-area">

+ 6 - 2
src/components/point/dynamicdata/systemRules.vue

@@ -39,8 +39,12 @@
       </el-row>
     </div>
     <el-row>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">点位表中出现的所有{{typeName}}</el-col>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">对应物理世界中的{{typeName}}实例</el-col>
+      <el-col :span="12" style="margin-left:-5px;font-size:13px;">
+        <span class="iconfont icon-juxing"></span>
+        点位表中出现的所有{{typeName}}</el-col>
+      <el-col :span="12" style="font-size:13px;">
+        <span class="iconfont icon-juxing"></span>
+        对应物理世界中的{{typeName}}实例</el-col>
     </el-row>
     <!-- 列表区域 -->
     <div class="table-area">

+ 6 - 2
src/components/point/dynamicdata/tenantRules.vue

@@ -39,8 +39,12 @@
       </el-row>
     </div>
     <el-row>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">点位表中出现的所有{{typeName}}</el-col>
-      <el-col :span="12" style="padding-left:10px;font-size:13px;border-left:2px solid #000;">对应物理世界中的{{typeName}}实例</el-col>
+      <el-col :span="12" style="margin-left:-5px;font-size:13px;">
+        <span class="iconfont icon-juxing"></span>
+        点位表中出现的所有{{typeName}}</el-col>
+      <el-col :span="12" style="font-size:13px;">
+        <span class="iconfont icon-juxing"></span>
+        对应物理世界中的{{typeName}}实例</el-col>
     </el-row>
     <!-- 列表区域 -->
     <div class="table-area">

+ 13 - 12
src/components/ready/buildfloor/addBuild.vue

@@ -43,7 +43,7 @@
             </el-input>
             <el-select
             placeholder="请选择"
-            v-else-if="item.InputMode == 'D1' || item.InputMode == 'E2' || item.InputMode == 'D1L'"
+            v-else-if="item.InputMode == 'D1' || item.InputMode == 'E2'"
             v-model="form[item.Path]"
           >
             <el-option :key="op.Name" :label="op.Name" :value="op.Code" v-for="op in item.options"></el-option>
@@ -67,15 +67,17 @@
              start-placeholder="开始日期"
              end-placeholder="结束日期"
            />
-<!--             <el-cascader-->
-<!--               v-else-if="item.InputMode == 'D1L'"-->
-<!--               placeholder="请选择"-->
-<!--               :options="item.options"-->
-<!--               v-model="form[item.Path]"-->
-<!--               :props="{ checkStrictly: true ,value: 'Code',label:'Name'}"-->
-<!--               clearable-->
-<!--               style="width: 200px"-->
-<!--             />-->
+             <el-cascader
+               v-else-if="item.InputMode == 'D1L'"
+               placeholder="请选择"
+               :options="item.options"
+               v-model="form[item.Path]"
+               :props="item.props"
+               filterable
+               :show-all-levels="false"
+               clearable
+               style="width: 200px"
+             />
           <el-input
             v-else-if="item.InputMode == 'L'||item.InputMode == 'L1'||item.InputMode == 'L2'||item.InputMode == 'M'"
             v-model="form[item.Path]">
@@ -115,8 +117,7 @@
     </el-form>
     <span
       class="dialog-footer"
-      slot="footer"
-    >
+      slot="footer">
     <el-button @click="buildDialogVis = false">取 消</el-button>
     <el-button @click="submitForm('ruleForm')" type="primary">确 定</el-button>
   </span>

+ 2 - 4
src/components/ready/buildfloor/formItems.vue

@@ -11,9 +11,7 @@
           <span v-if="item.InputMode == 'B1'">
             <el-input
               v-model="form[item.Path]"
-              :placeholder="(item.InputMode === 'B1' && item.Path==='FloorLocalID') ? '填写示例:F1、B1?':'' "
-
-            />
+              :placeholder="(item.InputMode === 'B1' && item.Path==='FloorLocalID') ? '填写示例:F1、B1?':'' "/>
               <div
                 v-if="item.InputMode === 'B1' && item.Path==='FloorLocalID' && isShowTitle"
                 style="color: gray;font-size: 12px"
@@ -86,7 +84,7 @@
           data: {
             Orders: "sort asc,InfoPointCode asc",
             PageNumber: 1,
-            PageSize: 50
+            PageSize: 1000
           },
           type: this.type
         };

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

@@ -11,6 +11,7 @@
         v-for="(child,childIndex) in item.ChildGraphicTypeList"
       >
         <p class="relation-text">
+          <span class="iconfont icon-juxing"></span>
           <span @click="toDetail(child)" style="cursor:pointer;">
             {{child.GraphTypeName}}
             <i class="icon-zuzhiguanxi iconfont"/></span>
@@ -400,8 +401,8 @@
       overflow: hidden;
       margin-top: 10px;
       color: @color-text;
-      border-left: 8px solid @color-text;
-      text-indent: 10px;
+      /*text-indent: 10px;*/
+      margin-left: -3px;
       font-weight: @font-big;
 
       .pic-code {

+ 8 - 8
src/router/system.js

@@ -340,14 +340,14 @@ export default [{
             meta: {keepAlive: false, breadcrumbs: [{label: '台账管理', path: '/ledger/facility'}, {label: '设备台账'}]}
           },
           {
-            path: 'deviceDetails', 
-            name: 'deviceDetails', 
+            path: 'deviceDetails',
+            name: 'deviceDetails',
             component: deviceDetails,
             meta: {
-							keepAlive: false, 
+							keepAlive: false,
 							breadcrumbs: [
 								{label: '台账管理', path: '/ledger/facility'},
-								{label: '设备台账', path: '/ledger/facility'}, 
+								{label: '设备台账', path: '/ledger/facility'},
 								{label: '台账详情'}
 							]
             }
@@ -405,14 +405,14 @@ export default [{
                 meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '资产台账' }] }
 			},
             {
-                path: 'propertyDetails', 
-                name: 'propertyDetails', 
+                path: 'propertyDetails',
+                name: 'propertyDetails',
                 component: propertyDetails,
                 meta: {
-                    keepAlive: false, 
+                    keepAlive: false,
                     breadcrumbs: [
                         {label: '台账管理', path: '/ledger/facility'},
-                        {label: '资产台账', path: '/ledger/property'}, 
+                        {label: '资产台账', path: '/ledger/property'},
                         {label: '资产详情'}
                     ]
                 }

+ 8 - 5
src/views/ledger/facility/details/index.vue

@@ -219,15 +219,18 @@
               criterias: this.criterias
             }
           }
+          let arr = []
           if (this.criterias.length) {
             BeatchQueryParam(params, res => {
-              res.Content && res.Content.map(child => {
+              arr = res.Content
+              arr && arr.length && arr.map(child => {
+
                 this.pointData.forEach(head => {
                   if (head.InfoPointCode == child.code) {
-                    console.log(head.FirstName,child,'==')
+                    console.log(head.FirstName, child, '==')
                     this.exhibitionEnergy.firstName = head.FirstName
                     this.exhibitionEnergy.dynamic.push({
-                      FirstName:head.FirstName,
+                      FirstName: head.FirstName,
                       InfoPointCode: head.InfoPointCode,
                       InfoPointName: head.InfoPointName,
                       Path: head.Path,
@@ -239,10 +242,10 @@
                     })
                   }
                 })
-              });
+              })
             })
-          }
 
+          }
         })
       },
       handleEnclosure() {

+ 24 - 10
src/views/ledger/report/index.vue

@@ -35,7 +35,9 @@
     <div class="progress">
       <p class="basic-statistics">基本统计</p>
       <div class="data equipment" v-if="equipCount">
-        <span class="contain-title">设备<i>{{`(${equipCount?equipCount:"0"})`}}</i></span>
+        <span class="contain-title">
+             <span class="iconfont icon-juxing"></span>
+          设备<i>{{`(${equipCount?equipCount:"0"})`}}</i></span>
         <div class="data-show" v-loading="isLoading" v-if="equipment.length">
           <div class="show-content" v-for="(item,index) in equipment" :key="index">
             <data-origin :id="'equipment' + index" :renderData="item"></data-origin>
@@ -53,7 +55,9 @@
         </div>
       </div>
       <div class="data assets" v-if="assetsCount">
-        <span class="contain-title">资产<i>{{`(${assetsCount?assetsCount:"0"})`}}</i></span>
+        <span class="contain-title">
+             <span class="iconfont icon-juxing"></span>
+          资产<i>{{`(${assetsCount?assetsCount:"0"})`}}</i></span>
         <div class="data-show" v-loading="isLoading" v-if="assets.length">
           <div class="show-content" v-for="(item,index) in assets" :key="index">
             <data-origin :id="'assets' + index" :renderData="item"></data-origin>
@@ -61,10 +65,14 @@
         </div>
       </div>
       <div class="data parts" v-if="partsCount">
-        <span class="contain-title">部件<i>{{`(${partsCount?partsCount:'0'})`}}</i></span>
+        <span class="contain-title">
+             <span class="iconfont icon-juxing"></span>
+          部件<i>{{`(${partsCount?partsCount:'0'})`}}</i></span>
       </div>
       <div class="data business-space" v-if="zoneSpaceCount">
-        <span class="contain-title">业务空间<i>{{`(${zoneSpaceCount?zoneSpaceCount:'0'})`}}</i></span>
+        <span class="contain-title">
+             <span class="iconfont icon-juxing"></span>
+          业务空间<i>{{`(${zoneSpaceCount?zoneSpaceCount:'0'})`}}</i></span>
         <div class="data-show" v-if="business.length">
           <div v-for="(item,index) in business" :key="index" class="show-content">
             <datafan :id="'datafan' + index" :renderData="item"></datafan>
@@ -72,7 +80,9 @@
         </div>
       </div>
       <div class="data " v-if="systemCount">
-        <span class="contain-title">系统<i>{{`(${systemCount?systemCount:'0'})`}}</i></span>
+        <span class="contain-title">
+             <span class="iconfont icon-juxing"></span>
+          系统<i>{{`(${systemCount?systemCount:'0'})`}}</i></span>
         <div class="data-show" v-loading="isLoading" v-if="sysMessageData.length">
           <div class="device-content" v-for="(item,index) in sysMessageData" :key="index">
             <data-origin :id="'origin-sys' + index" :renderData="item" :filterClass="'yes'"></data-origin>
@@ -80,7 +90,9 @@
         </div>
       </div>
       <div class="data " v-if="rentantCount">
-        <span class="contain-title">租户<i>{{`(${rentantCount?rentantCount:'0'})`}}</i></span>
+        <span class="contain-title">
+             <span class="iconfont icon-juxing"></span>
+          租户<i>{{`(${rentantCount?rentantCount:'0'})`}}</i></span>
         <div class="data-show" v-loading="isLoading" v-if="tenant.length">
           <div class="show-content" v-for="(item,index) in tenant" :key="index">
             <data-origin :id="'origin-tenant' + index" :renderData="item"></data-origin>
@@ -88,7 +100,9 @@
         </div>
       </div>
       <div class="data " v-if="shaftCount">
-        <span class="contain-title">竖井<i>{{`(${shaftCount?shaftCount:'0'})`}}</i></span>
+        <span class="contain-title">
+             <span class="iconfont icon-juxing"></span>
+          竖井<i>{{`(${shaftCount?shaftCount:'0'})`}}</i></span>
         <div class="data-show" v-loading="isLoading" v-if="shaft.length">
           <div class="show-content" v-for="(item,index) in shaft" :key="index">
             <datafan :id="'origin-datafan' + index" :renderData="item" v-if="!item.needCountT"></datafan>
@@ -825,11 +839,11 @@
       .contain-title {
         height: 30px;
         line-height: 30px;
-        border-left: 8px solid black;
+        /*border-left: 8px solid black;*/
         display: inline-block;
-        margin: 8px 8px;
+        margin: 8px 0;
         font-weight: 600;
-        padding-left: 8px;
+        /*padding-left: 8px;*/
         cursor: default;
 
         i {

+ 9 - 5
src/views/point/report/index.vue

@@ -2,14 +2,18 @@
   <div>
     <!-- 系统集成统计页面 -->
     <div class="contain-block" style="width:calc(30% - 15px);margin-right:15px;min-width:385px;">
-      <span class="contain-title-leftblock">系统集成统计</span>
+      <span class="contain-title-leftblock">
+         <span class="iconfont icon-juxing"></span>
+        系统集成统计</span>
       <div class="contain-data">
         <integrateStatistics ref="chart" style="height: calc(100% - 5px);" :key="refresh"></integrateStatistics>
       </div>
     </div>
     <!-- 表号功能号总览页面 -->
     <div class="contain-block meterFunc">
-      <span class="contain-title-leftblock">表号功能号总览</span>
+      <span class="contain-title-leftblock">
+         <span class="iconfont icon-juxing"></span>
+        表号功能号总览</span>
       <div class="contain-data">
         <tabFunNumOverview ref="table" :key="refresh" @reloadData="reloadData()"></tabFunNumOverview>
       </div>
@@ -60,9 +64,9 @@ export default {
 .contain-title-leftblock {
   height: 30px;
   line-height: 30px;
-  border-left: 8px solid black;
+  /*border-left: 8px solid black;*/
   display: inline-block;
-  margin: 8px 8px;
+  margin: 8px 0;
   font-weight: 600;
   padding-left: 8px;
   cursor: default;
@@ -76,4 +80,4 @@ export default {
     width:calc(100% - 400px);
   }
 }
-</style>
+</style>

+ 9 - 0
src/views/ready/buildfloor/index.vue

@@ -230,6 +230,14 @@
             console.log(item.FirstName)
             if ((item.InputMode === 'D1' || item.InputMode === 'D2' || item.InputMode === 'E2' || item.InputMode === 'D1L') && item.DataSource != undefined) {
               item.options = JSON.parse(item.DataSource)
+              if (item.options[0] && item.options[0].Content) {
+                item.props = {
+                  value: 'Code',
+                  label: 'Name',
+                  children: 'Content',
+                  checkStrictly: true
+                }
+              }
             }
             if (first[item.FirstName] && first[item.FirstName].length) {
             } else {
@@ -248,6 +256,7 @@
                 SecondName: item.SecondName ? item.SecondName : "",
                 InputMode: item.InputMode,
                 options: item.options,
+                props:item.props,
                 Unit: item.Unit,
                 Path: item.Path
               })

+ 10 - 6
src/views/relation/data/index.vue

@@ -19,7 +19,9 @@
     </div>
     <el-row :gutter="24">
       <el-col :span="12">
-        <p class="border-left-8">标准数字化交付数据(数据中心)→(物理世界)项目实际数据</p>
+        <p class="border-left-8">
+          <span class="iconfont icon-juxing"></span>
+          标准数字化交付数据(数据中心)→(物理世界)项目实际数据</p>
         <el-table
             :data="margeData(dataCenter)"
             stripe
@@ -39,7 +41,9 @@
         </el-table>
       </el-col>
       <el-col :span="12" style="padding-left: 0">
-        <p class="border-left-8">项目实际数据(物理世界)→(数据中心)标准数字化交付数据</p>
+        <p class="border-left-8">
+          <span class="iconfont icon-juxing"></span>
+          项目实际数据(物理世界)→(数据中心)标准数字化交付数据</p>
         <el-table
             :data="margeData(dataPlatForm)"
             stripe
@@ -170,10 +174,10 @@
   .container {
     overflow-x: hidden;
     .border-left-8 {
-      border-left: 8px solid black;
-      margin: 10px 0;
+      /*border-left: 8px solid black;*/
+      margin: 10px 0 10px -4px;
       font-weight: 600;
-      text-indent: 10px;
+      /*text-indent: 10px;*/
     }
 
     .banner {
@@ -204,4 +208,4 @@
     }
   }
 
-</style>
+</style>