fix:检测档案

src/views/platform/bpmn/bpmInstHis/corresponding/getReport.js

@@ -23,7 +23,6 @@ export default {
     },
 
     alertReport(vlues,id_) {
-      console.log(vlues,id_,"11111");
       this.srcUrl= this.$reportPash.replace("show", "pdf") +vlues+"&id_="+id_;
       // 42明鉴/吴/MJT-QP-7.1-01-R02合同评审表.rpx&id_='+ "1001804667832762368";
       // this.srcUrl= this.$reportPash.replace("show", "pdf") +'36内部审核程序/SGJS-CX-36-01B 年度内部审核计划.rpx&id_=969264116109672448';

src/views/platform/bpmn/bpmInstHis/listType/CMAOjiancedangan.vue

@@ -141,24 +141,24 @@
               >
                 <i class="el-icon-s-order"></i> 检测报告审批表
               </div>
-              <div v-if="false">
+              <div v-if="scope.row.shi_fou_yu_bao_ga !='否'">
                 <el-popover placement="left" width="200" trigger="triggerType">
                   <div
                     class="div_test item"
                     style="color: #85ce61"
                     slot="reference"
-                    @click="YubaogaoItem(scope.row)"
+                    @click="getFile(scope.row.shou_quan_qian_z)"
                   >
                     <i class="el-icon-s-order"></i> 预报告
                   </div>
                   <div class="three-item">
                     <div
                       style="color: #85ce61; cursor: pointer"
-                      v-for="it in yubaogaoitem"
-                      :key="it.id_"
-                      @click="yuReports(reports.yubaogao, it.id)"
+                      v-for="i in fileList"
+                      :key="i.id_"
+                      @click="preview(i)"
                     >
-                      {{ it.jian_ce_xiang_mu_ }}预报告记录
+                     {{ i.fileName }}.{{ i.ext }}
                     </div>
                   </div>
                 </el-popover>
@@ -317,9 +317,9 @@
       },
     },
     created() {
-      let sql ="select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cma'OR lei_bie_qu_fen_yu ='CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成')  ORDER BY create_time_ DESC limit 0,20";
+      let sql ="select * from t_mjjcbg WHERE  (lei_bie_qu_fen_yu ='cma'OR lei_bie_qu_fen_yu ='CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成')  ORDER BY create_time_ DESC limit 0,20";
       this.loadData(sql);
-      let sumsql ="select COUNT(*) AS sum  FROM t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')";
+      let sumsql ="select COUNT(*) AS sum  FROM t_mjjcbg WHERE  (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')";
       curdPost("sql", sumsql).then((response) => {
         this.total = response.variables.data[0].sum;
       });
@@ -399,9 +399,9 @@
             ")";
           curdPost("sql", itemSql).then((res) => {
             this_.itemInfo = res.variables.data;
-            for (var i = 0; i++; i < this_itemInfo) {
+            for (var i = 0; i < this_itemInfo.length;i++) {
               if (this_itemInfo[i].shi_fou_yu_bao_ga == "是") {
-                this_.yubaogaoitem.push(it);
+                this_.yubaogaoitem.push(this_.itemInfo[i]);
               }
             }
             if (this_.yubaogaoitem.length == 0) {
@@ -486,19 +486,19 @@
         var sql =
           "select * from t_mjjcbg " +
           moreSql +
-          " shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
+          " (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
         this.loadData(sql);
       },
       handleSizeChange(value) {
         this.currentPage4 = 1;
         let sql =
-          "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0," +
+          "select * from t_mjjcbg WHERE  (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0," +
           value;
         this.loadData(sql);
       },
       handleCurrentChange(value) {
         let sql =
-          "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')   and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit " +
+          "select * from t_mjjcbg WHERE  (lei_bie_qu_fen_yu ='CMA'OR lei_bie_qu_fen_yu ='cma')   and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit " +
           value +
           ", 20";
         this.loadData(sql);

src/views/platform/bpmn/bpmInstHis/listType/CMAjiancedangan.vue

@@ -134,24 +134,24 @@
               >
                 <i class="el-icon-s-order"></i> 检测报告审批表
               </div>
-              <div v-if="false">
+              <div v-if="scope.row.shi_fou_yu_bao_ga !='否'">
                 <el-popover placement="left" width="200" trigger="triggerType">
                   <div
                     class="div_test item"
                     style="color: #85ce61"
                     slot="reference"
-                    @click="YubaogaoItem(scope.row)"
+                    @click="getFile(scope.row.shou_quan_qian_z)"
                   >
                     <i class="el-icon-s-order"></i> 预报告
                   </div>
                   <div class="three-item">
                     <div
                       style="color: #85ce61; cursor: pointer"
-                      v-for="it in yubaogaoitem"
-                      :key="it.id_"
-                      @click="yuReports(reports.yubaogao, it.id)"
+                      v-for="i in fileList"
+                      :key="i.id_"
+                      @click="preview(i)"
                     >
-                      {{ it.jian_ce_xiang_mu_ }}预报告记录
+                     {{ i.fileName }}.{{ i.ext }}
                     </div>
                   </div>
                 </el-popover>
@@ -310,9 +310,11 @@
       },
     },
     created() {
-      let sql ="select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成')  ORDER BY create_time_ DESC limit 0,20";
+      let sql ="select * from t_mjjcbg WHERE (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成')  ORDER BY create_time_ DESC limit 0,20";
+      // let sql ="select * from t_mjjcbg WHERE (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成')  ORDER BY create_time_ DESC limit 0,20";
       this.loadData(sql);
-      let sumsql ="select COUNT(*) AS sum  FROM t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')";
+      let sumsql ="select COUNT(*) AS sum  FROM t_mjjcbg WHERE  (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')";
+      // let sumsql ="select COUNT(*) AS sum  FROM t_mjjcbg WHERE (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')";
       curdPost("sql", sumsql).then((response) => {
         this.total = response.variables.data[0].sum;
       });
@@ -392,9 +394,9 @@
             ")";
           curdPost("sql", itemSql).then((res) => {
             this_.itemInfo = res.variables.data;
-            for (var i = 0; i++; i < this_itemInfo) {
+            for (var i = 0; i < this_itemInfo.length; i++) {
               if (this_itemInfo[i].shi_fou_yu_bao_ga == "是") {
-                this_.yubaogaoitem.push(it);
+                this_.yubaogaoitem.push(this_itemInfo[i]);
               }
             }
             if (this_.yubaogaoitem.length == 0) {
@@ -476,22 +478,18 @@
       },
       search() {
         let moreSql = this.selectSplit();
-        var sql =
-          "select * from t_mjjcbg " +
-          moreSql +
-          " shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
+        var sql = "select * from t_mjjcbg " +moreSql + "(lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
+        // var sql = "select * from t_mjjcbg " +moreSql + " (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
         this.loadData(sql);
       },
       handleSizeChange(value) {
         this.currentPage4 = 1;
-        let sql =
-          "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0," +
-          value;
+        let sql ="select * from t_mjjcbg WHERE (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')  and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0," + value;
         this.loadData(sql);
       },
       handleCurrentChange(value) {
         let sql =
-          "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')   and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit " +
+          "select * from t_mjjcbg WHERE (lei_bie_qu_fen_yu ='cnas/CMA'OR lei_bie_qu_fen_yu ='CNAS&CMA')   and (zhuang_tai_ = '报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit " +
           value +
           ", 20";
         this.loadData(sql);

src/views/platform/bpmn/bpmInstHis/listType/CNASjiancedangan.vue

@@ -140,28 +140,28 @@
             >
               <i class="el-icon-s-order"></i> 检测报告审批表
             </div>
-            <!-- <div v-if="false">
+            <div v-if="scope.row.shi_fou_yu_bao_ga !='否'">
               <el-popover placement="left" width="200" trigger="triggerType">
                 <div
                   class="div_test item"
                   style="color: #85ce61"
                   slot="reference"
-                  @click="YubaogaoItem(scope.row)"
+                  @click="getFile(scope.row.shou_quan_qian_z)"
                 >
                   <i class="el-icon-s-order"></i> 预报告
                 </div>
                 <div class="three-item">
                   <div
                     style="color: #85ce61; cursor: pointer"
-                    v-for="it in yubaogaoitem"
-                    :key="it.id_"
-                    @click="yuReports(reports.yubaogao, it.id)"
+                    v-for="i in fileList"
+                    :key="i.id_"
+                    @click="preview(i)"
                   >
-                    {{ it.jian_ce_xiang_mu_ }}预报告记录
+                   {{ i.fileName }}.{{ i.ext }}
                   </div>
                 </div>
               </el-popover>
-            </div> -->
+            </div>
             <!-- <div
               class="item"
               style="color: #85ce61"
@@ -315,11 +315,11 @@ export default {
   },
   created() {
     let sql =
-      "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
+      "select * from t_mjjcbg WHERE (lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
     this.loadData(sql);
 
     let sumsql =
-      "select COUNT(*) AS sum  FROM t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')";
+      "select COUNT(*) AS sum  FROM t_mjjcbg WHERE (lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')";
     curdPost("sql", sumsql).then((response) => {
       this.total = response.variables.data[0].sum;
     });
@@ -385,35 +385,35 @@ export default {
 
       });
     },
-    // YubaogaoItem(info) { 保留
-    //   let itemId;
-    //   let this_ = this;
-    //   var sql =
-    //     "select b.id_ ,c.jian_ce_xiang_mu2 FROM t_mjjcbg a JOIN t_jchzb b ON a.jian_ce_shen_qing = b.shen_qing_dan_id_ JOIN t_mjypb c ON a.jian_ce_shen_qing = c.wai_jian_ WHERE a.id_ = '" +
-    //     info.id_ +
-    //     "'";
-    //   curdPost("sql", sql).then((res) => {
-    //     itemId = res.variables.data;
-    //     this_.runqianId = itemId[0].id_;
-    //     var itemSql =
-    //       "select * FROM t_mjjcnlfw WHERE id_ IN(" +
-    //       itemId[0].jian_ce_xiang_mu2 +
-    //       ")";
-    //     curdPost("sql", itemSql).then((res) => {
-    //       this_.itemInfo = res.variables.data;
-    //       for (var i = 0; i++; i < this_itemInfo) {
-    //         if (this_itemInfo[i].shi_fou_yu_bao_ga == "是") {
-    //           this_.yubaogaoitem.push(it);
-    //         }
-    //       }
-    //       if (this_.yubaogaoitem.length == 0) {
-    //         this_.triggerType = "";
-    //         alert("此条报告没有预报告记录");
-    //         return;
-    //       }
-    //     });
-    //   });
-    // },
+    YubaogaoItem(info) { 保留
+      let itemId;
+      let this_ = this;
+      var sql =
+        "select b.id_ ,c.jian_ce_xiang_mu2 FROM t_mjjcbg a JOIN t_jchzb b ON a.jian_ce_shen_qing = b.shen_qing_dan_id_ JOIN t_mjypb c ON a.jian_ce_shen_qing = c.wai_jian_ WHERE a.id_ = '" +
+        info.id_ +
+        "'";
+      curdPost("sql", sql).then((res) => {
+        itemId = res.variables.data;
+        this_.runqianId = itemId[0].id_;
+        var itemSql =
+          "select * FROM t_mjjcnlfw WHERE id_ IN(" +
+          itemId[0].jian_ce_xiang_mu2 +
+          ")";
+        curdPost("sql", itemSql).then((res) => {
+          this_.itemInfo = res.variables.data;
+          for (var i = 0; i < this_itemInfo.length; i++) {
+            if (this_itemInfo[i].shi_fou_yu_bao_ga == "是") {
+              this_.yubaogaoitem.push(this_itemInfo[i]);
+            }
+          }
+          if (this_.yubaogaoitem.length == 0) {
+            this_.triggerType = "";
+            alert("此条报告没有预报告记录");
+            return;
+          }
+        });
+      });
+    },
     yuReports(url, id) {
       this.alertReport(url, id);
     },
@@ -486,16 +486,16 @@ export default {
       var sql =
         "select * from t_mjjcbg " +
         moreSql +
-        " shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu = 'cnas' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
+        " lei_bie_qu_fen_yu = 'cnas' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
       this.loadData(sql);
     },
     handleSizeChange(value) {
       this.currentPage4 = 1;
-      let sql ="select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0," +value;
+      let sql ="select * from t_mjjcbg WHERE (lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0," +value;
       this.loadData(sql);
     },
     handleCurrentChange(value) {
-      let sql ="select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and (lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit " +value +", 20";
+      let sql ="select * from t_mjjcbg WHERE (lei_bie_qu_fen_yu ='cnas'OR lei_bie_qu_fen_yu ='CNAS')  and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit " +value +", 20";
       this.loadData(sql);
     },
     // 获取附件信息

src/views/platform/bpmn/bpmInstHis/listType/feijiancedangan.vue

@@ -66,7 +66,7 @@
         </el-table-column>
         <el-table-column label="操作" align="left" width="100">
           <template slot-scope="scope">
-            <el-popover placement="left" width="200" trigger="click">
+            <el-popover placement="left" width="200">
               <div slot="reference" class="more">
                 <i class="el-icon-caret-bottom"></i>查阅
               </div>
@@ -92,7 +92,7 @@
                 <i class="el-icon-s-order"></i> 合同评审
               </div> -->
               <div>
-                <el-popover placement="left" width="200" trigger="click">
+                <el-popover placement="left" width="200" >
                   <div
                     class="div_test item"
                     style="color: #85ce61"
@@ -114,7 +114,7 @@
                 </el-popover>
               </div>
               <div>
-                <el-popover placement="left" width="200" trigger="click">
+                <el-popover placement="left" width="200" >
                   <div
                     class="div_test item"
                     style="color: #85ce61"
@@ -142,24 +142,29 @@
               >
                 <i class="el-icon-s-order"></i> 检测报告审批表
               </div>
-              <div v-if="false">
-                <el-popover placement="left" width="200" trigger="triggerType">
+              <div v-if="scope.row.shi_fou_yu_bao_ga !='否'">
+                <el-popover placement="left" width="200">
                   <div
                     class="div_test item"
                     style="color: #85ce61"
                     slot="reference"
-                    @click="YubaogaoItem(scope.row)"
+                    
+                    @click="getFile(scope.row.shou_quan_qian_z)"
                   >
+                  <!-- @click="YubaogaoItem(scope.row)" -->
                     <i class="el-icon-s-order"></i> 预报告
                   </div>
                   <div class="three-item">
                     <div
                       style="color: #85ce61; cursor: pointer"
-                      v-for="it in yubaogaoitem"
-                      :key="it.id_"
-                      @click="yuReports(reports.yubaogao, it.id)"
+                      v-for="i in fileList"
+                      :key="i.id_"
+                      @click="preview(i)"
+                     
                     >
-                      {{ it.jian_ce_xiang_mu_ }}预报告记录
+                    <!-- @click="yuReports(reports.yubaogao, it.id)" -->
+                      <!-- {{ it.jian_ce_xiang_mu_ }}预报告记录 -->
+                      {{ i.fileName }}.{{ i.ext }}
                     </div>
                   </div>
                 </el-popover>
@@ -172,7 +177,7 @@
               <i class="el-icon-s-order"></i> 检测报告
               </div> -->
                 <div v-if="scope.row && scope.row.shou_quan_qian_z">
-                  <el-popover placement="left" width="200" trigger="click">
+                  <el-popover placement="left" width="200">
                     <div
                       class="div_test item"
                       style="color: #85ce61"
@@ -315,14 +320,14 @@
       },
     },
     created() {
-      let sql =
-        "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
+      let sql ="select * from t_mjjcbg WHERE  lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
+      // let sql ="select * from t_mjjcbg WHERE  lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
       // curdPost("sql", sql).then((response) => {
       //   this_.tableData = response.variables.data;
       // });
       this.loadData(sql);
       let sumsql =
-        "select COUNT(*) AS sum  FROM t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')";
+        "select COUNT(*) AS sum  FROM t_mjjcbg WHERE  lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成')";
       curdPost("sql", sumsql).then((response) => {
         this.total = response.variables.data[0].sum;
       });
@@ -376,7 +381,6 @@
         this_.itemInfo =[];
         var sql =`select jian_ce_xiang_mu2,jian_ce_xiang_si_ ,jian_ce_xiang_me_ ,jian_ce_xiang_ms_  FROM t_mjypb  WHERE  wai_jian_= (SELECT jian_ce_shen_qing  FROM t_mjjcbg  WHERE id_= '${info.id_}') AND yang_pin_bian_hao = '${info.yang_pin_bian_hao}'`;
         curdPost("sql", sql).then((res) => {
-          console.log(sql)
           itemId = res.variables.data;
           if(itemId.length <=0 ||itemId ==null){
             return
@@ -422,23 +426,15 @@
       YubaogaoItem(info) {
         let itemId;
         let this_ = this;
-        var sql =
-          "select b.id_ ,c.jian_ce_xiang_mu2 FROM t_mjjcbg a JOIN t_jchzb b ON a.jian_ce_shen_qing = b.shen_qing_dan_id_ JOIN t_mjypb c ON a.jian_ce_shen_qing = c.wai_jian_ WHERE a.id_ = '" +
-          info.id_ +
-          "'";
+        var sql = "select b.id_ ,c.jian_ce_xiang_mu2 FROM t_mjjcbg a JOIN t_jchzb b ON a.jian_ce_shen_qing = b.shen_qing_dan_id_ JOIN t_mjypb c ON a.jian_ce_shen_qing = c.wai_jian_ WHERE a.id_ = '" +info.id_ +"'";
         curdPost("sql", sql).then((res) => {
           itemId = res.variables.data;
           this_.runqianId = itemId[0].id_;
-          var itemSql =
-            "select * FROM t_mjjcnlfw WHERE id_ IN(" +
-            itemId[0].jian_ce_xiang_mu2 +
-            ")";
+          var itemSql ="select * FROM t_mjjcnlfw WHERE id_ IN(" +itemId[0].jian_ce_xiang_mu2 +")";
           curdPost("sql", itemSql).then((res) => {
             this_.itemInfo = res.variables.data;
-            for (var i = 0; i++; i < this_itemInfo) {
-              if (this_itemInfo[i].shi_fou_yu_bao_ga == "是") {
-                this_.yubaogaoitem.push(it);
-              }
+            for (var i = 0; i < this_.itemInfo.length;i++) {
+                this_.yubaogaoitem.push(this_.itemInfo[i]);
             }
             if (this_.yubaogaoitem.length == 0) {
               this_.triggerType = "";
@@ -508,19 +504,19 @@
         var sql =
           "select * from t_mjjcbg " +
           moreSql +
-          " shi_fou_yu_bao_ga ='否' and lei_bie_qu_fen_yu = '非' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
+          " lei_bie_qu_fen_yu = '非' and (zhuang_tai_ ='报告待发放' or  zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0,20";
         this.loadData(sql);
       },
       handleSizeChange(value) {
         this.currentPage4 = 1;
         let sql =
-          "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0," +
+          "select * from t_mjjcbg WHERE  lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit 0," +
           value;
         this.loadData(sql);
       },
       handleCurrentChange(value) {
         let sql =
-          "select * from t_mjjcbg WHERE shi_fou_yu_bao_ga='否' and lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit " +
+          "select * from t_mjjcbg WHERE  lei_bie_qu_fen_yu ='非' and (zhuang_tai_ ='报告待发放' or zhuang_tai_ = '完成') ORDER BY create_time_ DESC limit " +
           value +
           ", 20";
         this.loadData(sql);
@@ -546,7 +542,6 @@
           this.fileOption.editUrl = BASE_API() + SYSTEM_URL() + `/file/editCallback?fileName=${file.fileName}&fileType=${file.ext}&id=${file.id}`
           this.fileOption.title = file.fileName
           this.fileOption.fileType = file.ext
-          console.log(this.fileOption)
       },
       openWindow () {
           let routeData = this.$router.resolve({

src/views/system/jbdHome/board/component/equipment/zhuzhuangtu.vue

@@ -106,7 +106,7 @@ export default {
               color: "#fff"
             }
           },
-          interval:10
+          interval:15
         },
         ],
         series: [