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

Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
wuhongjian 2022-11-24 09:52:31 +08:00
parent d244f48a60 cdfd3fdb1c
commit 566648dd44
4 changed files with 106 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
back/src/App.vue
View File

@ -26,7 +26,7 @@
min-width: 80px !important; min-width: 80px !important;
border-radius:2px !important; border-radius:2px !important;
} */ } */
.el-button--primary { /* .el-button--primary {
vertical-align: middle !important; vertical-align: middle !important;
align-items: center !important; align-items: center !important;
display: inline-flex !important; display: inline-flex !important;
@ -35,7 +35,7 @@
justify-content: center !important; justify-content: center !important;
min-width: 80px !important; min-width: 80px !important;
border-radius:2px !important; border-radius:2px !important;
} } */
</style> </style>
<script> <script>
import Cookies from 'js-cookie' import Cookies from 'js-cookie'

23
back/src/assets/scss/common.scss
View File

@ -138,6 +138,28 @@ img {
color: $--color-text-secondary; color: $--color-text-secondary;
} }
// 按钮 // 按钮
.el-button--primary {
border-radius: 2px;
// vertical-align: middle !important;
// align-items: center !important;
// display: inline-flex !important;
// height:32px !important;
// line-height: 32px !important;
// justify-content: center !important;
// min-width: 80px !important;
// border-radius:2px !important;
}
// .el-button--primary {
// vertical-align: middle !important;
// align-items: center !important;
// display: inline-flex !important;
// height:32px !important;
// line-height: 32px !important;
// justify-content: center !important;
// min-width: 80px !important;
// border-radius:2px !important;
// }
.aui-button--dashed { .aui-button--dashed {
border-style: dashed; border-style: dashed;
&:focus, &:focus,
@ -253,6 +275,7 @@ img {
} }
/* Navbar /* Navbar
------------------------------ */ ------------------------------ */
.aui-navbar { .aui-navbar {

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

@ -3,10 +3,15 @@
<div class="container"> <div class="container">
<!--能力上架统计1 能力使用统计 2--> <!--能力上架统计1 能力使用统计 2-->
<el-form :inline="true" v-if="this.departmentId === 1 || this.departmentId === 2"> <el-form :inline="true" v-if="this.departmentId === 1 || this.departmentId === 2">
<a-row> <!--日期-->
<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 :span="8">
<el-form-item> <el-form-item>
<span v-if="this.departmentId === 1 ">上架部门：</span> <span v-if="this.departmentId === 1 ">上架部门：</span>
<span v-else>申请部门：</span> <span v-else>申请部门：</span>
@ -16,16 +21,7 @@
v-bind="item"></el-option> v-bind="item"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</a-col>
<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-form-item>
<el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button> <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
@ -39,16 +35,20 @@
<!-- 导出 --> <!-- 导出 -->
<a class='export' <a class='export'
:href="exportExcel + exportExcelType + '?' + exportExcelCondition + '&token=' + token">导出全部</a> :href="exportExcel + exportExcelType + '?' + exportExcelCondition + '&token=' + token">导出全部</a>
</a-col>
</a-row>
</el-form> </el-form>
<!--能力上架明细3 能力使用明细 4--> <!--能力上架明细3 能力使用明细 4-->
<el-form :inline="true" v-else> <div v-else>
<a-row> <el-form :inline="true" >
<!--日期-->
<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 :span="6">
<el-form-item v-if="this.departmentId === 3 || this.departmentId === 4"> <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
<span>审核状态：</span> <span>审核状态：</span>
<el-select v-model="examineStatus" placeholder="请选审核状态" clearable> <el-select v-model="examineStatus" placeholder="请选审核状态" clearable>
@ -58,9 +58,7 @@
<el-option label="不通过" value="2"></el-option> <el-option label="不通过" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</a-col>
<!--上架部门--> <!--上架部门-->
<a-col :span="6">
<el-form-item> <el-form-item>
<span v-if=" this.departmentId === 3">上架部门：</span> <span v-if=" this.departmentId === 3">上架部门：</span>
<span v-else>申请部门：</span> <span v-else>申请部门：</span>
@ -70,22 +68,23 @@
v-bind="item"></el-option> v-bind="item"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</a-col>
<!--能力使用统计明细--添加提供部门--> <!--能力使用统计明细--添加提供部门-->
<a-col :span="12"> <el-form-item v-if=" this.departmentId === 4">
<el-form-item> <span >提供部门：</span>
<span>日期：</span> <el-select v-model="provideDepartment" placeholder="请选择部门" filterable clearable>
<el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期" <el-option label="全部" value=""></el-option>
end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"> <el-option v-for="item in provideSelects" :key="item.label" :label="item.label" :value="item.value"
</el-date-picker> v-bind="item"></el-option>
</el-select>
</el-form-item> </el-form-item>
</a-col> </el-form>
</a-row>
<el-form :inline="true" >
<!--资源类型--> <!--资源类型-->
<a-row>
<a-col :span="6">
<el-form-item > <el-form-item >
<span>资源类型：</span> <span>资源类型：</span>
<el-select @change="changeIiem" v-if="this.departmentId === 4" v-model="abilityType" placeholder="请选择资源类型" clearable> <el-select @change="changeIiem" v-if="this.departmentId === 4" v-model="abilityType" placeholder="请选择资源类型" clearable>
@ -101,25 +100,14 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</a-col>
<!--资源名称 仅明细添加--> <!--资源名称 仅明细添加-->
<a-col :span="6">
<el-form-item > <el-form-item >
<span>资源名称：</span> <span>资源名称：</span>
<el-input style="width:70%;" v-model="resourceName" placeholder="请输入资源名称" clearable></el-input> <el-input style="width:70%;" v-model="resourceName" placeholder="请输入资源名称" clearable></el-input>
</el-form-item> </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> <el-form-item>
<el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button> <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
@ -133,10 +121,10 @@
<!-- 导出 --> <!-- 导出 -->
<a class='export' <a class='export'
:href="exportExcel + exportExcelType + '?' + exportExcelCondition + '&token=' + token">导出全部</a> :href="exportExcel + exportExcelType + '?' + exportExcelCondition + '&token=' + token">导出全部</a>
</a-col> </el-form>
</a-row> </div>
</el-form>
<el-card shadow="never" class="aui-card--fill" v-if="homeIsShow"> <el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
<div class="mod-demand__bsdemand"> <div class="mod-demand__bsdemand">
@ -1206,16 +1194,13 @@ input::placeholder {
} }
.export { .export {
margin-top: 6px;
display: inline-block; display: inline-block;
width: 80px; width: 80px;
height: 32px; height: 40px;
line-height: 32px; line-height: 40px;
text-align: center; text-align: center;
border-radius: 2px; border-radius: 4px;
background: #fff; background: #fff;
border: 2px solid #dcdfe6;
color: #000;
color: #fff; color: #fff;
background-color: #0058e1; background-color: #0058e1;
border-color: #0058e1; border-color: #0058e1;

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

@ -30,10 +30,23 @@
</div> </div>
</div> </div>
<el-form :inline="true"> <el-form :inline="true">
<a-row> <!--日期-->
<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>
<!--提供部门 传id--> <!--提供部门 传id-->
<a-col :span="6">
<el-form-item> <el-form-item>
<span>提供部门：</span> <span>提供部门：</span>
<el-select <el-select
@ -52,9 +65,9 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</a-col>
<!--申请部门 传汉字--> <!--申请部门 传汉字-->
<a-col :span="6">
<el-form-item> <el-form-item>
<span>申请部门：</span> <span>申请部门：</span>
<el-select <el-select
@ -73,28 +86,9 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </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-row>
<!--名称-->
<a-col :span="6">
<el-form-item> <el-form-item>
<span>资源类型：</span> <span>资源类型：</span>
<el-select <el-select
@ -114,19 +108,11 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</a-col> </el-form>
<a-col :span="6">
<el-form-item>
<span>资源名称：</span> <el-form :inline="true">
<el-input <!--审核状态-->
style="width: 70%"
v-model="dataForm.resourceName"
placeholder="请输入资源名称"
clearable
></el-input>
</el-form-item>
</a-col>
<a-col :span="6">
<el-form-item> <el-form-item>
<span>审核状态：</span> <span>审核状态：</span>
<el-select v-model="dataForm.applyResult" placeholder="请选审核状态" clearable> <el-select v-model="dataForm.applyResult" placeholder="请选审核状态" clearable>
@ -135,8 +121,17 @@
<el-option label="审核中" value="审核中"></el-option> <el-option label="审核中" value="审核中"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</a-col> <!--资源名称-->
<a-col :span="6"> <el-form-item>
<span>资源名称：</span>
<el-input
style="width: 70%"
v-model="dataForm.resourceName"
placeholder="请输入资源名称"
clearable
></el-input>
</el-form-item>
<!--操作按钮查询--> <!--操作按钮查询-->
<el-form-item> <el-form-item>
<el-button type="primary" @click="init()">{{ <el-button type="primary" @click="init()">{{
@ -160,10 +155,10 @@
" "
>导出全部</a >导出全部</a
> >
</a-col>
</a-row>
</el-form> </el-form>
<div class="mod-activiti__process"> <div class="mod-activiti__process">
<el-table <el-table
@ -348,15 +343,13 @@ export default {
width: 400px; width: 400px;
} }
.export { .export {
margin-top: 6px;
display: inline-block; display: inline-block;
width: 80px; width: 80px;
height: 32px; height: 40px;
line-height: 32px; line-height: 40px;
text-align: center; text-align: center;
border-radius: 2px; border-radius: 4px;
background: #fff; background: #fff;
border: 2px solid #dcdfe6;
color: #000; color: #000;
color: #fff; color: #fff;
background-color: #0058e1; background-color: #0058e1;