Browse Source

修改样式问题

chuwu 5 years ago
parent
commit
a81656c955

+ 19 - 0
src/assets/style/style.scss

@@ -35,4 +35,23 @@
 
 iframe {
     border: none;
+}
+
+.el-button--success.is-plain,
+.el-button--primary.is-plain,
+.el-button--info.is-plain,
+.el-button--warning.is-plain,
+.el-button--danger.is-plain {
+    background-color: #fff;
+}
+
+.el-dropdown-link {
+    cursor: pointer;
+    color: #409eff;
+}
+
+.middle_sty {
+    display: flex;
+    justify-content: center;
+    align-items: center;
 }

+ 15 - 14
src/components/business_space/dialogs/detailsDialog.vue

@@ -2,19 +2,6 @@
     <el-dialog :visible.sync="isShow.details" :width="width">
         <span slot="title">
           <span v-show="step == 1">{{title}}</span>
-        <span v-show="step == 1" style="float:right;margin-right:40px;">
-            <el-button class="saga-padding0" @click="step = 3" type="text">编辑信息</el-button>
-            <!-- <el-button class="saga-padding0" @click="addMyEquip" type="text">添加设备</el-button> -->
-            <el-dropdown @command="addMyEquip" trigger="click">
-              <span class="el-dropdown-link" style="color: #409EFF">添加设备</span>
-        <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="EquipinSpace">空间内的设备</el-dropdown-item>
-            <el-dropdown-item command="EquipforSpace">服务于空间的设备</el-dropdown-item>
-            <el-dropdown-item command="EquipXSpace">其他关系的设备</el-dropdown-item>
-        </el-dropdown-menu>
-        </el-dropdown>
-        <el-button class="saga-padding0" @click="delSpace" type="text">删除该业务空间</el-button>
-        </span>
         <span v-show="step == 2 || step == 3">
             <el-button type="text" @click="goBack" icon="el-icon-arrow-left"></el-button>
           </span>
@@ -40,6 +27,20 @@
         <div id="detailsDialog" v-if="step == 3">
             <iframe v-if="step == 3" height="400px" width="100%" :src="iframeSrc2"></iframe>
         </div>
+        <div v-show="step == 1" style="line-height: 50px;">
+            <el-button>编辑信息</el-button>
+            <el-button type="danger" plain>删除该业务空间</el-button>
+            <el-dropdown style="margin-left: 10px;" :hide-on-click="false" @command="addMyEquip">
+                <span class="el-dropdown-link">
+                    添加设备<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item command="EquipinSpace">空间内的设备</el-dropdown-item>
+                    <el-dropdown-item command="EquipforSpace">服务于空间的设备</el-dropdown-item>
+                    <el-dropdown-item command="EquipXSpace">其他关系的设备</el-dropdown-item>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
     </el-dialog>
 </template>
 
