style:修改批量修改的图标 以及弹窗内的样式

This commit is contained in:
zhangyu
2020-11-05 16:41:58 +08:00
parent a6c7195cbf
commit e7d93a9e5d
9 changed files with 40 additions and 22 deletions

View File

@@ -20,6 +20,9 @@ Created by iconfont
/> />
<missing-glyph /> <missing-glyph />
<glyph glyph-name="batch-edit" unicode="&#58880;" d="M744.7552 374.88127999999995l-58.71616-58.7264-174.92992-174.91968c-0.34816-0.28672-0.7424-0.4352-1.08544-0.73728-1.42848-1.28-3.01568-2.37056-4.736-3.20512-0.5888-0.25088-1.18784-0.64512-1.87904-0.8448-2.22208-0.83456-4.63872-1.3824-7.15264-1.3824H437.59104a21.06368 21.06368 0 0 0-21.07392 21.0688v58.72128c0.0512 2.46272 0.50176 4.87936 1.3824 7.15264 0.25088 0.58368 0.59392 1.22368 0.93696 1.8688 0.8448 1.72544 1.87392 3.30752 3.15904 4.736l-0.05632-0.0512c0.30208 0.35328 0.39936 0.78848 0.74752 1.13664l174.96576 174.9248 58.71616 58.72128a21.04832 21.04832 0 0 0 29.75744 0.0512l58.6752-58.7264a21.00224 21.00224 0 0 0-0.04608-29.78816z m-132.29056-14.90944l-145.17248-145.16224 28.96384-28.91776 145.27488 145.17248-28.96384 28.96384-0.1024-0.05632z m29.8496 29.80352l28.96384-28.90752 28.91776 28.90752-28.91776 28.91264-28.96384-28.91264zM862.44352 659.54304H304.91648c-41.18528 0-75.05408-33.86368-75.05408-75.04896v-557.65504c0-41.1904 33.86368-75.05408 75.05408-75.05408h557.65504c41.1904 0 75.05408 33.86368 75.05408 75.05408V584.4940799999999c-0.13312 41.3184-33.86368 75.04896-75.18208 75.04896z m-4.18304-584.84736c0-24.05888-19.74272-43.80672-43.80672-43.80672H352.768c-24.05888 0-43.8016 19.74272-43.8016 43.80672V536.50944c0 24.05888 19.74272 43.8016 43.8016 43.8016h461.81376c24.05888 0 43.8016-19.74272 43.8016-43.8016v-461.81376h-0.12288zM263.33696 156.93312000000003h-20.00384c-24.05888 0-43.8016 19.74272-43.8016 43.8016V662.42048c0 24.05888 19.7376 43.8016 43.8016 43.8016h461.81376c24.05888 0 43.8016-19.74272 43.8016-43.8016v-38.57408h79.24224V710.4102399999999c0 41.18528-33.86368 75.04896-75.05408 75.04896H195.34336c-41.18528 0-75.04896-33.86368-75.04896-75.04896v-557.66016c0-41.18528 33.86368-75.04896 75.04896-75.04896h67.9936v79.232z" horiz-adv-x="1024" />
<glyph glyph-name="sanjiaoxing" unicode="&#59087;" d="M959.51284282 384L85.82049052 820.84617615v-873.6923523z" horiz-adv-x="1024" /> <glyph glyph-name="sanjiaoxing" unicode="&#59087;" d="M959.51284282 384L85.82049052 820.84617615v-873.6923523z" horiz-adv-x="1024" />

Before

Width:  |  Height:  |  Size: 125 KiB

After

Width:  |  Height:  |  Size: 127 KiB

File diff suppressed because one or more lines are too long

View File

@@ -42,7 +42,7 @@
type="button" class="nz-btn nz-btn-size-small nz-btn-style-light nz-btn-style-square nz-input-group-append" id="search-asset"><i @click="searchAsset" class="nz-icon nz-icon-search"></i></button> type="button" class="nz-btn nz-btn-size-small nz-btn-style-light nz-btn-style-square nz-input-group-append" id="search-asset"><i @click="searchAsset" class="nz-icon nz-icon-search"></i></button>
<div class="endpoint-asset-search-dropdown" v-if="assetSearch.dropdownShow"> <div class="endpoint-asset-search-dropdown" v-if="assetSearch.dropdownShow">
<div @click="dropdownSelect('IP')" class="endpoint-asset-search-dropdown-item" id="search-asset-ip">IP</div> <div @click="dropdownSelect('IP')" class="endpoint-asset-search-dropdown-item" id="search-asset-ip">Host</div>
<div @click="dropdownSelect('SN')" class="endpoint-asset-search-dropdown-item" id="search-asset-sn">SN</div> <div @click="dropdownSelect('SN')" class="endpoint-asset-search-dropdown-item" id="search-asset-sn">SN</div>
</div> </div>
</div> </div>
@@ -52,11 +52,12 @@
<!-- begin--table--> <!-- begin--table-->
<div class="endpoint-sub-table"> <div class="endpoint-sub-table">
<div class="endpoint-sub-table-head"> <div class="endpoint-sub-table-head">
<div class="endpoint-sub-table-col" style="width: 15px;"> <div class="endpoint-sub-table-col" style="width: 15px;position: relative">
<el-checkbox v-model="assetListAll" :indeterminate="assetListHalf" <div @click.stop v-if="!currentModuleCopy.id" class="endpoint-sub-table-body-dialog checkbox-mc"></div>
<el-checkbox v-model="assetListAll" :indeterminate="assetListHalf"
@change="assetListSelAll"></el-checkbox> @change="assetListSelAll"></el-checkbox>
</div> </div>
<div class="endpoint-sub-table-col">IP</div> <div class="endpoint-sub-table-col">Host</div>
<div class="endpoint-sub-table-col" style="width: calc(50% - 55px)">SN</div> <div class="endpoint-sub-table-col" style="width: calc(50% - 55px)">SN</div>
</div> </div>
<div class="line-100"></div> <div class="line-100"></div>
@@ -916,6 +917,14 @@
width: 100px; width: 100px;
vertical-align: top; vertical-align: top;
} }
.checkbox-mc{
position: absolute;
top: 0;
left: 0;
width: 14px;
height: 14px;
z-index:1;
}
/* end--搜索框*/ /* end--搜索框*/
/* begin--table*/ /* begin--table*/

