Browse Source

点位配置 样式修改

haojianlong 5 years ago
parent
commit
68f1065617

+ 1 - 1
src/components/config_point/dictionaryCascader.vue

@@ -77,7 +77,7 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-.cascader-container {
+.cascader-container.el-form-item--small.el-form-item {
   margin-bottom: 0;
   /deep/ .el-cascader {
     width: 89%;

+ 12 - 6
src/components/config_point/step3_edit/index.vue

@@ -4,27 +4,27 @@
       <ul>
         <li>
           <span>原始点位信息</span>&nbsp;&nbsp;&nbsp;
-          <span>{{editData.Point.Description || '--'}}</span>
+          <span :title="editData.Point.Description || '--'">{{editData.Point.Description || '--'}}</span>
         </li>
         <li>
           <span>位置标签</span>&nbsp;&nbsp;&nbsp;
-          <span>{{editData.Point.LocationFlag.toString() || '--'}}</span>
+          <span :title="editData.Point.LocationFlag.toString() || '--'">{{editData.Point.LocationFlag.toString() || '--'}}</span>
         </li>
         <li>
           <span>对象类型</span>&nbsp;&nbsp;&nbsp;
-          <span>{{editData.Point.KeyEquipmentType || '--'}}</span>
+          <span :title="editData.Point.KeyEquipmentType || '--'">{{editData.Point.KeyEquipmentType || '--'}}</span>
         </li>
         <li>
           <span>对象参数</span>&nbsp;&nbsp;&nbsp;
-          <span>{{editData.Point.KeyEquipmentParameter || '--'}}</span>
+          <span :title="editData.Point.KeyEquipmentParameter || '--'">{{editData.Point.KeyEquipmentParameter || '--'}}</span>
         </li>
         <li>
           <span>值/单位说明</span>&nbsp;&nbsp;&nbsp;
-          <span>{{editData.Point.ValueDescription || '--'}}</span>
+          <span :title="editData.Point.ValueDescription || '--'">{{editData.Point.ValueDescription || '--'}}</span>
         </li>
         <li>
           <span>备注</span>&nbsp;&nbsp;&nbsp;
-          <span>{{editData.Point.Remarks || '--'}}</span>
+          <span :title="editData.Point.Remarks || '--'">{{editData.Point.Remarks || '--'}}</span>
         </li>
       </ul>
     </div>
@@ -623,6 +623,12 @@ export default {
         text-align: right;
         width: 120px;
       }
+      span:nth-of-type(2) {
+        width: calc(100% - 120px);
+        overflow: hidden;
+        text-overflow:ellipsis;
+        white-space: nowrap;
+      }
     }
   }
   .right {

+ 4 - 4
src/components/config_point/step3_point/3_temps.vue

@@ -21,7 +21,7 @@
           <p class="content-view p10">{{delDataSource(unitObj.DataSource)}}</p>
         </div>
       </div>
-      <div class="center">
+      <div class="center" style="margin-top:20px;">
         <el-button @click="next">下一步</el-button>
       </div>
     </div>
@@ -49,7 +49,7 @@
         <formula-handle :devFlag="false" ref='formulaHandle' v-else-if='form2.DataRuleType == "需按公式转换"'></formula-handle>
         <!-- <split-handle :devFlag="false" ref='splitHandle' v-else-if='form2.DataRuleType == "需按拆分枚举转换"'></split-handle> -->
       </el-form>
-      <div class="center">
+      <div class="center" style="margin-top:20px;">
         <el-button @click="undo">上一步</el-button>
         <el-button @click="next">下一步</el-button>
       </div>
@@ -64,7 +64,7 @@
       <div v-if="pages.total>pages.size" class="right">
         <pagination :page="pages" @change="changePage"></pagination>
       </div>
-      <div class="center">
+      <div class="center" style="margin-top:20px;">
         <el-button @click="undo">上一步</el-button>
         <el-button v-show="renderData.length" @click="save">保存</el-button>
       </div>
@@ -701,7 +701,7 @@ export default {
     }
   }
   .collapse-item {
-    height: 290px;
+    height: 328px;
     overflow-y: auto;
   }
 }