Browse Source

完善

master
yangzhou-cyber 3 years ago
parent
commit
d7346504b5
11 changed files with 98 additions and 28 deletions
  1. +5
    -0
      package-lock.json
  2. +2
    -2
      package.json
  3. +1
    -1
      src/views/assessingTarget/basicTarget.vue
  4. +2
    -1
      src/views/assessingTarget/reward.vue
  5. +1
    -1
      src/views/assessingTarget/taskTable.vue
  6. +20
    -1
      src/views/basicTable/category.vue
  7. +63
    -18
      src/views/basicTable/conventional.vue
  8. +1
    -1
      src/views/summary/basicTarget.vue
  9. +1
    -1
      src/views/summary/constraint.vue
  10. +1
    -1
      src/views/summary/department.vue
  11. +1
    -1
      src/views/summary/reward.vue

+ 5
- 0
package-lock.json View File

@@ -12221,6 +12221,11 @@
"integrity": "sha1-UylVzB6yCKPZkLOp+acFdGV+CPI=",
"dev": true
},
"vue-lazyload": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.3.3.tgz",
"integrity": "sha512-uHnq0FTEeNmqnbBC2aRKlmtd9LofMZ6Q3mWvgfLa+i9vhxU8fDK+nGs9c1iVT85axSua/AUnMttIq3xPaU9G3A=="
},
"vue-loader": {
"version": "15.9.4",
"resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-15.9.4.tgz?cache=0&sync_timestamp=1603783046154&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-15.9.4.tgz",

+ 2
- 2
package.json View File

@@ -59,8 +59,8 @@
"parser": "babel-eslint"
},
"rules": {
"no-debugger":"off",
"no-console":"off"
"no-debugger": "off",
"no-console": "off"
}
},
"browserslist": [

+ 1
- 1
src/views/assessingTarget/basicTarget.vue View File

@@ -1,5 +1,5 @@
<template>
<div class="basic-target content-box">
<div class="basic-target ele-body">
<tab />
<search :type="1" />
</div>

+ 2
- 1
src/views/assessingTarget/reward.vue View File

@@ -1,5 +1,6 @@
<template>
<div class="reward content-box"></div>
<div class="reward ele-body">
</div>
</template>

<script>

+ 1
- 1
src/views/assessingTarget/taskTable.vue View File

@@ -1,5 +1,5 @@
<template>
<div class="task-table">
<div class="task-table ele-body">
<el-table :data="dataList" border highlight-current-row>
<el-table-column type="index" label="序号"> </el-table-column>
<template v-if="type == 1 || type == 2">

+ 20
- 1
src/views/basicTable/category.vue View File

@@ -7,7 +7,12 @@
<el-button size="small" type="default">批量删除</el-button>
<el-button size="small" type="default">批量导入</el-button>
</div>
<el-table highlight-current-row :data="dataList" border height="calc(100vh - 215px)">
<el-table
highlight-current-row
:data="dataList"
border
height="calc(100vh - 360px)"
>
<el-table-column
type="selection"
width="50"
@@ -55,6 +60,15 @@
align="center"
></el-table-column>
</el-table>
<el-pagination
:current-page="page.page"
:page-size="page.limit"
:total="count"
:background="true"
layout="total, prev, pager, next, jumper"
:pager-count="5"
class="ele-pagination-circle"
/>
</el-card>
</div>
</template>
@@ -70,6 +84,11 @@ export default {
return {
searchParams: {},
dataList: [],
count:0,
page:{
page:1,
limit:10,
}
};
},
created() {

+ 63
- 18
src/views/basicTable/conventional.vue View File

@@ -1,23 +1,68 @@
<template>
<div class="conventional content-box">
<search :search-params="searchParams" />
<div class="operating">
<el-button size="small" type="warning">新增</el-button>
<el-button size="small" type="default">批量删除</el-button>
<el-button size="small" type="default">批量导入</el-button>
</div>
<div class="conventional ele-body">
<el-card shadow="never">
<search :search-params="searchParams" />
<div class="operating">
<el-button size="small" type="warning">新增</el-button>
<el-button size="small" type="default">批量删除</el-button>
<el-button size="small" type="default">批量导入</el-button>
</div>

<el-table highlight-current-row border :data="dataList">
<el-table-column type="selection" width="50" align="center"></el-table-column>
<el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
<el-table-column label="考核年度" min-width="80" align="center"></el-table-column>
<el-table-column label="表编号" min-width="80" align="center"></el-table-column>
<el-table-column label="表格名称" min-width="100" align="center"></el-table-column>
<el-table-column label="一级指标" align="center" min-width="150"></el-table-column>
<el-table-column label="二级指标" align="center" min-width="150"></el-table-column>
<el-table-column label="考核内容数" align="center" min-width="80"></el-table-column>
<el-table-column label="操作" min-width="150" align="center"></el-table-column>
</el-table>
<el-table
highlight-current-row
border
:data="dataList"
height="calc(100vh - 360px)"
s
>
<el-table-column
type="selection"
width="50"
align="center"
></el-table-column>
<el-table-column
type="index"
label="序号"
width="50"
align="center"
></el-table-column>
<el-table-column
label="考核年度"
min-width="80"
align="center"
></el-table-column>
<el-table-column
label="表编号"
min-width="80"
align="center"
></el-table-column>
<el-table-column
label="表格名称"
min-width="100"
align="center"
></el-table-column>
<el-table-column
label="一级指标"
align="center"
min-width="150"
></el-table-column>
<el-table-column
label="二级指标"
align="center"
min-width="150"
></el-table-column>
<el-table-column
label="考核内容数"
align="center"
min-width="80"
></el-table-column>
<el-table-column
label="操作"
min-width="150"
align="center"
></el-table-column>
</el-table>
</el-card>
</div>
</template>


+ 1
- 1
src/views/summary/basicTarget.vue View File

@@ -1,5 +1,5 @@
<template>
<div class="basic-target content-box"></div>
<div class="basic-target ele-body"></div>
</template>

<script>

+ 1
- 1
src/views/summary/constraint.vue View File

@@ -1,5 +1,5 @@
<template>
<div class="constraint content-box"></div>
<div class="constraint ele-body"></div>
</template>

<script>

+ 1
- 1
src/views/summary/department.vue View File

@@ -1,5 +1,5 @@
<template>
<div class="department content-box">
<div class="department ele-body">
<div class="line"></div>
<el-table :data="dataList" highlight-current-row border>
<el-table-column type="index" label="序号"></el-table-column>

+ 1
- 1
src/views/summary/reward.vue View File

@@ -1,5 +1,5 @@
<template>
<div class="reward content-box">
<div class="reward ele-body">
<el-table :data="dataList" style="width:500px;">
<el-table-column label="测试">
<template slot-scope="{row}">

Loading…
Cancel
Save