From f023d8cc02047320c8c200311dbdac65307105e1 Mon Sep 17 00:00:00 2001 From: xcool <2350444842@qq.com> Date: Mon, 17 Oct 2022 22:53:49 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=BF=83=E4=B8=AD=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 7 + .../components/diagram/newBtnList.vue | 7 +- .../components/diagram/newSearch.vue | 6 +- .../use-generator-table-columns.js | 17 +- src/views/DataAnalyse/index.vue | 9 +- src/views/DataAnalyse/particulars/list.vue | 1 + src/views/DataAnalyse/particulars/test.vue | 632 ++++++++++++++++++ 7 files changed, 671 insertions(+), 8 deletions(-) create mode 100644 src/views/DataAnalyse/particulars/test.vue diff --git a/src/router/index.js b/src/router/index.js index 7cfed80d..d0d73f10 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -159,6 +159,13 @@ const constantRoutes = [ meta: { showPublish: false, showPreview: false, showShare: true, showDownload: true }, component: () => import(/* webpackChunkName: "analyse" */ "@/views/DataAnalyse/particulars/list") }, + { + path: "test-particulars", + name: "TestParticulars", + meta: { keepAlive: true }, + meta: { showPublish: false, showPreview: false, showShare: true, showDownload: true }, + component: () => import(/* webpackChunkName: "analyse" */ "@/views/DataAnalyse/particulars/test") + }, { path: "diagram", name: "Diagram", diff --git a/src/views/DataAnalyse/components/diagram/newBtnList.vue b/src/views/DataAnalyse/components/diagram/newBtnList.vue index dc59b2fb..fff24feb 100644 --- a/src/views/DataAnalyse/components/diagram/newBtnList.vue +++ b/src/views/DataAnalyse/components/diagram/newBtnList.vue @@ -50,6 +50,7 @@ --> + 无效样本处理 列表配置 @@ -101,6 +102,8 @@ test2:null }) const opList = ref([ + {value:'3',label:'标记'}, + {value:'4',label:'取消标记'}, {value:'0',label:'下载答卷'}, {value:'1',label:'导出数据'}, {value:'2',label:'删除'} @@ -127,8 +130,8 @@ } const dataList = ref([ // {value:'0',label:'添加数据'}, - // {value:'1',label:'导入数据'}, - {value:'2',label:'导出数据'}, + {value:'1',label:'导入数据'}, + //{value:'2',label:'导出数据'}, ]) // 添加数据 导入数据 导出数据 const dataChange = (e)=>{ diff --git a/src/views/DataAnalyse/components/diagram/newSearch.vue b/src/views/DataAnalyse/components/diagram/newSearch.vue index 56a87efa..b15eefa3 100644 --- a/src/views/DataAnalyse/components/diagram/newSearch.vue +++ b/src/views/DataAnalyse/components/diagram/newSearch.vue @@ -342,12 +342,12 @@ - +
{ const arr = Object.entries(currentValue).map(([key, value]) => ({ ...value, @@ -33,17 +45,20 @@ export default function useGeneratorTableColumns(columns, options = {}) { // 手动修改作答ID数组位置 const snData = result.find(el=>el.key =='id') result = result.filter(el=>el.key!='id') + if(snData)result.unshift(snData) + result.unshift(columnsCheck); if(options.show_operator) { result.push({ title: '操作', key: 'operation', dataIndex: 'operation', - width: 130, + width: 250, slots: {customRender: "operation" }, fixed: 'right', }) } + return result } watch(columns, (data) => { diff --git a/src/views/DataAnalyse/index.vue b/src/views/DataAnalyse/index.vue index 85c5ff6f..bc084998 100644 --- a/src/views/DataAnalyse/index.vue +++ b/src/views/DataAnalyse/index.vue @@ -72,8 +72,13 @@ export default defineComponent({ name: '明细数据', icon: '', children: [ - { - name: '原始数据', + // { + // name: '测试数据', + // icon: '', + // path: '/survey/analyse/test-particulars' + // }, + { + name: '作答数据', icon: '', path: '/survey/analyse/data-particulars' }, diff --git a/src/views/DataAnalyse/particulars/list.vue b/src/views/DataAnalyse/particulars/list.vue index fc39fcfa..3bd9d602 100644 --- a/src/views/DataAnalyse/particulars/list.vue +++ b/src/views/DataAnalyse/particulars/list.vue @@ -78,6 +78,7 @@ >