wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

提交样式修改

This commit is contained in:
gongjiale 2022-11-23 18:16:43 +08:00
parent 8ccf8c5336
commit 2b5c612d20
3 changed files with 55 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
back/src/App.vue
View File

@ -16,7 +16,7 @@
display: table-cell !important;
}
.el-button {
/* .el-button {
vertical-align: middle !important;
align-items: center !important;
display: inline-flex !important;
@ -25,7 +25,7 @@
justify-content: center !important;
min-width: 80px !important;
border-radius:2px !important;
}
} */
.el-button--primary {
vertical-align: middle !important;
align-items: center !important;

56
back/src/views/modules/abilityStatistics/index.vue
View File

@ -4,16 +4,9 @@
<!--能力上架统计1 能力使用统计 2-->
<el-form :inline="true" v-if="this.departmentId === 1 || this.departmentId === 2">
<a-row>
<a-col :span="6">
<el-form-item>
<span>日期：</span>
<el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</a-col>
<!--上架部门-->
<a-col :span="6">
<a-col :span="8">
<el-form-item>
<span v-if="this.departmentId === 1 ">上架部门：</span>
<span v-else>申请部门：</span>
@ -24,7 +17,15 @@
</el-select>
</el-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<el-form-item>
<span>日期：</span>
<el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</a-col>
<a-col :span="8">
<!--操作按钮查询-->
<el-form-item>
<el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
@ -45,14 +46,7 @@
<!--能力上架明细3 能力使用明细 4-->
<el-form :inline="true" v-else>
<a-row>
<a-col :span="6">
<el-form-item>
<span>日期：</span>
<el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</a-col>
<!--审核状态-->
<a-col :span="6">
<el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
@ -78,19 +72,19 @@
</el-form-item>
</a-col>
<!--能力使用统计明细--添加提供部门-->
<a-col :span="6">
<el-form-item v-if=" this.departmentId === 4">
<span >提供部门：</span>
<el-select v-model="provideDepartment" placeholder="请选择部门" filterable clearable>
<el-option label="全部" value=""></el-option>
<el-option v-for="item in provideSelects" :key="item.label" :label="item.label" :value="item.value"
v-bind="item"></el-option>
</el-select>
<a-col :span="12">
<el-form-item>
<span>日期：</span>
<el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</a-col>
</a-row>
<!--资源类型-->
<a-row>
<a-col :span="6">
<el-form-item >
<span>资源类型：</span>
@ -115,6 +109,16 @@
<el-input style="width:70%;" v-model="resourceName" placeholder="请输入资源名称" clearable></el-input>
</el-form-item>
</a-col>
<a-col :span="6">
<el-form-item v-if=" this.departmentId === 4">
<span >提供部门：</span>
<el-select v-model="provideDepartment" placeholder="请选择部门" filterable clearable>
<el-option label="全部" value=""></el-option>
<el-option v-for="item in provideSelects" :key="item.label" :label="item.label" :value="item.value"
v-bind="item"></el-option>
</el-select>
</el-form-item>
</a-col>
<a-col :span="12">
<!--操作按钮查询-->
<el-form-item>

41
back/src/views/modules/assetReport/index.vue
View File

@ -31,21 +31,7 @@
</div>
<el-form :inline="true">
<a-row>
<a-col :span="6">
<el-form-item>
<span>日期：</span>
<el-date-picker
v-model="dateList"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
</a-col>
<!--提供部门 传id-->
<a-col :span="6">
<el-form-item>
@ -88,8 +74,25 @@
</el-select>
</el-form-item>
</a-col>
<a-col :span="12">
<el-form-item>
<span>日期：</span>
<el-date-picker
v-model="dateList"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
</a-col>
<!--类型-->
</a-row>
<!--名称-->
<a-col :span="6">
<el-form-item>
<span>资源类型：</span>
@ -111,8 +114,6 @@
</el-select>
</el-form-item>
</a-col>
</a-row>
<!--名称-->
<a-row>
<a-col :span="6">
<el-form-item>
@ -135,7 +136,7 @@
</el-select>
</el-form-item>
</a-col>
<a-col :span="12">
<a-col :span="6">
<!--操作按钮查询-->
<el-form-item>
<el-button type="primary" @click="init()">{{
@ -266,7 +267,7 @@ export default {
applyDept: "",
resourceType: "",
resourceName: "",
applyResult:"",
applyResult:"通过",
pageNum:1,
pageSize:10,
},