diff --git a/public/static/pdf/web/viewer.js b/public/static/pdf/web/viewer.js
index 7812bf82e..107e87dd3 100644
--- a/public/static/pdf/web/viewer.js
+++ b/public/static/pdf/web/viewer.js
@@ -6652,10 +6652,10 @@ var PDFPageView = function () {
           watermark_rows: 10,//水印行数
           watermark_cols: 10,//水印列数
           watermark_x_space: 100,//水印x轴间隔
-          watermark_y_space: 150,//水印y轴间隔
-          watermark_color: '#d9d9d9',//水印字体颜色
-          watermark_alpha: 0.3,//水印透明度
-          watermark_fontsize: '13px',//水印字体大小
+          watermark_y_space: 180,//水印y轴间隔
+          watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
+          watermark_alpha: 0.5,//水印透明度
+          watermark_fontsize: '20px',//水印字体大小
           watermark_font: '微软雅黑',//水印字体
           watermark_width: 120,//水印宽度
           watermark_height: 80,//水印长度
@@ -6672,13 +6672,20 @@ var PDFPageView = function () {
         var pdf_page =document.getElementById("viewer");
         //如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔
         if (defaultSettings.watermark_cols == 0 || (parseInt(defaultSettings.watermark_x + defaultSettings.watermark_width * defaultSettings.watermark_cols + defaultSettings.watermark_x_space * (defaultSettings.watermark_cols - 1)) > page_width)) {
-          defaultSettings.watermark_cols = parseInt((page_width - defaultSettings.watermark_x + defaultSettings.watermark_x_space) / (defaultSettings.watermark_width + defaultSettings.watermark_x_space));
+          defaultSettings.watermark_cols = parseInt((page_width - defaultSettings.watermark_x + defaultSettings.watermark_x_space) / (defaultSettings.watermark_width + defaultSettings.watermark_x_space))-1;
+          console.log("------------------------------------")
+          console.log(defaultSettings.watermark_cols)
           defaultSettings.watermark_x_space = parseInt((page_width - defaultSettings.watermark_x - defaultSettings.watermark_width * defaultSettings.watermark_cols) / (defaultSettings.watermark_cols - 1));
+          console.log(defaultSettings.watermark_x_space)
         }
         //如果将水印行数设置为0，或水印行数设置过大，超过页面最大长度，则重新计算水印行数和水印y轴间隔
         if (defaultSettings.watermark_rows == 0 || (parseInt(defaultSettings.watermark_y + defaultSettings.watermark_height * defaultSettings.watermark_rows + defaultSettings.watermark_y_space * (defaultSettings.watermark_rows - 1)) > page_height)) {
-          defaultSettings.watermark_rows = parseInt((defaultSettings.watermark_y_space + page_height - defaultSettings.watermark_y) / (defaultSettings.watermark_height + defaultSettings.watermark_y_space));
+          defaultSettings.watermark_rows = parseInt((defaultSettings.watermark_y_space + page_height - defaultSettings.watermark_y) / (defaultSettings.watermark_height + defaultSettings.watermark_y_space))-3;
           defaultSettings.watermark_y_space = parseInt(((page_height - defaultSettings.watermark_y) - defaultSettings.watermark_height * defaultSettings.watermark_rows) / (defaultSettings.watermark_rows - 1));
+          console.log("------------------------------------")
+          console.log(defaultSettings.watermark_rows+10)
+          console.log(defaultSettings.watermark_y_space)
+
         }
         var x;
         var y;
diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index 0129205f6..b22f3368d 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -638,6 +638,633 @@ export default {
             })
           }
           break
