Browse Source

模型文件管理问题修改,需采集信息点检索问题修改

zhangyu 5 years ago
parent
commit
4e7b934826

+ 3 - 3
src/components/ledger/details/detail/exhibitionBaseInformation.vue

@@ -59,7 +59,7 @@
         <el-button slot="reference" type="text">{{value.Value ? '有' :'-'}}</el-button>
       </el-popover>
       <el-popover
-        v-else-if="value.Value && value.Value.length  && `${value.InfoPointName}:${value.Value}`.length>22 "
+        v-else-if="value.Value && value.Value.length  && `${value.InfoPointName}:${value.Value}`.length>21 "
         placement="right"
         width="160"
         trigger="hover">
@@ -98,7 +98,7 @@
       },
       handleName(infoPoint, val) {
         let text = `${infoPoint}:${val}`;
-        return text.length > 22 ? val.substring(0, 22-`${infoPoint}:`.length) + '...' : val;
+        return text.length > 21 ? val.substring(0, 21-`${infoPoint}:`.length) + '...' : val;
       }
     }
   }
@@ -129,7 +129,7 @@
     }
 
     .infoPoint-item {
-      width: 335px;
+      width: 315px;
       display: inline-block;
       margin-left: 20px;
       vertical-align: text-top;

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

@@ -57,7 +57,7 @@
           <el-button slot="reference" type="text">{{item.value ? '有' :'-'}}</el-button>
         </el-popover>
         <el-popover
-          v-else-if="item.value && item.value.length && `${item.InfoPointName}:${item.value}`.length>22"
+          v-else-if="item.value && item.value.length && `${item.InfoPointName}:${item.value}`.length>21"
           placement="top"
           width="160"
           trigger="hover">
@@ -116,7 +116,7 @@
       },
       handleName(infoPoint, val) {
         let text = `${infoPoint}:${val}`;
-        return text.length > 22 ? val.substring(0, 22-`${infoPoint}:`.length) + '...' : val;
+        return text.length > 21 ? val.substring(0, 21-`${infoPoint}:`.length) + '...' : val;
       }
     }
   }
@@ -144,7 +144,7 @@
     }
       .crux-list {
         display: inline-block;
-        width: 335px;
+        width: 315px;
         margin-left: 20px;
         vertical-align: text-top;
       }

+ 2 - 1
src/components/model/file/floorTable.vue

