Browse Source

对D1L类型的信息点做兼容性限制

zhangyu 5 years ago
parent
commit
7b64cc5ab0

+ 4 - 3
src/components/data_admin/zoneInput.vue

@@ -12,8 +12,8 @@
             <el-option v-for="(soption,skey) in item.options" :key="skey" :label="soption.Name" :value="soption.Code">
             <el-option v-for="(soption,skey) in item.options" :key="skey" :label="soption.Name" :value="soption.Code">
             </el-option>
             </el-option>
           </el-select>
           </el-select>
-          <el-cascader v-model="item.inputValue" v-else-if="item.InputMode == 'D1L'" placeholder="请选择"
-            :props="item.props" :options="item.options" filterable :show-all-levels="false"></el-cascader>
+          <el-cascader v-model="item.inputValue" v-else-if="item.InputMode == 'D1L'" placeholder="请在台账中维护该类型信息点"
+            :props="item.props" :options="item.options" filterable clearable disabled :show-all-levels="false"></el-cascader>
           <el-input v-model="item.inputValue" v-else></el-input>
           <el-input v-model="item.inputValue" v-else></el-input>
         </el-form-item>
         </el-form-item>
       </div>
       </div>
@@ -75,7 +75,8 @@ export default {
             item.props = {
             item.props = {
               value: 'Code',
               value: 'Code',
               label: 'Name',
               label: 'Name',
-              children: 'Content'
+              children: 'Content',
+              checkStrictly: true
             }
             }
           }
           }
           item.options = options;
           item.options = options;

+ 76 - 78
src/components/ready/buildfloor/addBuild.vue

@@ -20,97 +20,95 @@
           :key="item.InfoPointCode"
           :key="item.InfoPointCode"
           v-for="item in val"
           v-for="item in val"
           :class="[{'upload-file':item.InputMode == 'F2' ||  item.Path === 'BuildingInfo.BuildingType.Pic'}]"
           :class="[{'upload-file':item.InputMode == 'F2' ||  item.Path === 'BuildingInfo.BuildingType.Pic'}]"
-          style="width: 50%;display: inline-block"
+          style="width: 50%;display: inline-block">
 
 
-        >
           <el-form-item
           <el-form-item
             :class="{FloorTypeSelect:item.InputMode == 'D1'||item.Unit}"
             :class="{FloorTypeSelect:item.InputMode == 'D1'||item.Unit}"
             :label="item.InfoPointName"
             :label="item.InfoPointName"
             :prop="item.InfoPointCode"
             :prop="item.InfoPointCode"
-            v-if="all||item.Visible"
-
-          >
+            v-if="all||item.Visible">
 
 
             <el-input
             <el-input
-              v-model="form[item.Path]"
               v-if="item.InputMode == 'B1' || item.InputMode == 'B2'"
               v-if="item.InputMode == 'B1' || item.InputMode == 'B2'"
-            />
-
+              v-model="form[item.Path]"/>
 
 
-            <el-input type="number" v-else-if="item.InputMode == 'A1'||item.InputMode == 'A2'"
-                      v-model="form[item.Path]">
+            <el-input 
+              v-else-if="item.InputMode == 'A1'||item.InputMode == 'A2'"
+              type="number"
+              v-model="form[item.Path]">
               <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
               <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
             </el-input>
             </el-input>
+
             <el-select
             <el-select