View File

@@ -43,7 +43,7 @@
<div class="endpoint-asset-search-dropdown" v-if="assetSearch.dropdownShow"> <div class="endpoint-asset-search-dropdown" v-if="assetSearch.dropdownShow">
<div @click="dropdownSelect('IP')" class="endpoint-asset-search-dropdown-item" id="search-asset-ip"> <div @click="dropdownSelect('IP')" class="endpoint-asset-search-dropdown-item" id="search-asset-ip">
IP Host
</div> </div>
<div @click="dropdownSelect('SN')" class="endpoint-asset-search-dropdown-item" id="search-asset-sn"> <div @click="dropdownSelect('SN')" class="endpoint-asset-search-dropdown-item" id="search-asset-sn">
SN SN
@@ -60,7 +60,7 @@
<el-checkbox v-model="assetListAll" :indeterminate="assetListHalf" <el-checkbox v-model="assetListAll" :indeterminate="assetListHalf"
@change="assetListSelAll"></el-checkbox> @change="assetListSelAll"></el-checkbox>
</div> </div>
<div class="endpoint-sub-table-col">IP</div> <div class="endpoint-sub-table-col">Host</div>
<div class="endpoint-sub-table-col">SN</div> <div class="endpoint-sub-table-col">SN</div>
</div> </div>
<div class="line-100"></div> <div class="line-100"></div>
@@ -87,7 +87,7 @@
style="margin-top: 3px;"> style="margin-top: 3px;">
{{$t('overall.addAssetList')}} {{$t('overall.addAssetList')}}
</button> </button>
<span style="display: inline-block; font-size: 14px; float: right;line-height: 35px;padding-right: 15px;margin-top: 3px;">All: {{this.assetList.length}}</span> <span style="display: inline-block; font-size: 14px; float: right;padding-right: 15px;margin-top: 3px;">All: {{this.assetList.length}}</span>
</div> </div>
<!--end--table--> <!--end--table-->
</div> </div>
@@ -894,8 +894,7 @@
height: 400px; height: 400px;
position: relative; position: relative;
display: flex; display: flex;
padding-left: 190px; width: 100%;
width: calc(100% - 190px);
} }
.endpoint-to-right-symbol { .endpoint-to-right-symbol {
@@ -913,7 +912,7 @@
.assets-box { .assets-box {
border: 1px solid #DCDFE6; border: 1px solid #DCDFE6;
border-radius: 4px; border-radius: 4px;
width: 260px; width: 395px;
height: calc(100% - 22px); height: calc(100% - 22px);
} }
@@ -923,7 +922,7 @@
} }
.endpoints-box.endpoints-box-snmp { .endpoints-box.endpoints-box-snmp {
width: 380px; width: 400px;
} }
.right-child-box .el-input-group { .right-child-box .el-input-group {
@@ -1073,8 +1072,8 @@
/* begin--table*/ /* begin--table*/
.endpoint-sub-table { .endpoint-sub-table {
padding-top: 15px; padding-top: 5px;
height: calc(100% - 83px); height: calc(100% - 72px);
} }
.line-100 { .line-100 {
@@ -1128,7 +1127,7 @@
position: relative; position: relative;
overflow: auto; overflow: auto;
height: calc(100% - 37px); height: calc(100% - 37px);
width: 260px; width: 390px;
} }
.endpoint-sub-table-body-dialog { .endpoint-sub-table-body-dialog {
@@ -1141,8 +1140,11 @@
.endpoints-clear-btn { .endpoints-clear-btn {
margin: 6px 0 0 7px; margin: 6px 0 0 7px;
} }
/deep/.el-table td{
padding: 5px 0;
}
/* end--table*/ /* end--table*/
/* end--子弹框*/ /* end--子弹框*/
</style> </style>

View File

@@ -18,7 +18,7 @@
</template> </template>
</export-excel> </export-excel>
<button style="margin-left: 15px" @click.stop="batchEdit" :title="$t('overall.batchEdit')" class="nz-btn nz-btn-size-normal nz-btn-style-light" id="asset-batch-asset"> <button style="margin-left: 15px" @click.stop="batchEdit" :title="$t('overall.batchEdit')" class="nz-btn nz-btn-size-normal nz-btn-style-light" id="asset-batch-asset">
<i class="nz-icon nz-icon-table-edit"></i> <i class="nz-icon nz-icon-batch-edit"></i>
</button> </button>
<delete-button :delete-objs="batchDeleteObjs" api="asset" @after="afterTableListChange"></delete-button> <delete-button :delete-objs="batchDeleteObjs" api="asset" @after="afterTableListChange"></delete-button>
</div> </div>