决策大屏定制大屏调整

app/controller/datacollect_controller.js

@@ -65,10 +65,10 @@ module.exports = app => {
                 const projectData = await ctx.service.project.getDataById(ctx.session.sessionProject.id);
                 ctx.subProject.data_collect_pages = ctx.subProject.data_collect_pages ? ctx.subProject.data_collect_pages.split(',') : [];
                 if (ctx.params.index) {
-                    ctx.subProject.dataCollect = parseInt(ctx.params.index);
+                    ctx.subProject.data_collect = parseInt(ctx.params.index);
                 }
                 const is_dz2 = ['P0505', 'P0506', 'P1201', 'P1202', 'GY18Y', 'GYJJ1', 'P1103'].indexOf(ctx.session.sessionProject.code) !== -1
-                    && ctx.subProject.data_collect_pages.includes('6') && ctx.subProject.dataCollect === 6;
+                    && ctx.subProject.data_collect_pages.includes('6') && ctx.subProject.data_collect === 6;
                 const renderData = {
                     projectData,
                     noticeList,

app/controller/sub_proj_setting_controller.js

@@ -478,7 +478,7 @@ module.exports = app => {
                             data_collect: data.data_collect,
                             data_collect_pages: data.data_collect_pages.join(','),
                         }, {id: ctx.subProject.id});
-                        ctx.subProject.dataCollect = data.data_collect;
+                        ctx.subProject.data_collect = data.data_collect;
                         ctx.subProject.showDataCollect = data.data_collect ? 1 : 0;
                         break;
                     case 'add-audit':

app/middleware/sub_project_check.js

@@ -62,7 +62,7 @@ module.exports = options => {
             const accountInfo = yield this.service.projectAccount.getDataById(this.session.sessionUser.accountId);
             const projectData = yield this.service.project.getDataById(this.session.sessionProject.id);
             let showDataCollect = 0;
-            if (projectData.data_collect && this.subProject.page_show.openDataCollect) {
+            if (this.subProject.data_collect && this.subProject.page_show.openDataCollect) {
                 if (this.session.sessionUser.is_admin) {
                     showDataCollect = 1;
                 } else {

app/public/js/datacollect_scroll.js

@@ -67,6 +67,7 @@ function roll3(t) {
     var ul5 = document.getElementById("comment5");
     var ul6 = document.getElementById("comment6");
     var ulbox3 = document.getElementById("review_box3");
+    if (!ul5 || !ul6) return;
     ul6.innerHTML = ul5.innerHTML;
     ulbox3.scrollTop = 0; // 开始无滚动时设为0
     // var timer = setInterval(rollStart, t); // 设置定时器，参数t用在这为间隔时间（单位毫秒），参数t越小，滚动速度越快

app/service/project_account.js

@@ -194,7 +194,7 @@ module.exports = app => {
                         name: projectData.name,
                         userAccount: projectData.user_account,
                         custom: projectData.custom,
-                        dataCollect: projectData.data_collect,
+                        // dataCollect: projectData.data_collect,
                         page_show: await this.getPageShow(projectData.page_show),
                     };