-            placeholder="请选择"
-            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>
-          </el-select>
-        <el-select
-          placeholder="请选择"
-          v-else-if="item.InputMode == 'D2'"
-          v-model="form[item.Path]"
-          multiple
-          collapse-tags
-        >
-
-            <el-option :key="op.Name" :label="op.Name" :value="op.Code" v-for="op in item.options"></el-option>
-          </el-select>
-           <el-date-picker
-             v-model="form[item.Path]"
-             type="daterange"
-             v-else-if="item.InputMode == 'C6'"
-             value-format="yyyy-MM-dd"
-             range-separator="至"
-             start-placeholder="开始日期"
-             end-placeholder="结束日期"
-           />
-             <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]">
-            <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
-          </el-input>
-          <el-date-picker
-            placeholder="选择日期"
-            value-format="yyyy-MM-dd"
-            type="date" v-else-if="item.InputMode == 'C5'" v-model="form[item.Path]">
-          </el-date-picker>
-
-          <uploadImgs
-            :readOnly="false"
-            v-else-if="item.InputMode == 'F2'&& item.Path === 'BuildingInfo.BuildingType.Pic'"
-            v-model="form[item.Path]"
-            :keysArr="Array.isArray(buildData[item.Path]) ? buildData[item.Path]:[]"
-            :context-key="item.Path"
-            :isShow="1"
-            @change="changeItem"
-          />
-
-             <upload-files
-               v-model="form[item.Path]"
-               v-else-if="item.InputMode == 'F2'"
-               :readOnly="false"
-               :isShow="1"
-               :keys-arr="Array.isArray(buildData[item.Path]) ? buildData[item.Path]:[] "
-               :show-file-list="false"
-               :context-key="item.Path"
-               @change="changeItem"
-             />
-            <el-input disabled title="暂不支持" v-else v-model="form[item.Path]"/>
+              v-else-if="item.InputMode == 'D1' || item.InputMode == 'E2'"
+              placeholder="请选择"
+              v-model="form[item.Path]">
+              <el-option :key="op.Name" :label="op.Name" :value="op.Code" v-for="op in item.options"></el-option>
+            </el-select>
+
+            <el-select
+              v-else-if="item.InputMode == 'D2'"
+              placeholder="请选择"
+              v-model="form[item.Path]"
+              multiple
+              collapse-tags>
+              <el-option :key="op.Name" :label="op.Name" :value="op.Code" v-for="op in item.options"></el-option>
+            </el-select>
+
+            <el-date-picker
+              v-else-if="item.InputMode == 'C6'"
+              v-model="form[item.Path]"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+
+            <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]">
+              <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
+            </el-input>
+
+            <el-date-picker
+              v-else-if="item.InputMode == 'C5'" v-model="form[item.Path]"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd"
+              type="date">
+            </el-date-picker>
 
 
+            <uploadImgs
+              v-else-if="item.InputMode == 'F2'&& item.Path === 'BuildingInfo.BuildingType.Pic'"
+              :readOnly="false"
+              v-model="form[item.Path]"
+              :keysArr="Array.isArray(buildData[item.Path]) ? buildData[item.Path]:[]"
+              :context-key="item.Path"
+              :isShow="1"
+              @change="changeItem"/>
+
+            <upload-files
+              v-else-if="item.InputMode == 'F2'"
+              v-model="form[item.Path]"
+              :readOnly="false"
+              :isShow="1"
+              :keys-arr="Array.isArray(buildData[item.Path]) ? buildData[item.Path]:[] "
+              :show-file-list="false"
+              :context-key="item.Path"
+              @change="changeItem"/>
+
+            <el-input disabled title="暂不支持" v-else v-model="form[item.Path]"/>
+            
           </el-form-item>
           </el-form-item>
         </div>
         </div>
       </template>
       </template>

+ 54 - 52
src/components/ready/buildfloor/formItems.vue

@@ -6,78 +6,72 @@
           :label="item.InfoPointName"
           :label="item.InfoPointName"
           :prop="item.InfoPointCode"
           :prop="item.InfoPointCode"
           v-if="all||item.Visible"
           v-if="all||item.Visible"
-          :class="{FloorTypeSelect:item.InputMode == 'D1'||item.Unit}"
-        >
+          :class="{FloorTypeSelect:item.InputMode == 'D1'||item.Unit}">
+
           <!--BIM模型中坐标-->
           <!--BIM模型中坐标-->
           <el-input
           <el-input
             v-model="form[item.Path]"
             v-model="form[item.Path]"
             v-if="item.InfoPointCode == 'BIMLocation'"
             v-if="item.InfoPointCode == 'BIMLocation'"