@@ -167,7 +167,8 @@ export default {
 .box-card {
   height: 100%;
   .filterTable-container {
-    height: calc(100% - 80px);
+    height: calc(100% - 54px);
+    margin-bottom: 8px;
   }
   .operate {
     .iconfont {

+ 9 - 6
src/components/model/file/replaceModelDialog.vue

@@ -6,10 +6,10 @@
     <el-dialog
       title="替换模型"
       :visible.sync="repliceModelVisible"
-      width="30%"
+      width="650px"
       :before-close="handleClose"
     >
-      <el-form ref="form" :model="form" label-width="100px">
+      <el-form ref="form" :model="form" label-width="170px">
         <el-form-item label="模型文件:">
           <el-upload
             class="upload-demo"
@@ -41,11 +41,11 @@
             <el-date-picker v-model="form.finishTime" type="date" placeholder="选择日期"></el-date-picker>
           </div>
         </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="onSubmit">确认</el-button>
-          <el-button @click="handleClose">取消</el-button>
-        </el-form-item>
       </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="onSubmit">确认</el-button>
+        <el-button @click="handleClose">取消</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -121,5 +121,8 @@ export default {
     display: flex;
     justify-content: left;
   }
+  .dialog-footer {
+    text-align: right;
+  }
 }
 </style>

+ 1 - 1
src/views/ledger/facility/details/index.vue

@@ -564,7 +564,7 @@
             border: 1px solid #ccc;
             box-sizing: border-box;
             margin-bottom: 10px;
-            overflow: hidden;
+            // overflow: hidden;
             background: @bgc;
           }
           .content-showType {

+ 1 - 1
src/views/ledger/property/details/index.vue

@@ -493,7 +493,7 @@
             border: 1px solid #ccc;
             box-sizing: border-box;
             margin-bottom: 10px;
-            overflow: hidden;
+            // overflow: hidden;
             background: @bgc;
           }
           .content-showType {

+ 8 - 18
src/views/model/file/index.vue

@@ -7,15 +7,13 @@
           <div class="top_hand left_top_hand">
             <div class="folder-box">
               <el-tooltip class="item" effect="dark" content="新建文件夹" placement="top-start">
-                <el-button icon="el-icon-folder-add" @click="addFolder" class="icon_font"></el-button>
+                <el-button icon="el-icon-plus" size="small" @click="addFolder"></el-button>
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="删除文件夹" placement="top-start">
-                <el-button icon="el-icon-folder-remove" class="icon_font" @click="removeFolder"></el-button>
+                <el-button icon="el-icon-minus" size="small" @click="removeFolder"></el-button>
               </el-tooltip>
-            </div>
-            <div class="file-box">
               <el-tooltip class="item" effect="dark" content="编辑文件夹" placement="top-start">
-                <el-button @click="editFolder" icon="el-icon-edit" class="icon_font"></el-button>
+                <el-button @click="editFolder" icon="el-icon-edit-outline" size="small"></el-button>
               </el-tooltip>
             </div>
           </div>
@@ -41,8 +39,8 @@
       <el-card class="box-card" :body-style="{ padding: '0px', height:'100%' }">
         <!-- 顶部操作栏 -->
         <div class="top_hand right_top_hand">
-          <el-button @click="addFloorFile">添加楼层文件</el-button>
-          <el-button @click="queryFloorFile(currentFolderId)">刷新</el-button>
+          <el-button size="small" @click="addFloorFile">添加楼层文件</el-button>
+          <el-button size="small" @click="queryFloorFile(currentFolderId)">刷新</el-button>
         </div>
         <!-- 列表 -->
         <floorTable v-loading="tableLoading" ref="floorTable" :tableData="tableData" :modelFolderName="currentFolderName" @openModelLog="queryModelLog"
@@ -102,11 +100,7 @@ export default {
       modelLogVisible: false, //是否显示模型日志弹窗
       changeFolderNameVisible: false, //是否显示编辑文件夹弹窗
       folderName: "", //新建文件夹名称
-      navigationModel: [
-        {
-          Name: ""
-        }
-      ], //文件夹模型list
+      navigationModel: [], //文件夹模型list
       choiceIndex: 0, //当前文件夹index
       currentFolderId: "", //当前选择的文件夹id
       currentFolderName: "", //当前选择文件夹的Name
@@ -191,6 +185,7 @@ export default {
     },
     // 查询所有文件夹模型
     queryModel() {
+      this.navigationModel = [];
       this.loading = true;
       request.queryModel("", res => {
         this.navigationModel = res.Content;
@@ -379,7 +374,7 @@ export default {
   }
   // 顶部
   .top_hand {
-    height: 60px;
+    // height: 60px;
     width: 100%;
     padding: 10px;
     box-sizing: border-box;
@@ -388,11 +383,6 @@ export default {
   .left_top_hand {
     align-items: center;
     justify-content: space-between;
-    .folder-box {
-      display: flex;
-      height: 40px;
-      flex-direction: row;
-    }
     .box-icon {
       width: 40px;
       height: 40px;

+ 9 - 18
src/views/ready/collectsetting/index.vue

@@ -22,7 +22,7 @@
         <div class="family_all">
           <div class="family" v-for="(letter,index) in letterArr" :key="index">
             <div class="family_title" :id="letter">{{letter}}</div>
-            <div class="family_content" v-if="searchVal == ''">
+            <div class="family_content" v-if="!searchArr.length">
               <ul class="family_list">
                 <li class="family_item" @click="familyActive(family.name,family.code)"
                     :class="active == family.name ? 'active' : ''" v-for="(family,index) in allFamily" :key="index"
@@ -50,18 +50,6 @@
         </div>
       </div>
       <div class="right_main" v-loading="rightLoading">
-        <!--                <el-tabs v-if="labelKey.length && tabsFalg" tab-position="right" style="height: 100%;">-->
-        <!--                    <el-tab-pane v-for="(item,index) in labelKey" :key="index">-->
-        <!--                        <span slot="label">{{item.FirstName || '信息'}}</span>-->
-        <!--                        <div class="label_main" v-for="(tag,tagIndex) in item.details" :key="tagIndex">-->
-        <!--                            <p>{{tag.SecondName}}</p>-->
-        <!--                            <ul v-for="(detail,detailInd) in tag.details" :key="detailInd">-->
-        <!--                                <el-checkbox :title="detail.InfoPointName" :disabled="!detail.UnDisabled" v-model="detail.Visible" @change="boxChange(detail)">{{detail.InfoPointName}}</el-checkbox>-->
-        <!--                            </ul>-->
-        <!--                        </div>-->
-        <!--                    </el-tab-pane>-->
-        <!--                </el-tabs>  -->
-
         <!--锚点-->
         <div v-if="labelKey.length && tabsFalg">
           <el-tabs
@@ -587,9 +575,10 @@
       },
       //获取所有设备族
       getAllFamily() {
-        this.labelKey = []
-        this.active = ""
-        this.searchVal = ""
+        this.labelKey = [];
+        this.active = "";
+        this.searchVal = "";
+        this.allFamily =[];
         if (this.value == "property") {
           queryFamilyAll(res => {
             this.allFamily = res.Content.map((item) => {
@@ -660,10 +649,11 @@
       },
       //修改search
       changeVal(val) {
+        this.searchArr = [];
+        this.letterArr = [];
         let newArr = [],
           arr = [],
           obj = {};
-        this.searchVal = val;
         const self = this;
         for (let i = 0; i < this.allFamily.length; i++) {
           if (this.allFamily[i].name.indexOf(val) >= 0 || this.allFamily[i].code.indexOf(val) >= 0) {
@@ -685,7 +675,7 @@
           this.getAllFamily();
         } else {
           this.searchArr = newArr;
-          this.letterArr = arr;
+          this.letterArr = arr.sort();
         }
       },
       //高亮行
@@ -800,6 +790,7 @@
       },
       //排序方法
       familySort() {
+        this.letterArr = [];
         let obj = {};
         let arr = [];
         const self = this;