فهرست منبع

考核区代码提交测试

zhangh 2 سال پیش
والد
کامیت
65cc3f0f4d

+ 9 - 0
src/api/AssessmentArea/AssessmentArea.js

@@ -0,0 +1,9 @@
+import request from '@/router/axios';
+
+export const queryUserAssessmentPage = (params) => {
+    return request({
+        url: '/api/blade-manager/assessmentUser/queryUserAssessmentPage',
+        method: 'get',
+        params
+    })
+}

+ 214 - 189
src/router/views/index.js

@@ -1,218 +1,243 @@
 import Layout from '@/page/index/'
 
 export default [{
-    path: '/wel',
-    component: Layout,
-    redirect: '/wel/index',
-    children: [{
-            path: '/certificate/list',
-            name: '电签列表',
+        path: '/wel',
+        component: Layout,
+        redirect: '/wel/index',
+        children: [{
+                path: '/certificate/list',
+                name: '电签列表',
+                meta: {
+                    i18n: 'ElectricSignaturelist'
+                },
+                component: () =>
+                    import ( /* webpackChunkName: "views" */ '@/views/certificate/list')
+            }, {
+                path: '/certificate/list/addList',
+                name: '新增电签',
+                meta: {
+                    i18n: 'AddATelegram'
+                },
+                component: () =>
+                    import ( /* webpackChunkName: "views" */ '@/views/certificate/lists/addList')
+            },
+            {
+                path: '/certificate/management/see',
+                name: '查看证书',
+                meta: {
+                    i18n: 'ViewCertificate'
+                },
+                component: () =>
+                    import ( /* webpackChunkName: "views" */ '@/views/certificate/managements/see')
+            },
+            {
+                path: '/certificate/management',
+                name: '电签管理',
+                meta: {
+                    i18n: 'ElectricitySignManagement'
+                },
+                component: () =>
+                    import ( /* webpackChunkName: "views" */ '@/views/certificate/management')
+            },
+            {
+                path: '/AssessmentArea',
+                name: '考核区',
+                meta: {
+                    i18n: 'AssessmentArea'
+                },
+                component: () =>
+                    import ( /* webpackChunkName: "views" */ '@/views/AssessmentArea/index')
+            },
+            {
+                path: 'index',
+                name: '首页',
+                meta: {
+                    i18n: 'dashboard'
+                },
+                component: () =>
+                    import ( /* webpackChunkName: "views" */ '@/views/wel/index')
+            },
+            {
+                path: 'dashboard',
+                name: '控制台',
+                meta: {
+                    i18n: 'dashboard',
+                    menu: false,
+                },
+                component: () =>
+                    import ( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
+            }
+        ]
+    }, {
+        path: '/test',
+        component: Layout,
+        redirect: '/test/index',
+        children: [{
+            path: 'index',
+            name: '测试页',
             meta: {
-                i18n: 'ElectricSignaturelist'
+                i18n: 'test'
             },
             component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/certificate/list')
-        }, {
-            path: '/certificate/list/addList',
-            name: '新增电签',
+                import ( /* webpackChunkName: "views" */ '@/views/util/test')
+        }]
+    }, {
+        path: '/dict-horizontal',
+        component: Layout,
+        redirect: '/dict-horizontal/index',
+        children: [{
+            path: 'index',
+            name: '字典管理',
             meta: {
-                i18n: 'AddATelegram'
+                i18n: 'dict'
             },
             component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/certificate/lists/addList')
-        },
-        {
-            path: '/certificate/management/see',
-            name: '查看证书',
+                import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
+        }]
+    }, {
+        path: '/dict-vertical',
+        component: Layout,
+        redirect: '/dict-vertical/index',
+        children: [{
+            path: 'index',
+            name: '字典管理',
             meta: {
-                i18n: 'ViewCertificate'
+                i18n: 'dict'
             },
             component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/certificate/managements/see')
-        },
-        {
-            path: '/certificate/management',
-            name: '电签管理',
+                import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
+        }]
+    }, {
+        path: '/info',
+        component: Layout,
+        redirect: '/info/index',
+        children: [{
+            path: 'index',
+            name: '个人信息',
             meta: {
-                i18n: 'ElectricitySignManagement'
+                i18n: 'info'
             },
             component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/certificate/management')
-        },
-        {
-            path: 'index',
-            name: '首页',
+                import ( /* webpackChunkName: "views" */ '@/views/system/userinfo')
+        }]
+    }, {
+        path: '/work/process/leave',
+        component: Layout,
+        redirect: '/work/process/leave/form',
+        children: [{
+            path: 'form/:processDefinitionId',
+            name: '请假流程',
             meta: {
-                i18n: 'dashboard'
+                i18n: 'work'
             },
             component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/wel/index')
-        },
-        {
-            path: 'dashboard',
-            name: '控制台',
+                import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
+        }, {
+            path: 'handle/:taskId/:processInstanceId/:businessId',
+            name: '处理请假流程',
             meta: {
-                i18n: 'dashboard',
-                menu: false,
+                i18n: 'work'
             },
             component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
-        }
-    ]
-}, {
-    path: '/test',
-    component: Layout,
-    redirect: '/test/index',
-    children: [{
-        path: 'index',
-        name: '测试页',
-        meta: {
-            i18n: 'test'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/util/test')
-    }]
-}, {
-    path: '/dict-horizontal',
-    component: Layout,
-    redirect: '/dict-horizontal/index',
-    children: [{
-        path: 'index',
-        name: '字典管理',
-        meta: {
-            i18n: 'dict'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
-    }]
-}, {
-    path: '/dict-vertical',
-    component: Layout,
-    redirect: '/dict-vertical/index',
-    children: [{
-        path: 'index',
-        name: '字典管理',
-        meta: {
-            i18n: 'dict'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
-    }]
-}, {
-    path: '/info',
-    component: Layout,
-    redirect: '/info/index',
-    children: [{
-        path: 'index',
-        name: '个人信息',
-        meta: {
-            i18n: 'info'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/system/userinfo')
-    }]
-}, {
-    path: '/work/process/leave',
-    component: Layout,
-    redirect: '/work/process/leave/form',
-    children: [{
-        path: 'form/:processDefinitionId',
-        name: '请假流程',
-        meta: {
-            i18n: 'work'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
+                import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
+        }, {
+            path: 'detail/:processInstanceId/:businessId',
+            name: '请假流程详情',
+            meta: {
+                i18n: 'work'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
+        }]
+    }, {
+        path: '/wbs',
+        component: Layout,
+        redirect: '/wbs/edit',
+        children: [{
+            path: 'edit/:id',
+            name: '编辑WBS树',
+            meta: {
+                i18n: 'edit'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/manager/wbsinfo/edit')
+        }]
     }, {
-        path: 'handle/:taskId/:processInstanceId/:businessId',
-        name: '处理请假流程',
-        meta: {
-            i18n: 'work'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
+        path: '/contract',
+        component: Layout,
+        redirect: '/contract/detail',
+        children: [{
+            path: 'detail',
+            name: '创建合同段',
+            meta: {
+                i18n: 'edit'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/manager/contractinfo/detail')
+        }]
     }, {
-        path: 'detail/:processInstanceId/:businessId',
-        name: '请假流程详情',
-        meta: {
-            i18n: 'work'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
-    }]
-}, {
-    path: '/wbs',
-    component: Layout,
-    redirect: '/wbs/edit',
-    children: [{
-        path: 'edit/:id',
-        name: '编辑WBS树',
-        meta: {
-            i18n: 'edit'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/manager/wbsinfo/edit')
-    }]
-}, {
-    path: '/contract',
-    component: Layout,
-    redirect: '/contract/detail',
-    children: [{
-        path: 'detail',
-        name: '创建合同段',
-        meta: {
-            i18n: 'edit'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/manager/contractinfo/detail')
-    }]
-}, {
-    path: '/excel',
-    component: Layout,
-    redirect: '/excel/excelmodel',
-    children: [{
-        path: 'excelmodel/:id',
-        name: '清表模板',
-        meta: {
-            i18n: 'excelmodel'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/exctab/excelmodel/excelmodel')
-    }]
-}, {
-    path: '/project',
-    component: Layout,
-    redirect: '/project/tree',
-    children: [{
-            path: 'tree',
-            name: '私有WBS',
+        path: '/excel',
+        component: Layout,
+        redirect: '/excel/excelmodel',
+        children: [{
+            path: 'excelmodel/:id',
+            name: '清表模板',
+            meta: {
+                i18n: 'excelmodel'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/exctab/excelmodel/excelmodel')
+        }]
+    },
+    {
+        path: '/excels',
+        component: Layout,
+        redirect: '/excels/ElementIdentification',
+        children: [{
+            path: 'ElementIdentification/:id',
+            name: '元素识别',
             meta: {
-                i18n: 'privateTree'
+                i18n: 'ElementIdentification'
             },
             component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/manager/projectinfo/tree')
-        },
-        {
-            path: 'editElement',
-            name: '编辑元素',
+                import ( /* webpackChunkName: "views" */ '@/views/exctab/ElementIdentification/index')
+        }]
+    },
+    {
+        path: '/project',
+        component: Layout,
+        redirect: '/project/tree',
+        children: [{
+                path: 'tree',
+                name: '私有WBS',
+                meta: {
+                    i18n: 'privateTree'
+                },
+                component: () =>
+                    import ( /* webpackChunkName: "views" */ '@/views/manager/projectinfo/tree')
+            },
+            {
+                path: 'editElement',
+                name: '编辑元素',
+                meta: {
+                    i18n: 'editElement'
+                },
+                component: () =>
+                    import ( /* webpackChunkName: "views" */ '@/views/manager/projectinfo/editElement/editElement')
+            }
+        ]
+    }, {
+        path: '/formula',
+        component: Layout,
+        redirect: '/formula/edit',
+        children: [{
+            path: 'edit',
+            name: '编辑公式',
             meta: {
-                i18n: 'editElement'
+                i18n: 'formula'
             },
             component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/manager/projectinfo/editElement/editElement')
-        }
-    ]
-}, {
-    path: '/formula',
-    component: Layout,
-    redirect: '/formula/edit',
-    children: [{
-        path: 'edit',
-        name: '编辑公式',
-        meta: {
-            i18n: 'formula'
-        },
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/formula/edit')
-    }]
-}, ]
+                import ( /* webpackChunkName: "views" */ '@/views/formula/edit')
+        }]
+    },
+]

+ 136 - 0
src/views/AssessmentArea/index.vue

@@ -0,0 +1,136 @@
+<template>
+  <basic-container class="AssessmentArea">
+    <div>
+      <el-select
+        v-model="value"
+        placeholder="请选择"
+      >
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+
+      <el-date-picker
+        v-model="value"
+        type="datetimerange"
+        align="right"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        :default-time="['12:00:00', '08:00:00']"
+      >
+      </el-date-picker>
+      </el-date-picker>
+      <el-button
+        type="primary"
+        class="marleft20"
+      >搜索</el-button>
+    </div>
+    <el-table
+      class="martop20"
+      :data="tableData"
+      border
+      style="width: 100%"
+    >
+      <el-table-column
+        prop="createTime"
+        label="考核时间"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="assessmentMoney"
+        label="考核金额(元)"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="assessmentContent"
+        label="考核原因"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="projectName"
+        label="项目"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="contractName"
+        label="合同段"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="userOpinionId"
+        label="消息ID"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="opinionContent"
+        label="问题描述"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="fileUrlList"
+        label="图片"
+      >
+      </el-table-column>
+      <el-table-column label="操作"> </el-table-column>
+    </el-table>
+    <el-pagination
+      background
+      class="martop20"
+      layout="prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="pageIndex"
+      :page-size="pagesize"
+    >
+    </el-pagination>
+  </basic-container>
+</template>
+
+<script>
+import { queryUserAssessmentPage } from "@/api/AssessmentArea/AssessmentArea.js";
+export default {
+  data () {
+    return {
+      value: '',
+      options: [],
+      tableData: [],
+      total: 0,
+      pageIndex: 1,
+      pagesize: 10,
+    }
+  },
+  methods: {
+    //#region 分页
+    handleSizeChange (val) {//
+      this.pagesize = val
+    },
+    handleCurrentChange (val) {//
+      this.pageIndex = val
+    },
+    //#endregion
+
+    //#region 接口
+    async queryUserAssessmentPage () {
+      const { data: res } = await queryUserAssessmentPage({
+        size: this.pagesize,
+        current: this.pageIndex
+      })
+      console.log(res);
+      if (res.code == 200) {
+
+      }
+    }
+    //#endregion
+  },
+  created () {
+    this.queryUserAssessmentPage()
+  }
+}
+</script>
+<style lang="scss" scoped>
+</style>

+ 3 - 0
src/views/exctab/ElementIdentification/index.vue

@@ -0,0 +1,3 @@
+<template>
+  <div>元素识别</div>
+</template>

+ 11 - 1
src/views/exctab/exceltab.vue

@@ -43,6 +43,13 @@
           @click.stop="handleAdd(scope.row, scope.index)"
         >清表模版
         </el-button>
+        <el-button
+          type="text"
+          icon="el-icon-s-opportunity"
+          size="small"
+          @click.stop="ElementIdentification(scope.row, scope.index)"
+        >元素识别
+        </el-button>
       </template>
       <template
         slot-scope="{row}"
@@ -83,7 +90,7 @@ export default {
         index: true,
         viewBtn: true,
         selection: true,
-        menuWidth: 300,
+        menuWidth: 400,
         dialogClickModal: false,
         column: [
           {
@@ -142,6 +149,9 @@ export default {
     handleAdd (row) {
       this.$router.push('/excel/excelmodel/' + row.id);
     },
+    ElementIdentification (row) {
+      this.$router.push('/excels/ElementIdentification/' + row.id);
+    },
     rowSave (row, done, loading) {
       add(row).then(() => {
         this.onLoad(this.page);