-            disabled
-          />
+            disabled/>
+
           <!--二维码相关-->
           <!--二维码相关-->
           <span v-else-if="item.InfoPointCode == 'DefaultQRCode' ">
           <span v-else-if="item.InfoPointCode == 'DefaultQRCode' ">
-          <el-input
-            v-model="form[item.Path]"
-            v-if="!form[item.Path]"
-            disabled
-          />
-              <el-popover
-                v-else
-                placement="right"
-                width="210"
-                trigger="click">
-        <div style="overflow:hidden;">
-            <img
-              style="width:200px;height:200px;"
-              :src="'/image-service/common/file_get/'+ form[item.Path] +'?systemId=dataPlatform'"
-              alt="二维码"
-            >
-          </div>
-        <el-button slot="reference" type="text">点击查看</el-button>
-      </el-popover>
+            <el-input v-if="!form[item.Path]" v-model="form[item.Path]" disabled/>
+            <el-popover v-else placement="right" width="210" trigger="click">
+              <div style="overflow:hidden;">
+                <img
+                  style="width:200px;height:200px;"
+                  :src="'/image-service/common/file_get/'+ form[item.Path] +'?systemId=dataPlatform'"
+                  alt="二维码">
+              </div>
+              <el-button slot="reference" type="text">点击查看</el-button>
+            </el-popover>
           </span>
           </span>
+
           <span v-else-if="item.InfoPointCode == 'QRCodePic' ">
           <span v-else-if="item.InfoPointCode == 'QRCodePic' ">
-          <el-input
-            v-model="form[item.Path]"
-            v-if="!form[item.Path]"
-            disabled
-          />
-              <el-popover
-                v-else
-                placement="right"
-                width="210"
-                trigger="click">
-        <div style="overflow:hidden;">
-            <img
-              style="width:200px;height:200px;"
-              :src="'/image-service/common/file_get/'+ form[item.Path] +'?systemId=dataPlatform'"
-              alt="二维码"
-            >
-          </div>
-        <el-button slot="reference" type="text">点击查看</el-button>
-      </el-popover>
+            <el-input v-if="!form[item.Path]" v-model="form[item.Path]" disabled/>
+            <el-popover v-else placement="right" width="210" trigger="click">
+              <div style="overflow:hidden;">
+                <img
+                  style="width:200px;height:200px;"
+                  :src="'/image-service/common/file_get/'+ form[item.Path] +'?systemId=dataPlatform'"
+                  alt="二维码">
+              </div>
+              <el-button slot="reference" type="text">点击查看</el-button>
+            </el-popover>
           </span>
           </span>
 
 
           <!--/二维码相关-->
           <!--/二维码相关-->
           <span v-else-if="item.InputMode == 'B1'">
           <span v-else-if="item.InputMode == 'B1'">
-            <el-input
-              v-model="form[item.Path]"
-              :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"
-              >用于楼层平面图切换</div>
+            <el-input v-model="form[item.Path]" :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" >
+                用于楼层平面图切换
+              </div>
           </span>
           </span>
+
           <el-input v-model="form[item.Path]" v-else-if="item.InputMode == 'A1'||item.InputMode == 'A2'" type="number">
           <el-input v-model="form[item.Path]" v-else-if="item.InputMode == 'A1'||item.InputMode == 'A2'" type="number">
             <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
             <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
           </el-input>
           </el-input>
+
           <el-select v-model="form[item.Path]" placeholder="请选择" v-else-if="item.InputMode == 'D1'">
           <el-select v-model="form[item.Path]" placeholder="请选择" v-else-if="item.InputMode == 'D1'">
             <el-option v-for="op in item.options" :key="op.Code" :label="op.Name" :value="op.Code"></el-option>
             <el-option v-for="op in item.options" :key="op.Code" :label="op.Name" :value="op.Code"></el-option>
           </el-select>
           </el-select>
