yzj
/
project-html
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

8.2

master
liusiqian 3 years ago
parent
15b8a25322
commit
111c586075
10 changed files with 21886 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21781
      package-lock.json
  2. 14
      public/common.css
  3. 2
      src/assets/styles/bigFont.css
  4. 2
      src/assets/styles/bigFont.min.css
  5. 2
      src/assets/styles/bigFont.scss
  6. 5
      src/router/index.js
  7. 8
      src/views/index.vue
  8. 39
      src/views/project/infoShow/queryList.vue
  9. 79
      src/views/project/instruction/indexShow.vue
  10. 36
      src/views/project/result/queryList.vue

21781
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

14
public/common.css
Unescape View File

@ -174,6 +174,9 @@ a:hover { @@ -174,6 +174,9 @@ a:hover {
/* reset */
.color333 {
color: #333;
}
.el-radio-button__orig-radio:checked + .el-radio-button__inner {
background-color: #116bcc !important;
border-color: #116bcc !important;
@ -190,12 +193,17 @@ a:hover { @@ -190,12 +193,17 @@ a:hover {
.el-table--medium th, .el-table--medium td {
padding: 20px 0 !important;
}
.el-table th.is-center, .el-table td.is-center {
/* .el-table th.is-center, .el-table td.is-center {
text-align: left !important;
}
} */
.el-table {
color: #161b22 !important;
}
.el-radio-group {
width: calc(100% - 80px);
width: calc(100% - 100px);
}
/* 导入按钮 */
.button-import {
background: #73c4a2 !important;
border: solid 1px #73c4a2 !important;
}

2
src/assets/styles/bigFont.css
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
@charset "UTF-8";
/*字体调大css*/
.el-table .cell {
font-size: 22px;
font-size: 21px;
}
.el-form-item__label {

2
src/assets/styles/bigFont.min.css vendored
Unescape View File

@ -1 +1 @@ @@ -1 +1 @@
.el-table .cell{font-size:22px}.el-form-item__label{font-size:17px !important}.el-input__inner{font-size:16px !important}.el-radio-button__inner{font-size:16px !important}.el-button--mini{font-size:16px !important}.chart-wrapper{font-size:16px !important}.ql-editor{font-size:16px !important}
.el-table .cell{font-size:21px}.el-form-item__label{font-size:17px !important}.el-input__inner{font-size:16px !important}.el-radio-button__inner{font-size:16px !important}.el-button--mini{font-size:16px !important}.chart-wrapper{font-size:16px !important}.ql-editor{font-size:16px !important}

2
src/assets/styles/bigFont.scss
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
/*字体调大css*/
.el-table .cell{
font-size: 22px;
font-size: 21px;
}
.el-form-item__label{
font-size: 17px !important;

5
src/router/index.js
Unescape View File

@ -63,6 +63,11 @@ export const constantRoutes = [ @@ -63,6 +63,11 @@ export const constantRoutes = [
// name: '管理报告',
// meta: { title: '管理报告', icon: 'dashboard', noCache: true, affix: true }
// },
{
path: 'index',
name: '首页',
component: (resolve) => require(['@/layout/components/index'], resolve),
},
{
path: '/home',
name: '首页',

8
src/views/index.vue
Unescape View File

@ -128,10 +128,12 @@ @@ -128,10 +128,12 @@
margin: 0 16px;
}
.rightimg{
width: 120px;
height: 120px;
width: auto;
height: calc(100% - 10px);
position: absolute;
right: 1px;
right:0;
bottom: 0;
margin-right: 0;
}
}
.zxxm {

39
src/views/project/infoShow/queryList.vue
Unescape View File

@ -42,8 +42,9 @@ @@ -42,8 +42,9 @@
@keyup.enter.native="handleQuery"
@blur="handleQuery"/>
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleUserNameQuery">图表</el-button>
<el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport" class="button-import">导入</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport" >导入</el-button>
</el-form-item>
</el-col>
@ -137,7 +138,7 @@ @@ -137,7 +138,7 @@
<div class="dtable" style="margin-top: 25px">
<div style="height: 60px;background-color: rgb(242,247,253);margin-top: 20px;margin-bottom: 20px">
<div style="background-color: rgb(18,107,199);height:100%;width: 4px;float: left;"></div>
<h2 style="margin-bottom: 20px;position: relative ;top: 18px;margin-left: 20px">
<h2 style="margin-bottom: 20px;position: relative ;top: 18px;margin-left: 20px" class="color333">
<span>项目数&nbsp;&nbsp;:&nbsp;&nbsp;<span style="color: #ce2700;">{{total}}</span></span>
<span style="margin-left: 20px">项目经费（万元）:&nbsp;&nbsp;<span style="color: #ce2700;">{{zjf}}</span></span>
</h2>
@ -159,7 +160,7 @@ @@ -159,7 +160,7 @@
</el-table-column>
<el-table-column
label="项目编号"
align="center"
align="left"
width="180"
>
@ -170,7 +171,7 @@ @@ -170,7 +171,7 @@
</el-table-column>
<el-table-column
label="项目名称"
align="center"
align="left"
prop="name"
width="380"
@ -178,31 +179,31 @@ @@ -178,31 +179,31 @@
<el-table-column label="类型" align="center" prop="type" width="110" :formatter="typeFormat" />
<el-table-column
label="密级"
align="center"
align="left"
width="80"
prop="secrecyLevel"
:formatter="secretFormat"
/>
<el-table-column label="联系部门" align="center" prop="departmentName" />
<el-table-column label="联系部门" align="left" prop="departmentName" />
<!-- <el-table-column label="项目联系部门" align="center" prop="departmentId" />-->
<el-table-column label="负责人" align="center" prop="userName" width="110" />
<el-table-column label="负责人" align="left" prop="userName" width="110" />
<el-table-column
label="经费"
align="center"
align="left"
width="80"
prop="totalBudget"
/>
<el-table-column label="依托单位" align="center" prop="yituoUnit" />
<el-table-column label="依托单位" align="left" prop="yituoUnit" />
<el-table-column
label="状态"
align="center"
align="left"
prop="status"
width="110"
:formatter="statusFormat"
/>
<el-table-column label="成果" align="center" :show-overflow-tooltip="true" width="110" >
<el-table-column label="成果" align="left" :show-overflow-tooltip="true" width="110" >
<!-- <template slot-scope="scope" v-if="scope.row.annexName != null">-->
<template slot-scope="scope" v-if="scope.row.annexName != null &&scope.row.annexName != '[]'">
<el-button
@ -233,7 +234,7 @@ @@ -233,7 +234,7 @@
append-to-body>
<div style="margin-bottom: 20px;">
<el-radio-group v-model="uploadProject.type">
<el-radio-button v-for="(item) in excelType" :label="item.value" :key="item.id">{{item.name}}</el-radio-button>
<el-radio-button v-for="(item) in excelType" :label="item.value" :key="item.id" class="import-btn" >{{item.name}}</el-radio-button>
</el-radio-group>
@ -597,6 +598,11 @@ @@ -597,6 +598,11 @@
name:'任务书',
value:'bookExport'
},
{
name:'管理报告补全',
value:''
}
],
@ -1235,10 +1241,15 @@ @@ -1235,10 +1241,15 @@
.el-form-item{
margin-bottom: 0;
}
/*修改提示文字的颜色*/
::-webkit-input-placeholder {
color: #999;
color: #999 !important;
font-size: 16px;
}
}
.import-btn /deep/ .el-radio-button--medium .el-radio-button__inner{
padding: 8.2px !important;
}
}
// 分页
.explore_right_pages {

79
src/views/project/instruction/indexShow.vue
Unescape View File

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<el-col :span="8">
<el-form-item prop="title" label-width="100">
<div style="float: left">
<span slot="label" style="font-size: 20px;font-weight: 600">标题查询</span>
<span slot="label" style="font-size: 18px;font-weight: 600">标题查询:</span>
</div>
<el-input style="width:260px;margin-right: 10px;margin-left: 10px"
v-model="queryParams.title"
@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
<el-col :span="8">
<el-form-item label-width="100" prop="userName">
<div style="float: left;">
<span slot="label" class="font">建议人</span>
<span slot="label" class="font">建议人:</span>
</div>
<el-input style="width:160px;margin-right: 10px;margin-left: 10px"
v-model="queryParams.userName"
@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
@click="handleQueryButton"
>图表</el-button
>
<el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport" >导入</el-button>
<el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport" class="button-import">导入</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" >重置</el-button>
</el-form-item>
</el-col>
@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
<el-col :span="16">
<el-form-item label-width="100" prop="year">
<div class="lab">
<span slot="label" class="font">项目年份</span>
<span slot="label" class="font">项目年份:</span>
</div>
<el-radio-group v-model="queryParams.year" @change="handleQuery">
<el-radio-button label="0" border><span class="fontT">全部</span></el-radio-button>
@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
<el-col :span="24">
<el-form-item label-width="100" prop="secretLevel">
<div class="lab">
<span slot="label" class="font">秘密级别</span>
<span slot="label" class="font">秘密级别:</span>
</div>
<el-radio-group v-model="queryParams.secretLevel" size="small" @change="handleQuery">
<el-radio-button label="0" border><span class="fontT">全部</span></el-radio-button>
@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
</el-col>
</el-row>
<el-form-item label-width="100" prop="deptId">
<div class="lab"> <span slot="label" class="font">联系部门</span></div>
<div class="lab"> <span slot="label" class="font">联系部门:</span></div>
<el-radio-group v-model="queryParams.deptId" size="small" @change="handleQuery">
<el-radio-button label="0" border
@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@
<el-row>
<el-col :span="16">
<el-form-item prop="status" label-width="100">
<div class="lab"> <span slot="label" class="font">批示状态</span></div>
<div class="lab"> <span slot="label" class="font">批示状态:</span></div>
<el-radio-group v-model="queryParams.status" size="small" @change="handleQuery">
<el-radio-button label="0" border><span class="fontT">全部</span></el-radio-button>
<!-- <el-radio-button label="0" border>无批示</el-radio-button>-->
@ -146,11 +146,11 @@ @@ -146,11 +146,11 @@
<div class="dtable" style="margin-top: 25px">
<div style="height: 60px;background-color: rgb(242,247,253);margin-top: 20px;margin-bottom: 20px">
<div style="background-color: rgb(18,107,199);height:100%;width: 8px;float: left;"></div>
<div style="background-color: rgb(18,107,199);height:100%;width: 4px;float: left;"></div>
<h2 style="margin-bottom: 20px;position: relative ;top: 18px;margin-left: 20px" >
<span>上报院士建议&nbsp;&nbsp;:&nbsp;&nbsp;<span style="color: red">{{proposal}}</span></span>
<span style="margin-left: 20px">得到批示&nbsp;&nbsp;:&nbsp;&nbsp;<span style="color: red">{{instructions}}</span></span>
<h2 style="margin-bottom: 20px;position: relative ;top: 18px;margin-left: 20px" class="color333" >
<span>上报院士建议&nbsp;&nbsp;:&nbsp;&nbsp;<span style="color: #ce2700">{{proposal}}</span></span>
<span style="margin-left: 20px">得到批示&nbsp;&nbsp;:&nbsp;&nbsp;<span style="color: #ce2700">{{instructions}}</span></span>
</h2>
@ -162,15 +162,15 @@ @@ -162,15 +162,15 @@
:header-cell-style="{background:'#fff'}"
:row-class-name="tableRowClassName" >
<el-table-column label="序号" align="center" type="index" width="70" />
<el-table-column label="年度" align="center" prop="year" width="100" />
<el-table-column label="期数" align="center" prop="num" width="80" />
<el-table-column label="总期数" align="center" prop="totalNum" width="120" />
<el-table-column label="标题" align="center" prop="title" width="300" />
<el-table-column label="密级" align="center" prop="secretLevel" :formatter="secretFormat" width="120"/>
<el-table-column label="保密期限" align="center" prop="secretYear" width="120" />
<el-table-column label="建议人" align="center" prop="userName" width="300" />
<el-table-column label="学部" align="center" prop="deptName" />
<el-table-column label="印发日期" align="center" prop="printDate" width="180">
<el-table-column label="年度" align="left" prop="year" width="100" />
<el-table-column label="期数" align="left" prop="num" width="80" />
<el-table-column label="总期数" align="left" prop="totalNum" width="120" />
<el-table-column label="标题" align="left" prop="title" width="300" />
<el-table-column label="密级" align="left" prop="secretLevel" :formatter="secretFormat" width="120"/>
<el-table-column label="保密期限" align="left" prop="secretYear" width="120" />
<el-table-column label="建议人" align="left" prop="userName" width="300" />
<el-table-column label="学部" align="left" prop="deptName" />
<el-table-column label="印发日期" align="left" prop="printDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.printDate, '{y}-{m}-{d}') }}</span>
</template>
@ -181,7 +181,7 @@ @@ -181,7 +181,7 @@
<span v-else-if="scope.row.status == '1'">有批示</span>
</template>
</el-table-column>-->
<el-table-column label="附件" align="center" :show-overflow-tooltip="true" width="110" >
<el-table-column label="附件" align="left" :show-overflow-tooltip="true" width="110" >
<!-- <template slot-scope="scope" v-if="scope.row.annexName != null">-->
<template slot-scope="scope" v-if="scope.row.adviseFile != null &&scope.row.adviseFile != '[]'">
<el-button
@ -192,7 +192,7 @@ @@ -192,7 +192,7 @@
>附件下载</el-button>
</template>
</el-table-column>
<el-table-column label="批示情况" align="center" prop="instructions" />
<el-table-column label="批示情况" align="left" prop="instructions" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -934,17 +934,25 @@ export default { @@ -934,17 +934,25 @@ export default {
background-color: rgb(246,247,251);
}
.circleButton {
/deep/ .el-radio-button__inner {
padding: 9px 10px;
font-size: 12px;
margin: 6px 10px;
border: 1px;
border-radius: 17px !important;
/*background-color: #f2f1f5;*/
}
.el-form-item{
margin-bottom: 0;
}
/deep/ .el-radio-button__inner {
padding: 6px 17px;
font-size: 12px;
margin: 16px 10px 4px;
border: 1px;
border-radius: 17px !important;
/*background-color: #f2f1f5;*/
}
/deep/ .el-input__inner {
border-color: #ddd !important;
padding: 10px;
}
.el-form-item{
margin-bottom: 0;
}
::-webkit-input-placeholder {
color: #999 !important;
font-size: 16px;
}
}
.explore_right_pages {
@ -981,15 +989,14 @@ export default { @@ -981,15 +989,14 @@ export default {
left:auto;
}
.fontT{
font-size: 20px;
font-size: 18px;
}
.lab{
float: left;
margin-top: 10px
}
.font{
font-size: 20px;
font-size: 18px;
font-weight: 700;
}
/deep/ .dtable{

36
src/views/project/result/queryList.vue
Unescape View File

@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
<el-col :span="6">
<el-form-item label-width="100" prop="name">
<div style="float: left">
<span slot="label" style="font-size: 20px;font-weight: 600" >项目名称</span>
<span slot="label" style="font-size: 18px;font-weight: 600" >项目名称:</span>
</div>
<el-input style="width:260px;margin-left: 10px"
v-model="queryParams.name"
@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
<el-col :span="10">
<el-form-item label-width="100" prop="userName">
<div style="float: left;">
<span slot="label" style="font-size: 20px;font-weight: 600">项目负责人</span>
<span slot="label" style="font-size: 18px;font-weight: 600">项目负责人：</span>
</div>
<el-input style="width:260px"
v-model="queryParams.userName"
@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
@keyup.enter.native="handleQuery"
@blur="handleQuery"/>
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
<el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport" style="margin-left: 10px">导入</el-button>
<el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport" style="margin-left: 10px" class="button-import">导入</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
<el-form-item label-width="100" prop="deptId" style="margin-top: 5px">
<div style="float: left;margin-top: 10px">
<span slot="label" style="font-size: 20px;font-weight: 700">联系部门</span>
<span slot="label" style="font-size: 20px;font-weight: 700">联系部门：</span>
</div>
<el-radio-group v-model="queryParams.deptId" size="small" @change="handleQuery">
<el-radio-button label="0" border
@ -100,14 +100,14 @@ @@ -100,14 +100,14 @@
</el-table-column>
<el-table-column
label="项目名称"
align="center"
align="left"
prop="name"
sortable="custom"
/>
<el-table-column label="推荐部门" align="center" prop="deptName" width="440"/>
<el-table-column label="负责人" align="center" prop="userName" width="220" />
<el-table-column label="成果简版" align="center" :show-overflow-tooltip="true" width="150" >
<el-table-column label="推荐部门" align="left" prop="deptName" width="440"/>
<el-table-column label="负责人" align="left" prop="userName" width="220" />
<el-table-column label="成果简版" align="left" :show-overflow-tooltip="true" width="150" >
<!-- <template slot-scope="scope" v-if="scope.row.annexName != null">-->
<template slot-scope="scope" v-if="scope.row.simpleFile != null &&scope.row.simpleFile != '[]'">
<el-button
@ -118,7 +118,7 @@ @@ -118,7 +118,7 @@
>附件下载</el-button>
</template>
</el-table-column>
<el-table-column label="成果全版" align="center" :show-overflow-tooltip="true" width="150" >
<el-table-column label="成果全版" align="left" :show-overflow-tooltip="true" width="150" >
<!-- <template slot-scope="scope" v-if="scope.row.annexName != null">-->
<template slot-scope="scope" v-if="scope.row.allFile != null &&scope.row.allFile != '[]'">
<el-button
@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
>附件下载</el-button>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" width="300"/>
<el-table-column label="备注" align="left" prop="remark" width="300"/>
</el-table>
</div>
@ -757,13 +757,21 @@ import { getToken } from "@/utils/auth"; @@ -757,13 +757,21 @@ import { getToken } from "@/utils/auth";
}
.circleButton {
/deep/ .el-radio-button__inner {
padding: 9px 10px;
padding: 6px 17px;
font-size: 12px;
margin: 6px 10px;
margin: 16px 10px 4px;
border: 1px;
border-radius: 17px !important;
/*background-color: #f2f1f5;*/
}
/deep/ .el-input__inner {
border-color: #ddd !important;
padding: 10px;
}
::-webkit-input-placeholder {
color: #999 !important;
font-size: 16px;
}
.explore_right_pages {
@ -806,5 +814,7 @@ import { getToken } from "@/utils/auth"; @@ -806,5 +814,7 @@ import { getToken } from "@/utils/auth";
background: #f5f6fa;
}
}
/deep/ .el-radio-button__inner{
font-size: 18px !important;
}
</style>

Write Preview
Loading…
Cancel
Save