+        case '14':
+          //参与外部标准制修订信息提报
+          if (row.taskInfo === '下发责任工程师') {
+            this.$router.push({
+              name: 'cywbbzzxdStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '填写备案信息'){
+            this.$router.push({
+              name: 'cywbbzzxdStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '责任部门对接人审核'){
+            this.$router.push({
+              name: 'cywbbzzxdStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '标准法规工程师审核'){
+            this.$router.push({
+              name: 'cywbbzzxdStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '标准法规部部长批准'){
+            this.$router.push({
+              name: 'cywbbzzxdStep6',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+        case '15':
+          //加入标准化协会信息备案流程
+          if (row.taskInfo === '填写入会信息') {
+            this.$router.push({
+              name: 'jrbzhxhStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '标准法规工程师审核'){
+            this.$router.push({
+              name: 'jrbzhxhStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '标准法规部部长批准'){
+            this.$router.push({
+              name: 'jrbzhxhStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+        case '16':
+          //外部署名推荐审批流程
+          if (row.taskInfo === '会签') {
+            this.$router.push({
+              name: 'wbsmStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '标准法规部部长审核'){
+            this.$router.push({
+              name: 'wbsmStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '技术管理中心主任审定'){
+            this.$router.push({
+              name: 'wbsmStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '工程研究总院院长批准'){
+            this.$router.push({
+              name: 'wbsmStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '修改信息'){
+            this.$router.push({
+              name: 'wbsmStep1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+          // 外部标准化协会入会流程
+        case '20':
+          if (row.taskInfo === '技术委员会分委会主任/入会代表所在中心主任提名入会代表') {
+            this.$router.push({
+              name: 'bzrhStep2',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '入会代表填写入会信息表') {
+            this.$router.push({
+              name: 'bzrhStep3',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '入会人员所在部门负责人审核') {
+            this.$router.push({
+              name: 'bzrhStep4',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '标准法规工程师汇总修订') {
+            this.$router.push({
+              name: 'bzrhStep5',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if (row.taskInfo === '标准法规部主管领导审核') {
+            this.$router.push({
+              name: 'bzrhStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '费用管理部门会签') {
+            this.$router.push({
+              name: 'bzrhStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '技术委员会常务副主任/总院院长审定') {
+            this.$router.push({
+              name: 'bzrhStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '标准法规工程师汇总修订完毕'){
+            this.$router.push({
+              name: 'bzrhStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+        case '18':
+          if (row.taskInfo === '法规认证部副部长批准') {
+            this.$router.push({
+              name: 'zcchStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '公司副总批准') {
+            this.$router.push({
+              name: 'zcchStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '修订参会信息') {
+            this.$router.push({
+              name: 'zcchStep1-1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+          // 政策参会流程
+        case '19':
+          if (row.taskInfo === '申请人填写表单') {
+            this.$router.push({
+              name: 'zchhStep1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '审核员批准') {
+            this.$router.push({
+              name: 'zchhStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '申请人修订申请信息') {
+            this.$router.push({
+              name: 'zchhStep1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+
+        case '21':
+          if (row.taskInfo === '分委会主任/部门中心主任提名入会代表') {
+            this.$router.push({
+              name: 'bzchStep2',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '参会代表填写参会信息表') {
+            this.$router.push({
+              name: 'bzchStep3',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '参会人员所在部门中心主任审核') {
+            this.$router.push({
+              name: 'bzchStep4',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '标准法规工程师修订') {
+            this.$router.push({
+              name: 'bzchStep5',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '技术管理中心主任审批') {
+            this.$router.push({
+              name: 'bzchStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '费用管理部门会签') {
+            this.$router.push({
+              name: 'bzchStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '技术委员会常务副主任/总院院长审定') {
+            this.$router.push({
+              name: 'bzchStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '标准法规工程师修订完毕') {
+            this.$router.push({
+              name: 'bzchStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+
+          break
+        case '22':
+          this.$router.push({
+            name: 'bzhhStep2',
+            query:{
+              taskIds: row.taskIds,
+              prcId: row.prcId,
+              prcNum: row.prcNum,
+              prcName: row.prcName,
+              prcType: row.prcType
+            }
+          })
+          break
+        case 'laws2':
+          if (row.taskInfo === '责任对接人进行任务下发') {
+            this.$router.push({
+              name: 'zczqyjStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '责任人(责任工程师)填写意见'){
+            this.$router.push({
+              name: 'zczqyjStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '责任对接人审核'){
+            this.$router.push({
+              name: 'zczqyjStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规工程师单条审核'){
+            this.$router.push({
+              name: 'zczqyjStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规工程师修订'){
+            this.$router.push({
+              name: 'zczqyjStep6',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规认证部长审核'){
+            this.$router.push({
+              name: 'zczqyjStep7',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规认证部副总监审核'){
+            this.$router.push({
+              name: 'zczqyjStep8',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规认证部总监批准'){
+            this.$router.push({
+              name: 'zczqyjStep9',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+        case 'laws3':
+          if (row.taskInfo === '法规认证部长批准') {
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '法规认证部副总监批准'){
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '责任部门领导任务下发'){
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '责任人反馈情况'){
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep5-1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '责任部门领导批准'){
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep6',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规管理员审核'){
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep7-1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规认证部长审定'){
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep8',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规认证部副总监批准'){
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep9',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
 
       }
     },
diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue
index 28d7bce89..725176438 100644
--- a/src/pages/regulatoryRepository/nonConfomity/index.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/index.vue
@@ -6,9 +6,9 @@
          <el-tab-pane label="未符合项整改数据库" name="database">
            <rectification-database></rectification-database>
          </el-tab-pane>
-<!--         <el-tab-pane label="重点问题项管控" name="keynote">-->
-<!--           <key-issues></key-issues>-->
-<!--         </el-tab-pane>-->
+         <el-tab-pane label="重点问题项管控" name="keynote">
+           <key-issues></key-issues>
+         </el-tab-pane>
        </el-tabs>
      </div>
    </div>