@@ -68,7 +69,7 @@
         props: {
             width: {
                 type: String,
-                default: "900px"
+                default: "1200px"
             },
             title: {
                 type: String,

+ 15 - 3
src/components/business_space/dialogs/facilityDialog.vue

@@ -5,7 +5,7 @@
       <!-- <span v-show="step == 1" @click="addMyEquip" style="float: right; margin-right: 40px;">
         <el-button class="saga-padding0" type="text">添加设备</el-button>
       </span>-->
-      <span v-show="step == 1" style="float: right; margin-right: 40px;">
+      <!-- <span  style="float: right; margin-right: 40px;">
         <el-dropdown @command="addMyEquip" trigger="click">
           <span class="el-dropdown-link" style="color: #409EFF">添加设备</span>
           <el-dropdown-menu slot="dropdown">
@@ -14,7 +14,7 @@
             <el-dropdown-item command="EquipXSpace">其他关系的设备</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-      </span>
+      </span> -->
       <span v-show="step == 2">
         <el-button class="saga-padding0" @click="goBack" type="text" icon="el-icon-arrow-left"></el-button>
       </span>
@@ -23,6 +23,18 @@
       <p class="influence-p">{{data.infos.RoomLocalName || data.infos.RoomName || '--'}}</p>
       <equip-table :activeTabType="activeTabType" ref="myEquip" :param="myDia"></equip-table>
     </div>
+    <div v-show="step == 1">
+        <el-dropdown style="margin-left: 10px;" :hide-on-click="false" @command="addMyEquip">
+            <span class="el-dropdown-link">
+                添加设备<i class="el-icon-arrow-down el-icon--right"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="EquipinSpace">空间内的设备</el-dropdown-item>
+                <el-dropdown-item command="EquipforSpace">服务于空间的设备</el-dropdown-item>
+                <el-dropdown-item command="EquipXSpace">其他关系的设备</el-dropdown-item>
+            </el-dropdown-menu>
+        </el-dropdown>
+    </div>
     <div v-show="step == 2">
       <add-equip ref="addEquip"></add-equip>
     </div>
@@ -51,7 +63,7 @@ export default {
   props: {
     width: {
       type: String,
-      default: "60%"
+      default: "1200px"
     },
     title: {
       type: String,

+ 18 - 18
src/components/business_space/graphy/business.vue

@@ -3,16 +3,16 @@
         <div v-show="hasMap" class="header-search">
             <!-- 初始两个按钮 -->
             <div v-show="type == 1">
-                <el-button size="small" @click=" type = 2" icon="el-icon-search">查找业务空间</el-button>
-                <el-button size="small" @click="myDialogVisible = true">创建业务空间</el-button>
-                <span style="font-size:13px;color:#fff;margin-left:40px;display:inline-block;">
+                <el-button @click=" type = 2" icon="el-icon-search">查找业务空间</el-button>
+                <el-button @click="myDialogVisible = true">创建业务空间</el-button>
+                <span style="font-size:13px;color:#606266;margin-left:40px;display:inline-block;">
               提示:
               <i style="color:red;">红色字体</i>的业务空间为不相邻元空间组成,请检查是否要修改
             </span>
             </div>
             <!-- 搜索下拉列表定位 -->
             <div v-show="type == 2">
-                <el-autocomplete popper-class="my-autocomplete" v-model="search" :fetch-suggestions="querySearch" placeholder="输入平面图中已有的业务空间名称进行查找" size="small" width="180px" @select="handleSelect">
+                <el-autocomplete popper-class="my-autocomplete" v-model="search" :fetch-suggestions="querySearch" placeholder="输入平面图中已有的业务空间名称进行查找" width="180px" @select="handleSelect">
                     <i class="el-icon-search el-input__icon" slot="suffix" @click="handleIconClick"></i>
                     <template slot-scope="{ item }">
                         <div class="name" style="position: relative;">
@@ -31,41 +31,41 @@
                 <div class="div50">
                 <el-button
                     class="float-right"
-                    size="small"
+                
                     @click="SpaceDialog"
                     type="primary"
                     plain
                 >从未关联元空间的业务空间中选择</el-button>
                 </div>
                 <div class="div50">
-                <el-button @click="clearDimension" size="small" plain>取 消</el-button>
-                <el-button size="small" @click="createSP" type="primary">创建新的业务空间</el-button>
+                <el-button @click="clearDimension" plain>取 消</el-button>
+                <el-button @click="createSP" type="primary">创建新的业务空间</el-button>
                 </div>
             </div>
         <!-- 点击业务空间显示 -->
         <div v-show="type == 4">
             <div class="div50">
-            <el-button class="float-right" size="small" @click="divide" type="primary" plain>重新划分业务空间</el-button>
+            <el-button class="float-right" @click="divide" type="primary" plain>重新划分业务空间</el-button>
             </div>
             <div class="div50">
-            <el-button @click="clearDimension" size="small" plain>取 消</el-button>
-            <el-button @click="bussinDea" size="small" type="primary">查看详情</el-button>
+            <el-button @click="clearDimension" plain>取 消</el-button>
+            <el-button @click="bussinDea" type="primary">查看详情</el-button>
             </div>
         </div>
         <!-- 点击业务空间后点击元空间 -->
         <div v-show="type == 5">
             <div class="div50">
-            <el-button @click="clearDimension" class="float-right" size="small" plain>取 消</el-button>
+            <el-button @click="clearDimension" class="float-right" plain>取 消</el-button>
             </div>
             <div class="div50">
-            <el-button size="small" @click="saveChange" type="primary">保存修改</el-button>
+            <el-button @click="saveChange" type="primary">保存修改</el-button>
             </div>
         </div>
         <el-button
             v-show="type == 1"
             @click="getPiss"
             style="position: absolute;top: 10px;right: 10px;"
-            size="small"
+        
             type="text"
         >未关联元空间的业务空间 {{num}} 条</el-button>
         </div>
@@ -78,11 +78,11 @@
         >
         <canvas :id="canvasId + 'canvas' " :width="canvasW" :height="canvasH"></canvas>
         <div
-            style="height: 30px;overflow: hidden;z-index:99;transform: translateX(-50%);position: absolute;bottom: 10%;left: 50%;"
+            style="height: 35px;overflow: hidden;z-index:99;transform: translateX(-50%);position: absolute;bottom: 10%;left: 50%;"
         >
-            <el-button size="small" @click="smallSize" type="primary">- 缩小</el-button>
-            <el-button size="small" @click="suitableSize" type="primary">合适比例</el-button>
-            <el-button size="small" @click="bigSize" type="primary">+ 放大</el-button>
+            <el-button @click="smallSize" type="primary">- 缩小</el-button>
+            <el-button @click="suitableSize" type="primary">合适比例</el-button>
+            <el-button @click="bigSize" type="primary">+ 放大</el-button>
         </div>
     </div>
     <div
@@ -99,7 +99,7 @@
         <el-input
           placeholder="请输入业务空间名"
           v-model="name"
-          size="small"
+        
           clearable>
         </el-input>
       </p>-->

+ 3 - 5
src/components/business_space/table/addEquip.vue

@@ -4,17 +4,15 @@
       <div>
         <el-input
           placeholder="输入设备名称或设备本地编码查询进行查询"
-          size="small"
           style="width:300px;float:left;margin-right:10px;"
           v-model="search.filter"
           clearable
         ></el-input>
-        <el-button @click="filterBox" plain size="small">查 找</el-button>
+        <el-button @click="filterBox" plain>查 找</el-button>
       </div>
       <div style="margin-top:10px;">
-        <span>所属楼层</span>
+        <span>所属楼层</span>
         <el-cascader
-          size="small"
           @change="filterBox"
           v-model="search.floor"
           :options="optionsWithDisabled"
@@ -77,7 +75,7 @@
       </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button type="info" plain @click="lockDetails(scope.row)">设备详情</el-button>
+          <el-button plain @click="lockDetails(scope.row)">设备详情</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 1 - 1
src/components/business_space/table/businessTable.vue

@@ -34,7 +34,7 @@
       </el-table-column>
       <el-table-column v-if="type == 'relevance'" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" @click="deleteSpace(scope.row)">关联平面图</el-button>
+          <el-button @click="deleteSpace(scope.row)">关联平面图</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 1 - 1
src/components/business_space/table/equipTable.vue

@@ -21,7 +21,7 @@
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">
-                            <el-button type="info" plain @click="lockDetails(scope.row)">详情</el-button>
+                            <el-button plain @click="lockDetails(scope.row)">详情</el-button>
                             <el-button v-if="scope.row.inSpace" plain type="danger" @click="deleteSpace(scope.row)">从空间移除</el-button>
                         </template>
                     </el-table-column>

+ 8 - 6
src/views/business_space/business_list/index.vue

@@ -35,9 +35,9 @@
                     <i class="iconfont icon-liebiao"></i>
                     <span>列表</span>
                 </div> -->
-                <el-radio-group v-model="isMyTab" @change="changeRadio">
-                    <el-radio-button label="1">CAD图</el-radio-button>
-                    <el-radio-button label="2">列表</el-radio-button>
+                <el-radio-group v-model="isMyTab" @change="changeRadio" style="width: 136px;">
+                    <el-radio-button label="1">平面图</el-radio-button>
+                    <el-radio-button label="2" class="space-own-radio" style="width: 68px;">列表</el-radio-button>
                 </el-radio-group>
             </div>
         </div>
@@ -416,13 +416,15 @@
         position: relative;
         display: flex;
         flex-direction: column;
+        .space-own-radio{
+            .el-radio-button__inner{
+                padding: 9px 21px;
+            }
+        }
         .el-dialog__body {
             max-height: 600px;
             overflow-y: auto;
         }
-        .el-tabs__nav-scroll {
-            padding-left: 10px;
-        }
         .saga-title {
             height: 54px;
             background-color: #fff;

+ 1 - 1
src/views/data_admin/buildGraphy/graphyCanvas.vue

@@ -16,7 +16,7 @@
     >标签与空间关联</el-button> -->
     <div
       v-if="type == 3"
-      style="height: 30px;z-index:999;overflow: hidden;transform: translateX(-50%);position: absolute;bottom: 10%;left: 50%;"
+      style="height: 40px;z-index:999;overflow: hidden;transform: translateX(-50%);position: absolute;bottom: 10%;left: 50%;"
     >
       <el-button size="small" @click="smallSize" type="primary">- 缩小</el-button>
       <el-button size="small" @click="suitableSize" type="primary">合适比例</el-button>

+ 4 - 5
src/views/data_admin/buildGraphy/graphyTabs.vue

@@ -17,7 +17,7 @@ getLocation 定位
                 </div>
                 <div v-if="!pointData.length" class="center">
                     <i class="iconwushuju iconfont"></i>
-                    {{pointParam.FloorId ? "数据为空" : "请选择楼层"}}
+                    {{pointParam.FloorId ? "数据为空" : "请选择楼层"}}
                 </div>
       </el-tab-pane>
       <el-tab-pane label="无法定位到楼层的点位标签" name="noPoint">
@@ -25,18 +25,17 @@ getLocation 定位
                 <div v-for="(item,index) in pointNoData" :key="index">
                     <div class="point">
                     <span>{{item.Name}}</span>
-                    <el-button size="mini" @click="getDetails(item)">编辑点位标签</el-button>
+                    <el-button @click="getDetails(item)">编辑点位标签</el-button>
                     <el-button
                         :disabled="!(item.X == 0 && item.Y == 0)"
-                        size="mini"
                         @click="btnClick(item)"
                     >{{ item.X == 0 && item.Y == 0 ? '插旗' : '定位'}}</el-button>
                 </div>
             </div>
             </div>
             <div v-if="!pointNoData.length" class="center">
-                <i v-if="pointParam.FloorId" class="iconwushuju iconfont"></i>
-                    {{pointParam.FloorId ? "数据为空" : "请选择楼层"}}
+                <i class="iconwushuju iconfont"></i>
+                {{pointParam.FloorId ? "数据为空" : "请选择楼层"}}
             </div>
         </el-tab-pane>
     </el-tabs>

+ 1 - 1
src/views/point/config_point/edit_origin/index.vue

@@ -8,7 +8,7 @@
         <div class="content-view">
             <el-form label-width="10px" style="width:400px;" :model="formData" class="dcenter">
                 <el-form-item label="">
-                    <el-input v-model="formData.Name" placeholder="请输入新项目名称"></el-input>
+                    <el-input v-model="formData.Name" placeholder="请输入数据源名称"></el-input>
                 </el-form-item>
             </el-form>
             <el-input type="textarea" class="edit-textarea dcenter block" v-model="formData.Description" placeholder="请维护数据源说明"></el-input>

+ 1 - 1
src/views/point/config_point/steps/step1.vue

@@ -9,7 +9,7 @@
             <el-checkbox style="float:right;line-height:40px;" @change="getData" v-model="checked">只显示使用的原始点位</el-checkbox>
             <el-button @click="clickPointVal">获取原始点位当前值</el-button>
         </div>
-        <div id="handsontableSteps1" v-loading="isLoading">
+        <div id="handsontableSteps1" class="middle_sty" v-loading="isLoading">
             <handsontable-component v-if="!!allData.length" @delete="delePoint" ref="handsontable" @mouseDown="clickTable" @change="changeHand"></handsontable-component>
             <div v-else class="center">
                 <i class="iconwushuju iconfont"></i>

+ 1 - 1
src/views/point/config_point/steps/step2.vue

@@ -10,7 +10,7 @@
                 <el-button @click="saveData">保存</el-button>
             </div>
         </div>
-        <div id="handsontableSteps1" v-loading="isLoading">
+        <div id="handsontableSteps1" class="middle_sty" v-loading="isLoading">
             <handsontable-component v-if="!!pages.total" @delete="delePoint" @mouseDown="clickTable" @change="changeHand" ref="handsontable"></handsontable-component>
             <div v-else class="center">
                 <i class="iconwushuju iconfont"></i> 暂无数据

+ 5 - 5
src/views/point/config_point/steps/step3.vue

@@ -5,11 +5,11 @@
             <el-button @click="dialogShow(2)">根据关键内容批量对应数据字典</el-button>
             <el-checkbox style="float:right;" @change="changeChecked" v-model="checked">只显示未标准化得的原始点位</el-checkbox>
         </div>
-        <div id="handsontableSteps1" v-loading="isLoading" v-if="pages.total">
-            <handsontable-component @mouseDown="clickEdit" ref="handsontable"></handsontable-component>
-        </div>
-        <div v-else class="center">
-            <i class="iconwushuju iconfont"></i> 暂无数据
+        <div id="handsontableSteps1" class="middle_sty" v-loading="isLoading">
+            <handsontable-component v-if="pages.total" @mouseDown="clickEdit" ref="handsontable"></handsontable-component>
+            <div v-else class="center">
+                <i class="iconwushuju iconfont"></i> 暂无数据
+            </div>
         </div>
         <div v-if="pages.total" class="right">
             <pagination :page="pages" @change="changePage"></pagination>

+ 1 - 1
src/views/project_setting/collection_setting/index.vue

@@ -43,7 +43,7 @@
                     </div>
                 </div>
             </div>
-            <div class="right_main" v-loading="rightLoading">
+            <div class="right_main middle_sty" v-loading="rightLoading">
                 <el-tabs v-if="labelKey.length && tabsFalg" tab-position="left" style="height: 100%;">
                     <el-tab-pane v-for="(item,index) in labelKey" :key="index">
                         <span slot="label">{{item.FirstTag || '信息'}}</span>