浏览代码

Merge branch 'master' of git.sagacloud.cn:web/ibms

zhangyu 5 年之前
父节点
当前提交
2c4daaf055

+ 2 - 1
src/assets/style/style.scss

@@ -30,7 +30,7 @@
     height: 53px;
     height: 53px;
     border: 1px solid #dfe6ec;
     border: 1px solid #dfe6ec;
     background-color: #fff;
     background-color: #fff;
-    padding: 10px 10px;
+    padding: 10px 10px 10px 20px;
     box-sizing: border-box;
     box-sizing: border-box;
     margin-bottom: 10px;
     margin-bottom: 10px;
     /deep/ .el-input__inner{
     /deep/ .el-input__inner{
@@ -40,6 +40,7 @@
 
 
 .p12 {
 .p12 {
     padding-right: 12px;
     padding-right: 12px;
+    color: #999;
 }
 }
 
 
 iframe {
 iframe {

+ 1 - 6
src/components/data_admin/buildData/style.scss

@@ -34,15 +34,10 @@ h3 {
 }
 }
 
 
 .build_header {
 .build_header {
-    // min-width: 800px;
-    width: 100%;
-    // line-height: 45px;
     height: 53px;
     height: 53px;
-    width: 100%;
     border: 1px solid #dfe6ec;
     border: 1px solid #dfe6ec;
-    box-sizing: border-box;
     background-color: $bg2;
     background-color: $bg2;
-    padding: 10px;
+    padding: 10px 10px 10px 20px;
     box-sizing: border-box;
     box-sizing: border-box;
     margin-bottom: 10px;
     margin-bottom: 10px;
 }
 }

+ 1 - 0
src/components/data_admin/selectTime.vue

@@ -111,6 +111,7 @@ export default {
   font-size: 0.8rem;
   font-size: 0.8rem;
   display: inline-block;
   display: inline-block;
   margin-left: 2rem;
   margin-left: 2rem;
+  color: #999;
   span {
   span {
     cursor: pointer;
     cursor: pointer;
     position: relative;
     position: relative;

+ 7 - 7
src/utils/point_edit/steps3.js

@@ -13,6 +13,13 @@ export default [{
         FirstTag: ""
         FirstTag: ""
     },
     },
     {
     {
+        InfoPointName: "备注",
+        InfoPointCode: "Remarks",
+        InputMode: "B1",
+        Visible: true,
+        FirstTag: ""
+    },
+    {
         InfoPointName: "对象类型关键字",
         InfoPointName: "对象类型关键字",
         InfoPointCode: "KeyEquipmentType",
         InfoPointCode: "KeyEquipmentType",
         InputMode: "B1",
         InputMode: "B1",
@@ -48,13 +55,6 @@ export default [{
         FirstTag: ""
         FirstTag: ""
     },
     },
     {
     {
-        InfoPointName: "备注",
-        InfoPointCode: "Remarks",
-        InputMode: "B1",
-        Visible: true,
-        FirstTag: ""
-    },
-    {
         InfoPointName: "操作",
         InfoPointName: "操作",
         InfoPointCode: "edit",
         InfoPointCode: "edit",
         InputMode: "Own",
         InputMode: "Own",

+ 12 - 14
src/views/data_admin/buildData/index.vue

@@ -4,20 +4,18 @@
 <template>
 <template>
     <div style="height:100%;">
     <div style="height:100%;">
         <div class="build_header" ref="header">
         <div class="build_header" ref="header">
-            <div class="inline_block">
-                <!-- 建筑选择 -->
-                <i style="padding-right:12px;color:#606266;">建筑名称</i>
-                <el-select v-model="buildId" style="margin-right:10px;" placeholder="请选择" @change="changeBuild">
-                    <el-option v-for="item in buildList" :key="item.BuildId" :label="item.BuildLocalName" :value="item.BuildId"></el-option>
-                </el-select>
-                <!-- 楼层选择 -->
-                <i style="padding-right:12px;color:#606266;">楼层</i>
-                <el-select v-model="floorId" placeholder="请选择" @change="changeFloor">
-                    <el-option v-for="item in floorList" :key="item.FloorId" :label="item.FloorLocalName" :value="item.FloorId"></el-option>
-                </el-select>
-                <!-- 选择时间插件 -->
-                <build-time :timeArr="timeArr" @checkTime="checkTime"></build-time>
-            </div>
+            <!-- 建筑选择 -->
+            <span style="padding-right:12px;color:#999;vertical-align: middle;">建筑名称</span>
+            <el-select v-model="buildId" style="margin-right:10px;" placeholder="请选择" @change="changeBuild">
+                <el-option v-for="item in buildList" :key="item.BuildId" :label="item.BuildLocalName" :value="item.BuildId"></el-option>
+            </el-select>
+            <!-- 楼层选择 -->
+            <!-- <span style="padding-right:12px;color:#999;">楼层</span>
+            <el-select v-model="floorId" placeholder="请选择" @change="changeFloor">
+                <el-option v-for="item in floorList" :key="item.FloorId" :label="item.FloorLocalName" :value="item.FloorId"></el-option>
+            </el-select> -->
+            <!-- 选择时间插件 -->
+            <!-- <build-time :timeArr="timeArr" @checkTime="checkTime"></build-time> -->
         </div>
         </div>
         <div class="left-main">
         <div class="left-main">
             <div id="buildData">
             <div id="buildData">