Bladeren bron

样式调整

wangkang3 4 jaren geleden
bovenliggende
commit
89ee13a82a

+ 4 - 4
ebc-middle-platform/src/modules/call-help/current.scss

@ -1,11 +1,11 @@
1 1
.current-container{
2 2
  display: flex;
3
  width: "100%";
4
  height: 700px;
3
  width: 100%;
4
  height: 100%;
5 5
  .left{
6 6
    margin-top: 30px;
7 7
    width: 360px;
8
    height: 700px;
8
    height: 100%;
9 9
    .item{
10 10
      width: 300px;
11 11
      margin: 10px 30px;
@ -80,7 +80,7 @@
80 80
    padding: 40px 30px 0 0;
81 81
    #current-map{
82 82
      width: 100%;
83
      height: 700px;
83
      height: 100%;
84 84
    }
85 85
  }
86 86
}

+ 1 - 1
ebc-middle-platform/src/modules/call-help/current.vue

@ -109,7 +109,7 @@ export default {
109 109
  },
110 110
  mounted() {
111 111
    this.map = new Ai.Map('current-map', {
112
      ak: 'MTYwMTIMTAwMU1UWXdNVEkxTnpNMk16ZzBPU014TnpRdw__',
112
      ak: 'MTYwMTMMTAwMU1UWXdNVE0wTlRNMU16WTBNeU14TnpRdw__',
113 113
      center: [39.915599, 116.406568],
114 114
      zoom: 5
115 115
    })

+ 6 - 8
ebc-middle-platform/src/modules/system-management/equipment-management.scss

@ -1,4 +1,4 @@
1
.track-container{
1
.equipment-container{
2 2
  width: 97%;
3 3
  margin: 20px auto;
4 4
  padding: 20px;
@ -11,18 +11,13 @@
11 11
      overflow: hidden;
12 12
      margin: 0;
13 13
      padding: 0;
14
      position: relative;
15 14
      display: flex;
16
      justify-content: space-between;
15
      position: relative;
16
      justify-content: flex-start;
17 17
      >div{
18 18
        display: flex; 
19 19
        margin: 0 20px 16px 0;    
20 20
        line-height: 2;
21
        .label-content{
22
          display: flex; 
23
          margin: 0 20px 16px 0;    
24
          line-height: 2;
25
        }
26 21
        .input-rule{
27 22
          flex: 1;
28 23
          margin:0 0 0 20px;
@ -31,6 +26,9 @@
31 26
          }
32 27
        }
33 28
      }
29
      .label{
30
        min-width: 30px;
31
      }
34 32
      .btns button{
35 33
        margin: 0 2px;
36 34
      }

+ 31 - 31
ebc-middle-platform/src/modules/system-management/equipment-management.vue

@ -1,43 +1,43 @@
1 1
<template>
2
  <div class="track-container">
2
  <div class="equipment-container">
3 3
    <div class="search-container">
4 4
      <div class="search-ctn">
5 5
        <div>
6
          <div class="label-content">
7
            <div class="label">设备类型:</div>
8
            <div class="input-rule">
9
              <t-select v-model="queryCondition.alarmPerson" width="200" placeholder="请输入...">
10
                <t-option>张三</t-option>
11
                <t-option>李四</t-option>
12
              </t-select>
13
            </div>
6
          <div class="label">设备类型:</div>
7
          <div class="input-rule">
8
            <t-select v-model="queryCondition.alarmPerson" width="200" placeholder="请输入...">
9
              <t-option>张三</t-option>
10
              <t-option>李四</t-option>
11
            </t-select>
14 12
          </div>
15
          <div class="label-content">
16
            <div class="label">设备名称:</div>
17
            <div class="input-rule">
18
              <t-select v-model="queryCondition.alarmPerson" width="200" placeholder="请输入...">
19
                <t-option>张三</t-option>
20
                <t-option>李四</t-option>
21
              </t-select>
22
            </div>
23
          </div>
24
          <div class="label-content">
25
            <div class="label">设备编号:</div>
26
            <div class="input-rule">
27
              <t-select v-model="queryCondition.alarmPerson" width="200" placeholder="请输入...">
28
                <t-option>张三</t-option>
29
                <t-option>李四</t-option>
30
              </t-select>
31
            </div>
13
        </div>
14
        <div>
15
          <div class="label">设备名称:</div>
16
          <div class="input-rule">
17
            <t-select v-model="queryCondition.alarmPerson" width="200" placeholder="请输入...">
18
              <t-option>张三</t-option>
19
              <t-option>李四</t-option>
20
            </t-select>
32 21
          </div>
33
          <div class="btns">
34
            <t-button color="secondary" class="reset-btn" @click="onReset">重置</t-button>
35
            <t-button color="success" icon="search-outline" @click="onSearch">查询</t-button>
36
            <t-button color="secondary" icon="upload-outline" @click="toExport">导出至Excel</t-button>
37
            <t-button color="secondary" icon="delete-outline" @click="toExport">删除</t-button>
22
        </div>
23
        <div>
24
          <div class="label">设备编号:</div>
25
          <div class="input-rule">
26
            <t-select v-model="queryCondition.alarmPerson" width="200" placeholder="请输入...">
27
              <t-option>张三</t-option>
28
              <t-option>李四</t-option>
29
            </t-select>
38 30
          </div>
39 31
        </div>
40 32
        <div class="btns">
33
          <t-button color="secondary" class="reset-btn" @click="onReset">重置</t-button>
34
          <t-button color="success" icon="search-outline" @click="onSearch">查询</t-button>
35
          <t-button color="secondary" icon="upload-outline" @click="toExport">导出至Excel</t-button>
36
          <t-button color="secondary" icon="delete-outline" @click="toExport">删除</t-button>
37
        </div>
38
      </div>
39
      <div class="search-ctn" style="justify-content: flex-end;">
40
        <div class="btns">
41 41
          <t-button color="success" icon="upload-outline" @click="onReset">导入</t-button>
42 42
          <t-button color="success" icon="download-outline" @click="onReset">下载模板</t-button>
43 43
          <t-button color="success" icon="plus-outline" @click="addEquipment">新增</t-button>

+ 2 - 2
ebc-middle-platform/src/modules/system-management/map-mark.vue

@ -49,7 +49,7 @@
49 49
               @on-change="onPagerChange">
50 50
      </t-pager>
51 51
    </div>
52
    <t-modal :visibled.sync="addMark" :ok="submitMark" :cancel="cancel" class="modal" title="新增标记" ok-text="保存" width="1500px" >
52
    <t-modal :visibled.sync="addMark" :ok="submitMark" :cancel="cancel" class="modal" title="新增标记" ok-text="保存" width="80%" >
53 53
      <div class="top">
54 54
        <div>
55 55
          <div class="label">标记类型:</div>
@ -164,7 +164,7 @@ export default {
164 164
  },
165 165
  mounted() {
166 166
    this.map = new Ai.Map('modalMap', {
167
      ak: 'MTYwMTEMTAwMU1UWXdNVEV3TXpRek16STVOU014TnpRdw__',
167
      ak: 'MTYwMTMMTAwMU1UWXdNVE0wTlRNMU16WTBNeU14TnpRdw__',
168 168
      center: [39.915599, 116.406568],
169 169
      zoom: 5
170 170
    })

+ 3 - 0
ebc-middle-platform/src/modules/system-management/terminal-management.scss

@ -25,6 +25,9 @@
25 25
          }
26 26
        }
27 27
      }