-          <el-input v-model="form[item.Path]"
-                    v-else-if="item.InputMode == 'L'||item.InputMode == 'L1'||item.InputMode == 'L2'||item.InputMode == 'M'">
+
+          <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]">
             <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
             <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
           </el-input>
           </el-input>
+
           <el-input v-model="form[item.Path]" v-else disabled title="暂不支持"></el-input>
           <el-input v-model="form[item.Path]" v-else disabled title="暂不支持"></el-input>
           <!--          <div>{{item.InfoPointCode}}</div>-->
           <!--          <div>{{item.InfoPointCode}}</div>-->
         </el-form-item>
         </el-form-item>
@@ -141,8 +135,16 @@
         };
         };
         getDataDictionary(params, res => {
         getDataDictionary(params, res => {
           let arr = res.Content.map(item => {
           let arr = res.Content.map(item => {
-            if (item.InputMode === 'D1') {
+            if ((item.InputMode === 'D1' || item.InputMode === 'D2' || item.InputMode === 'E2' || item.InputMode === 'D1L') && item.DataSource) {
               item.options = JSON.parse(item.DataSource)
               item.options = JSON.parse(item.DataSource)
+              if (item.options[0] && item.options[0].Content) {
+                item.props = {
+                  value: 'Code',
+                  label: 'Name',
+                  children: 'Content',
+                  checkStrictly: true
+                }
+              }
             }
             }
             switch (item.InfoPointCode) { //过滤掉待删除的
             switch (item.InfoPointCode) { //过滤掉待删除的
               case 'FloorIdentity':
               case 'FloorIdentity':

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

@@ -19,18 +19,10 @@
             </div>
             </div>
             <div class="content-point">
             <div class="content-point">
               <div class="content-point-left">
               <div class="content-point-left">
-                <!-- <el-scrollbar style="height:100%;"> -->
-                  <!-- <div> -->
-                    <exhibitionBaseInformation :exhibitionBaseInformation="exhibitionBaseInformation"/>
-                  <!-- </div> -->
-                <!-- </el-scrollbar> -->
+                <exhibitionBaseInformation :exhibitionBaseInformation="exhibitionBaseInformation"/>
               </div>
               </div>
               <div class="content-point-right">
               <div class="content-point-right">
-                <!-- <el-scrollbar style="height:100%;"> -->
-                  <!-- <div> -->
-                    <exhibitionEnergy :exhibitionEnergy="exhibitionEnergy"/>
-                  <!-- </div> -->
-                <!-- </el-scrollbar> -->
+                <exhibitionEnergy :exhibitionEnergy="exhibitionEnergy"/>
               </div>
               </div>
             </div>
             </div>
           </div>
           </div>
@@ -39,13 +31,9 @@
               <exhibitionMaintain :exhibitionMaintain="exhibitionMaintain"/>
               <exhibitionMaintain :exhibitionMaintain="exhibitionMaintain"/>
             </div>
             </div>
             <div class="content-media">
             <div class="content-media">
-              <!-- <el-scrollbar style="height:100%;"> -->
-                <!-- <div> -->
-                  <exhibitionImage :exhibitionImage="exhibitionImage" v-show="isShowImage"/>
-                  <exhibitionVideo :exhibitionVideo="exhibitionVideo" v-show="isShowVideo"/>
-                  <exhibitionFile :exhibitionFile="exhibitionFile" v-show="isShowFile"/>
-                <!-- </div> -->
-              <!-- </el-scrollbar> -->
+              <exhibitionImage :exhibitionImage="exhibitionImage" v-show="isShowImage"/>
+              <exhibitionVideo :exhibitionVideo="exhibitionVideo" v-show="isShowVideo"/>
+              <exhibitionFile :exhibitionFile="exhibitionFile" v-show="isShowFile"/>
             </div>
             </div>
           </div>
           </div>
         </div>
         </div>
@@ -576,7 +564,6 @@
           .content-keyPoint {
           .content-keyPoint {
             border: 1px solid #ccc;
             border: 1px solid #ccc;
             box-sizing: border-box;
             box-sizing: border-box;
-            // height: 100px;
             margin-bottom: 10px;
             margin-bottom: 10px;
             overflow: hidden;
             overflow: hidden;
             background: @bgc;
             background: @bgc;
@@ -591,7 +578,6 @@
           .content-point {
           .content-point {
             display: flex;
             display: flex;
             flex-direction: row;
             flex-direction: row;
-            // height: calc(100% - 160px);
             border: 1px solid #ccc;
             border: 1px solid #ccc;
             box-sizing: border-box;
             box-sizing: border-box;
             background: @bgc;
             background: @bgc;
@@ -619,9 +605,6 @@
             box-sizing: border-box;
             box-sizing: border-box;
           }
           }
           .content-media {
           .content-media {
-            // height: calc(100% - 60px);
-            // background: @bgc;
-            // border: 1px solid #ccc;
             box-sizing: border-box;
             box-sizing: border-box;
           }
           }
         }
         }
@@ -632,12 +615,10 @@
       position: fixed;
       position: fixed;
       bottom: 0;
       bottom: 0;
       left: 235px;
       left: 235px;
-      // margin-top: 5px;
       width: calc(100% - 235px);
       width: calc(100% - 235px);
       height: 45px;
       height: 45px;
       background-color: #fff;
       background-color: #fff;
       box-sizing: border-box;
       box-sizing: border-box;
-      // border: 1px solid #ccc;
     }
     }
   }
   }
 
 

+ 4 - 19
src/views/ledger/property/details/index.vue

@@ -19,23 +19,15 @@
             </div>
             </div>
             <div class="content-point">
             <div class="content-point">
               <div class="content-point-left">
               <div class="content-point-left">
-                <!-- <el-scrollbar style="height:100%;"> -->
-                  <!-- <div> -->
-                    <exhibitionBaseInformation :exhibitionBaseInformation="exhibitionBaseInformation"/>
-                  <!-- </div> -->
-                <!-- </el-scrollbar> -->
+                <exhibitionBaseInformation :exhibitionBaseInformation="exhibitionBaseInformation"/>
               </div>
               </div>
             </div>
             </div>
           </div>
           </div>
           <div class="content-right">
           <div class="content-right">
             <div class="content-media">
             <div class="content-media">
-              <!-- <el-scrollbar style="height:100%;"> -->
-                <!-- <div> -->
-                  <exhibitionImage :exhibitionImage="exhibitionImage" v-show="isShowImage"/>
-                  <exhibitionVideo :exhibitionVideo="exhibitionVideo" v-show="isShowVideo"/>
-                  <exhibitionFile :exhibitionFile="exhibitionFile" v-show="isShowFile"/>
-                <!-- </div> -->
-              <!-- </el-scrollbar> -->
+              <exhibitionImage :exhibitionImage="exhibitionImage" v-show="isShowImage"/>
+              <exhibitionVideo :exhibitionVideo="exhibitionVideo" v-show="isShowVideo"/>
+              <exhibitionFile :exhibitionFile="exhibitionFile" v-show="isShowFile"/>
             </div>
             </div>
           </div>
           </div>
         </div>
         </div>
@@ -502,7 +494,6 @@
           .content-keyPoint {
           .content-keyPoint {
             border: 1px solid #ccc;
             border: 1px solid #ccc;
             box-sizing: border-box;
             box-sizing: border-box;
-            // height: 100px;
             margin-bottom: 10px;
             margin-bottom: 10px;
             overflow: hidden;
             overflow: hidden;
             background: @bgc;
             background: @bgc;
@@ -517,7 +508,6 @@
           .content-point {
           .content-point {
             display: flex;
             display: flex;
             flex-direction: row;
             flex-direction: row;
-            // height: calc(100% - 160px);
             border: 1px solid #ccc;
             border: 1px solid #ccc;
             box-sizing: border-box;
             box-sizing: border-box;
             background: @bgc;
             background: @bgc;
@@ -531,9 +521,6 @@
           margin-left: 10px;
           margin-left: 10px;
           box-sizing: border-box;
           box-sizing: border-box;
           .content-media {
           .content-media {
-            // height: 100%;
-            // background: @bgc;
-            // border: 1px solid #ccc;
             box-sizing: border-box;
             box-sizing: border-box;
           }
           }
         }
         }
@@ -544,12 +531,10 @@
       position: fixed;
       position: fixed;
       bottom: 0;
       bottom: 0;
       left: 235px;
       left: 235px;
-      // margin-top: 5px;
       width: calc(100% - 235px);
       width: calc(100% - 235px);
       height: 45px;
       height: 45px;
       background-color: #fff;
       background-color: #fff;
       box-sizing: border-box;
       box-sizing: border-box;
-      // border: 1px solid #ccc;
     }
     }
   }
   }
 
 

+ 5 - 20
src/views/ledger/spacelist/spaceDetail/index.vue

@@ -30,18 +30,10 @@
               </div>
               </div>
               <div class="content-point">
               <div class="content-point">
                 <div class="content-point-left">
                 <div class="content-point-left">
-                  <!-- <el-scrollbar style="height:100%;"> -->
-                    <!-- <div > -->
-                      <exhibitionBaseInformation :exhibitionBaseInformation="exhibitionBaseInformation"/>
-                    <!-- </div> -->
-                  <!-- </el-scrollbar> -->
+                  <exhibitionBaseInformation :exhibitionBaseInformation="exhibitionBaseInformation"/>
                 </div>
                 </div>
                 <div class="content-point-right">
                 <div class="content-point-right">
-                  <!-- <el-scrollbar style="height:100%;"> -->
-                    <!-- <div> -->
-                      <exhibitionEnergy :exhibitionEnergy="exhibitionEnergy" />
-                    <!-- </div> -->
-                  <!-- </el-scrollbar> -->
+                  <exhibitionEnergy :exhibitionEnergy="exhibitionEnergy" />
                 </div>
                 </div>
               </div>
               </div>
             </div>
             </div>
@@ -50,13 +42,9 @@
                 <exhibitionMaintain :exhibitionMaintain="exhibitionMaintain"/>
                 <exhibitionMaintain :exhibitionMaintain="exhibitionMaintain"/>
               </div>
               </div>
               <div class="content-media">
               <div class="content-media">
-                <!-- <el-scrollbar style="height:100%;"> -->
-                  <!-- <div > -->
-                    <exhibitionImage :exhibitionImage="exhibitionImage" v-show="isShowImage"/>
-                    <exhibitionVideo :exhibitionVideo="exhibitionVideo" v-show="isShowVideo"/>
-                    <exhibitionFile :exhibitionFile="exhibitionFile" v-show="isShowFile"/>
-                  <!-- </div> -->
-                <!-- </el-scrollbar> -->
+                <exhibitionImage :exhibitionImage="exhibitionImage" v-show="isShowImage"/>
+                <exhibitionVideo :exhibitionVideo="exhibitionVideo" v-show="isShowVideo"/>
+                <exhibitionFile :exhibitionFile="exhibitionFile" v-show="isShowFile"/>
               </div>
               </div>
             </div>
             </div>
           </div>
           </div>
@@ -591,7 +579,6 @@
           .content-point {
           .content-point {
             display: flex;
             display: flex;
             flex-direction: row;
             flex-direction: row;
-            // height: calc(100% - 50px);
             border: 1px solid #ccc;
             border: 1px solid #ccc;
             box-sizing: border-box;
             box-sizing: border-box;
             background: @bgc;
             background: @bgc;
@@ -617,8 +604,6 @@
             box-sizing: border-box;
             box-sizing: border-box;
           }
           }
           .content-media {
           .content-media {
-            // height: calc(100% - 60px);
-            // border: 1px solid #ccc;
             box-sizing: border-box;
             box-sizing: border-box;
           }
           }
         }
         }

+ 4 - 15
src/views/ledger/system/systemDetail/index.vue

@@ -29,11 +29,7 @@
               </div>
               </div>
               <div class="content-point">
               <div class="content-point">
                 <div class="content-point-left">
                 <div class="content-point-left">
-                  <!-- <el-scrollbar style="height:100%;"> -->
-                    <!-- <div> -->
-                      <exhibitionBaseInformation :exhibitionBaseInformation="exhibitionBaseInformation"/>
-                    <!-- </div> -->
-                  <!-- </el-scrollbar> -->
+                  <exhibitionBaseInformation :exhibitionBaseInformation="exhibitionBaseInformation"/>
                 </div>
                 </div>
               </div>
               </div>
             </div>
             </div>
@@ -42,13 +38,9 @@
                 <exhibitionMaintain :exhibitionMaintain="exhibitionMaintain"/>
                 <exhibitionMaintain :exhibitionMaintain="exhibitionMaintain"/>
               </div>
               </div>
               <div class="content-media">
               <div class="content-media">
-                <!-- <el-scrollbar style="height:100%;"> -->
-                  <!-- <div> -->
-                    <exhibitionImage :exhibitionImage="exhibitionImage" v-show="isShowImage"/>
-                    <exhibitionVideo :exhibitionVideo="exhibitionVideo" v-show="isShowVideo"/>
-                    <exhibitionFile :exhibitionFile="exhibitionFile" v-show="isShowFile"/>
-                  <!-- </div> -->
-                <!-- </el-scrollbar> -->
+                <exhibitionImage :exhibitionImage="exhibitionImage" v-show="isShowImage"/>
+                <exhibitionVideo :exhibitionVideo="exhibitionVideo" v-show="isShowVideo"/>
+                <exhibitionFile :exhibitionFile="exhibitionFile" v-show="isShowFile"/>
               </div>
               </div>
             </div>
             </div>
           </div>
           </div>
@@ -558,7 +550,6 @@
           .content-point {
           .content-point {
             display: flex;
             display: flex;
             flex-direction: row;
             flex-direction: row;
-            // height: calc(100% - 50px);
             border: 1px solid #ccc;
             border: 1px solid #ccc;
             box-sizing: border-box;
             box-sizing: border-box;
             background: @bgc;
             background: @bgc;
@@ -580,8 +571,6 @@
             box-sizing: border-box;
             box-sizing: border-box;
           }
           }
           .content-media {
           .content-media {
-            // height: calc(100% - 60px);
-            // border: 1px solid #ccc;
             box-sizing: border-box;
             box-sizing: border-box;
           }
           }
         }
         }

+ 1 - 1
src/views/ready/buildfloor/index.vue

@@ -233,7 +233,7 @@
           let list = res.Content.filter(i => (i.FirstName !== '工作历') && (i.FirstName !== '能耗信息') && (i.FirstName !== '人员信息'))
           let list = res.Content.filter(i => (i.FirstName !== '工作历') && (i.FirstName !== '能耗信息') && (i.FirstName !== '人员信息'))
           list.map(item => {
           list.map(item => {
             // console.log(item.FirstName)
             // console.log(item.FirstName)
-            if ((item.InputMode === 'D1' || item.InputMode === 'D2' || item.InputMode === 'E2' || item.InputMode === 'D1L') && item.DataSource != undefined) {
+            if ((item.InputMode === 'D1' || item.InputMode === 'D2' || item.InputMode === 'E2' || item.InputMode === 'D1L') && item.DataSource) {
               item.options = JSON.parse(item.DataSource)
               item.options = JSON.parse(item.DataSource)
               if (item.options[0] && item.options[0].Content) {
               if (item.options[0] && item.options[0].Content) {
                 item.props = {
                 item.props = {