28
      .label{
29
        width: 60px;
30
      }
28 31
      .btns button{
29 32
        margin: 0 2px;
30 33
      }

+ 2 - 0
ebc-middle-platform/src/modules/system-management/terminal-management.vue

@ -27,6 +27,8 @@
27 27
          <t-button color="secondary" icon="unlock-outline" @click="toExport">解绑用户</t-button>
28 28
          <t-button color="secondary" icon="delete-outline" @click="toExport">删除</t-button>
29 29
        </div>
30
      </div>
31
      <div class="search-ctn" style="justify-content: flex-end;">
30 32
        <div class="btns">
31 33
          <t-button color="success" icon="upload-outline" @click="onReset">导入</t-button>
32 34
          <t-button color="success" icon="download-outline" @click="onReset">下载模板</t-button>

+ 1 - 1
ebc-middle-platform/src/modules/system-management/user-management.scss

@ -1,4 +1,4 @@
1
.track-container{
1
.user-container{
2 2
  width: 97%;
3 3
  margin: 20px auto;
4 4
  padding: 20px;

+ 3 - 1
ebc-middle-platform/src/modules/system-management/user-management.vue

@ -1,5 +1,5 @@
1 1
<template>
2
  <div class="track-container">
2
  <div class="user-container">
3 3
    <div class="search-container">
4 4
      <div class="search-ctn">
5 5
        <div>
@ -37,6 +37,8 @@
37 37
            <t-button color="secondary" icon="delete-outline" @click="toExport">删除</t-button>
38 38
          </div>
39 39
        </div>
40
      </div>
41
      <div class="search-ctn" style="justify-content: flex-end;">
40 42
        <div class="btns">
41 43
          <t-button color="success" icon="upload-outline" @click="onReset">导入</t-button>
42 44
          <t-button color="success" icon="download-outline" @click="onReset">下载模板</t-button>