Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

client/src/views/supervisionNew/mytask.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="10">
-    <el-col :span="7">
+    <el-col :span="6">
       <el-card :style="{height:leftHeight+'px'}" class="leftCard">
         <h5>任务列表</h5>
         <el-select
@@ -94,7 +94,7 @@
           />
       </el-card>
     </el-col>
-    <el-col :span="17" :style="{height:leftHeight+'px','overflow-y': 'scroll'}">
+    <el-col :span="18" :style="{height:leftHeight+'px','overflow-y': 'scroll'}">
       <div v-if="type==10">
         <el-card>
           <div style="display: flex;justify-content: space-between;">
@@ -120,8 +120,8 @@
             </div>
           </div>
         </el-card>
-        <el-row :gutter="10">
+        <el-row >
-          <el-col :span="12" style="margin-top:10px" v-for="(item,$index) in subData">
+          <el-col style="margin-top:10px" v-for="(item,$index) in subData">
             <el-card>
               <div style="padding:10px 20px 5px 10px">
                 <div v-if="item.goal_key" style="font-size:18px;height: 25px;">
@@ -233,16 +233,92 @@
             </div>
           </div>
         </el-card>
-        <el-row :gutter="10">
+        <el-row >
-          <!-- 不准确报告 -->
+          <!-- 1\外部监督检查信息 -->
-          <el-col  :lg="12" :md="24" style="margin-top:10px">
+          <el-col style="margin-top:10px">
             <el-card >
               <div class="cardHead">
-                <span class="cardTitle">不准确报告</span>
+                <span class="cardTitle">外部监督检查信息</span>
+                <div>
+                  <el-button v-if="oinspectList.length==0" size="mini" type="primary" @click="handleNoNum('oinspect')">无记录</el-button>
+                  <el-button type="primary" size="mini" @click="handleImport('oinspect')">导入</el-button>
+                  <el-button type="primary" size="mini" icon="el-icon-plus"  @click="handleCreate('oinspect')"></el-button>
+                  <el-button type="primary" size="mini" @click="exportTableExcel('oinspect','外部监督检查信息')">导出</el-button>
+                </div>
+              </div>
+              <el-table
+                  :data="oinspectList"
+                  fit
+                  stripe
+                  highlight-current-row
+                  :height="tableHeight"
+                >
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="检查类型">
+                  <template slot-scope="scope">
+                      <span>{{ cateOptions[scope.row.cate] }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="检查机构" prop="checker"></el-table-column>
+                <el-table-column label="检查日期" prop="date_inspect"></el-table-column>
+                <el-table-column label="检查结果" prop="result"></el-table-column>
+                <el-table-column
+                    align="center"
+                    label="操作"
+                    width="80px"
+                >
+                  <template slot-scope="scope">
+                      <el-link
+                      v-if="checkPermission(['task2do'])"
+                      type="primary"
+                      @click="handleEdit('oinspect',scope.row)"
+                      >编辑</el-link>
+                      <el-link
+                      v-if="checkPermission(['task2do'])"
+                      type="danger"
+                      @click="handleDelete('oinspect',scope.row)"
+                      >删除</el-link>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-table
+                  :data="oinspectList"
+                  fit
+                  stripe
+                  highlight-current-row
+                  :height="tableHeight"
+                  id="oinspect"
+                  style="display: none;"
+                >
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="检查类型">
+                  <template slot-scope="scope">
+                      <span>{{ cateOptions[scope.row.cate] }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="检查机构" prop="checker"></el-table-column>
+                <el-table-column label="检查日期" prop="date_inspect"></el-table-column>
+                <el-table-column label="检查结果" prop="result"></el-table-column>
+              </el-table>
+            </el-card>
+            <saveoin-dialog
+              v-if="dialogOin"
+              ref="saveOinDialog"
+              @success="oinSaveSuccess"
+              @closed="dialogOin = false"
+            >
+            </saveoin-dialog>
+          </el-col>
+          <!-- 2\不准确报告/证书 -->
+          <el-col  style="margin-top:10px">
+            <el-card >
+              <div class="cardHead">
+                <span class="cardTitle">不准确报告/证书</span>
                 <div>
                   <el-button v-if="rcList.length==0" size="mini" type="primary" @click="handleNoNum('rc')">无记录</el-button>
                   <el-button type="primary" size="mini" @click="handleImport('rc')">导入</el-button>
                   <el-button type="primary" size="mini" icon="el-icon-plus"  @click="handleCreate('rc')"></el-button>
+                  <el-button type="primary" size="mini" @click="exportTableExcel('rcList','不准确报告/证书')">导出</el-button>
                 </div>
               </div>
               <el-table
@@ -276,17 +352,33 @@
                   </template>
                 </el-table-column>
               </el-table>
+              <el-table
+                  :data="rcList"
+                  fit
+                  stripe
+                  highlight-current-row
+                  :height="tableHeight"
+                  id="rcList"
+                  style="display: none;"
+                >
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="报告/证书编号" prop="number"></el-table-column>
+                <el-table-column label="更改后报告/证书编号" prop="number_correct"></el-table-column>
+                <el-table-column label="出错原因" prop="reason_error"></el-table-column>
+                <el-table-column label="更改报告/证书发放日期" prop="date_issue"></el-table-column>
+              </el-table>
             </el-card>
           </el-col>
-          <!-- 超期报告 -->
+          <!-- 3\超期报告/证书 -->
-          <el-col  :lg="12" :md="24" style="margin-top:10px">
+          <el-col  style="margin-top:10px">
             <el-card >
               <div class="cardHead">
-                <span class="cardTitle">超期报告</span>
+                <span class="cardTitle">超期报告/证书</span>
                 <div>
                   <el-button v-if="rc2List.length==0" size="mini" type="primary" @click="handleNoNum('rc2')">无记录</el-button>
                   <el-button type="primary" size="mini" @click="handleImport('rc2')">导入</el-button>
                   <el-button type="primary" size="mini" icon="el-icon-plus"  @click="handleCreate('rc2')"></el-button>
+                  <el-button type="primary" size="mini" @click="exportTableExcel('rc2','超期报告/证书')">导出</el-button>
                 </div>
               </div>
               <el-table
@@ -320,6 +412,21 @@
                   </template>
                 </el-table-column>
               </el-table>
+              <el-table
+                  :data="rc2List"
+                  fit
+                  stripe
+                  highlight-current-row
+                  :height="tableHeight"
+                  id="rc2"
+                  style="display: none;"
+                >
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="超期报告/证书编号" prop="number"></el-table-column>
+                <el-table-column label="业务受理日期" prop="date_accept"></el-table-column>
+                <el-table-column label="报告/证书应发日期" prop="date_expect"></el-table-column>
+                <el-table-column label="报告/证书实际发放日期" prop="date_issue"></el-table-column>
+              </el-table>
             </el-card>
             <saverc-dialog
               v-if="dialogRc"
@@ -329,8 +436,8 @@
             >
             </saverc-dialog>
           </el-col>
-          <!-- 能力验证结果 -->
+          <!-- 4\能力验证结果 -->
-          <el-col :lg="12" :md="24" style="margin-top:10px">
+          <el-col style="margin-top:10px">
             <el-card >
               <div class="cardHead">
                 <span class="cardTitle">能力验证结果</span>
@@ -338,6 +445,7 @@
                   <el-button v-if="ptList.length==0" size="mini" type="primary" @click="handleNoNum('pt')">无记录</el-button>
                   <el-button type="primary" size="mini" @click="handleImport('pt')">导入</el-button>
                   <el-button type="primary" size="mini" icon="el-icon-plus"  @click="handleCreate('pt')"></el-button>
+                  <el-button type="primary" size="mini" @click="exportTableExcel('ptList','能力验证结果')">导出</el-button>
                 </div>
               </div>
               <el-table
@@ -381,6 +489,31 @@
                   </template>
                 </el-table-column>
               </el-table>
+              <el-table
+                  :data="ptList"
+                  fit
+                  stripe
+                  highlight-current-row
+                  :height="tableHeight"
+                  id="ptList"
+                  style="display: none;"
+                >
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="能力验证名称" prop="name"></el-table-column>
+                <el-table-column label="项目编号" prop="number"></el-table-column>
+                <el-table-column label="组织方" prop="organizer"></el-table-column>
+                <el-table-column label="参加参数名称" prop="params"></el-table-column>
+                <el-table-column label="结果">
+                  <template slot-scope="scope">
+                      <span>{{ resultsOptions[scope.row.result] }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="结果处理状况">
+                  <template slot-scope="scope">
+                      <span>{{ handleOptions[scope.row.handle_result] }}</span>
+                    </template>
+                </el-table-column>
+              </el-table>
             </el-card>
             <savept-dialog
               v-if="dialogPt"
@@ -390,15 +523,16 @@
             >
             </savept-dialog>
           </el-col>
-           <!-- 客户投诉 -->
+           <!-- 5\客户投诉信息 -->
-          <el-col :lg="12" :md="24" style="margin-top:10px">
+          <el-col style="margin-top:10px">
             <el-card >
               <div class="cardHead">
-                <span class="cardTitle">客户投诉</span>
+                <span class="cardTitle">客户投诉信息</span>
                 <div>
                   <el-button v-if="complaintList.length==0" size="mini" type="primary" @click="handleNoNum('complaint')">无记录</el-button>
                   <el-button type="primary" size="mini" @click="handleImport('complaint')">导入</el-button>
                   <el-button type="primary" size="mini" icon="el-icon-plus"  @click="handleCreate('complaint')"></el-button>
+                  <el-button type="primary" size="mini" @click="exportTableExcel('complaint','客户投诉信息')">导出</el-button>
                 </div>
               </div>
               <el-table
@@ -438,6 +572,27 @@
                   </template>
                 </el-table-column>
               </el-table>
+              <el-table
+                  :data="complaintList"
+                  fit
+                  stripe
+                  highlight-current-row
+                  :height="tableHeight"
+                  id="complaint"
+                  style="display: none;"
+                >
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="投诉人/机构" prop="complainant"></el-table-column>
+                <el-table-column label="投诉内容" prop="content"></el-table-column>
+                <el-table-column label="投诉日期" prop="date_occurrence"></el-table-column>
+                <el-table-column label="处理结果反馈日期" prop="date_feedback"></el-table-column>
+                <el-table-column label="客户是否满意">
+                    <template slot-scope="scope">
+                        <el-tag v-if="scope.row.is_satisfied" type="primary">满意</el-tag>
+                        <el-tag v-else type="warning">不满意</el-tag>
+                    </template>
+                </el-table-column>
+              </el-table>
             </el-card>
             <savecom-dialog
               v-if="dialogCom"
@@ -447,15 +602,16 @@
             >
             </savecom-dialog>
           </el-col>
-          <!-- 风险识别 -->
+          <!-- 6\风险识别信息 -->
-          <el-col :lg="12" :md="24" style="margin-top:10px">
+          <el-col style="margin-top:10px">
             <el-card >
               <div class="cardHead">
-                <span class="cardTitle">风险识别</span>
+                <span class="cardTitle">风险识别信息</span>
                 <div>
                   <el-button v-if="riskList.length==0" size="mini" type="primary" @click="handleNoNum('risk')">无记录</el-button>
                   <el-button type="primary" size="mini" @click="handleImport('risk')">导入</el-button>
                   <el-button type="primary" size="mini" icon="el-icon-plus"  @click="handleCreate('risk')"></el-button>
+                  <el-button type="primary" size="mini" @click="exportTableExcel('risk','风险识别信息')">导出</el-button>
                 </div>
               </div>
               <el-table
@@ -497,6 +653,29 @@
                   </template>
                 </el-table-column>
               </el-table>
+              <el-table
+                  :data="riskList"
+                  fit
+                  stripe
+                  highlight-current-row
+                  :height="tableHeight"
+                  id="risk"
+                  style="display: none;"
+                >
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="风险事实描述" prop="content"></el-table-column>
+                <el-table-column label="风险类别">
+                  <template slot-scope="scope">
+                      <span>{{ levelOptions[scope.row.level] }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="风险代码" prop="code"></el-table-column>
+                <el-table-column label="整改情况">
+                  <template slot-scope="scope">
+                      <span>{{ codeOptions[scope.row.state] }}</span>
+                    </template>
+                </el-table-column>
+              </el-table>
             </el-card>
             <saverisk-dialog
               v-if="dialogRisk"
@@ -506,61 +685,7 @@
             >
             </saverisk-dialog>
           </el-col>
-          <!-- 外部监督检查 -->
+          
-          <el-col :lg="12" :md="24" style="margin-top:10px">
-            <el-card >
-              <div class="cardHead">
-                <span class="cardTitle">外部监督检查</span>
-                <div>
-                  <el-button v-if="oinspectList.length==0" size="mini" type="primary" @click="handleNoNum('oinspect')">无记录</el-button>
-                  <el-button type="primary" size="mini" @click="handleImport('oinspect')">导入</el-button>
-                  <el-button type="primary" size="mini" icon="el-icon-plus"  @click="handleCreate('oinspect')"></el-button>
-                </div>
-              </div>
-              <el-table
-                  :data="oinspectList"
-                  fit
-                  stripe
-                  highlight-current-row
-                  :height="tableHeight"
-                >
-                <el-table-column label="序号" type="index" width="50" />
-                <el-table-column label="检查类型">
-                  <template slot-scope="scope">
-                      <span>{{ cateOptions[scope.row.cate] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="检查机构" prop="checker"></el-table-column>
-                <el-table-column label="检查日期" prop="date_inspect"></el-table-column>
-                <el-table-column label="检查结果" prop="result"></el-table-column>
-                <el-table-column
-                    align="center"
-                    label="操作"
-                    width="80px"
-                >
-                  <template slot-scope="scope">
-                      <el-link
-                      v-if="checkPermission(['task2do'])"
-                      type="primary"
-                      @click="handleEdit('oinspect',scope.row)"
-                      >编辑</el-link>
-                      <el-link
-                      v-if="checkPermission(['task2do'])"
-                      type="danger"
-                      @click="handleDelete('oinspect',scope.row)"
-                      >删除</el-link>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-card>
-            <saveoin-dialog
-              v-if="dialogOin"
-              ref="saveOinDialog"
-              @success="oinSaveSuccess"
-              @closed="dialogOin = false"
-            >
-            </saveoin-dialog>
-          </el-col>
         </el-row>
         <el-dialog
             :visible.sync="impDialogVisible"
@@ -614,6 +739,8 @@
   import saveriskDialog from "./risk_form.vue";
   import savecomDialog from "./complaint_form.vue";
   import saveoinDialog from "./oinspect_form.vue";
+  import FileSaver from "file-saver";
+  import * as XLSX from "xlsx";
   import user from "@/store/modules/user";
   const defaulttask = {
       year: "",
@@ -709,7 +836,7 @@ import user from "@/store/modules/user";
                 10:'市场监管部门检查',
                 20:'行业主管部门检查',
                 30:'其他检查'
-              }
+              },
           };
       },
       mounted(){
@@ -720,6 +847,27 @@ import user from "@/store/modules/user";
         this.getList();
       },
       methods:{
+        exportTableExcel (id,name) {
+          let filename = name+'.xlsx';
+            var wb = XLSX.utils.table_to_book(document.getElementById(id),{row:true})
+            // console.log(wb.Sheets)
+            // console.log(wb.Sheets.Sheet1)
+            // console.log(wb.Sheets.Sheet1['!cols'])//undefined
+            // wb.Sheets.Sheet1['!cols'][0]={hidden:true}
+            // if(id=='ptList'){
+            //   wb.Sheets.Sheet1['!cols'][7]={hidden:true}
+            // }else if(id=='complaint'){
+            //   wb.Sheets.Sheet1['!cols'][6]={hidden:true}
+            // }else{
+            //   wb.Sheets.Sheet1.F1 = {hidden:true}
+            //   wb.Sheets.Sheet1['!cols'][5]={hidden:true}
+            // }
+            var wbout = XLSX.write(wb, {  bookType: 'xlsx', bookSST: true, type: 'array' })
+            try { 
+                FileSaver.saveAs(new Blob([wbout], {  type: 'application/octet-stream' }), filename)
+            } catch (e) {  if (typeof console !== 'undefined') console.log(e, wbout)}
+            return wbout
+        },
         checkPermission,
         getOrgList() {
           let that = this;
@@ -796,6 +944,14 @@ import user from "@/store/modules/user";
               that.subData = [];
               data.forEach(item => {
                 let obj = item;
+                let goal_value_a = item.goal_value_a+'';
+                if(item.goal_name=='重大质量事故'){
+                }else{
+                  if(goal_value_a.indexOf('.')>-1){}else{
+                    goal_value_a = goal_value_a+'.0';
+                    obj.goal_value_a = goal_value_a;
+                  }
+                }
                 obj.fileLists = [];
                 if(item.goal_file!==null){
                   let file = {};
@@ -820,7 +976,7 @@ import user from "@/store/modules/user";
            this.$nextTick(re=>{
             let height1 = document.getElementsByClassName('app-main')[0].clientHeight;
             let height2 = document.getElementById('numCard').clientHeight;
-            let height3 = (height1 - height2 - 200) / 3;
+            let height3 = (height1 - height2 - 200) / 4;
             this.tableHeight = height3;
            })
                 //获取6个列表
@@ -929,10 +1085,10 @@ import user from "@/store/modules/user";
           }
         },
         handlePreview(file) {
-          if ("url" in file) {
+          if ("response" in file) {
-              window.open(file.url);
-          } else {
             window.open(file.response.data.path);
+          } else {
+            window.open(file.value); 
           }
         },
         handleUpSuccess(res, file, fileList,index) {

client/src/views/supervisionNew/statistics.vue

@@ -618,35 +618,42 @@
                             let data = res.data.filter(item=>{
                                 return item.task2_.type==20
                             });
+                            if(data.length>0){
                                 data.forEach(element => {
                                     let obj = element;
-                                if(element.num_issue!==null&&element.num_error!==null&&element.num_issue!==0){
+                                    let sjwc = null;
-                                    let rate1 = ((element.num_issue-element.num_error)/element.num_issue).toFixed(4)
+                                    if(element.num_expect!==null){
-                                    obj.rate1 = parseFloat(Number(rate1)*100).toFixed(2);
+                                        if(element.num_overdue!==null){
+                                            sjwc = element.num_expect-element.num_overdue;
                                         }else{
-                                    obj.rate1 = ''
+                                            sjwc = element.num_expect;
                                         }
-                                if(element.num_expect!==null&&element.num_issue!==null&&element.num_expect!==0){
+                                    }else{
-                                    let rate2 = (element.num_issue/element.num_expect).toFixed(4)
+                                        sjwc = null;
-                                    obj.rate2 = parseFloat(Number(rate2)*100).toFixed(2);
-                                }
-                                else{
-                                    obj.rate2 = ''
-                                }
-                                if(element.num_pt!==null&&element.num_pt_10!==null&&element.num_pt!==0){
-                                    let rate3 = (element.num_pt_10/element.num_pt).toFixed(4)
-                                    obj.rate3 =  parseFloat(Number(rate3)*100).toFixed(2);
-                                }
-                                else{
-                                    obj.rate3 = ''
-                                }
-                                if(element.num_complaint!==null&&element.num_complaint_10!==null&&element.num_complaint!==0){
-                                    let rate4 = (element.num_complaint_10/element.num_complaint).toFixed(4)
-                                    obj.rate4 =  parseFloat(Number(rate4)*100).toFixed(2);
-                                }
-                                else{
-                                    obj.rate4 = ''
                                     }
+                                    obj.sjwc = sjwc ;
+                                    let rate1= 1, rate2= 1, rate3= 1, rate4= 1;
+                                    try{
+                                        rate1 = (element.num_issue-element.num_error)/element.num_issue;
+                                    }catch{}
+                                    try{
+                                        rate2 = sjwc/element.num_expect;
+                                    }catch{}
+                                    try{
+                                        rate3 = element.num_pt_10/element.num_pt;
+                                    }catch{}
+                                    try{
+                                        rate4 = element.num_complaint_10/element.num_complaint;
+                                    }catch{}
+                                    console.log(rate1,rate2,rate3,rate4)
+                                    rate1 = isNaN(rate1)?'':rate1;
+                                    rate2 = isNaN(rate2)?'':rate2;
+                                    rate3 = isNaN(rate3)?'':rate3;
+                                    rate4 = isNaN(rate4)?'':rate4;
+                                    obj.rate1 =  rate1!==''?parseFloat(Number(rate1.toFixed(4))*100).toFixed(2):'';
+                                    obj.rate2 =  rate2!==''?parseFloat(Number(rate2.toFixed(4))*100).toFixed(2):'';
+                                    obj.rate3 =  rate3!==''?parseFloat(Number(rate3.toFixed(4))*100).toFixed(2):'';
+                                    obj.rate4 =  rate4!==''?parseFloat(Number(rate4.toFixed(4))*100).toFixed(2):'';
                                     let ind = element.task2_.cycle-1;
                                     that.tableData1[ind] = obj;
                                 });
@@ -660,7 +667,7 @@
                                             j==2?item.num_error:
                                             j==3?item.rate1:
                                             j==4?item.num_expect:
-                                        j==5?item.num_issue:
+                                            j==5?item.sjwc:
                                             j==6?item.rate2:
                                             j==7?item.num_pt:
                                             j==8?item.num_pt_10:
@@ -694,12 +701,13 @@
                                     if(num!=='NaN'&&num!==NaN){
                                         if(k==3||k==6||k==9||k==12){
                                             console.log(parseFloat((Number(num)*100)))
-                                        let numbe = parseFloat(Number(num)*100).toFixed(2);;
+                                            let numbe = parseFloat(Number(num)*100).toFixed(2);
                                             that.tableDatas[k][6] = numbe;
                                         }else{
                                             that.tableDatas[k][6] = num;
                                         }
                                     }else{
+                                        // that.tableDatas[k][6] = parseFloat(100).toFixed(2);
                                         that.tableDatas[k][6] = ''
                                     }
                                 }
@@ -742,7 +750,7 @@
                                 that.line2Option.series[0].data = that.line2Data;
                                 that.line3Option.series[0].data = that.line3Data;
                                 that.line4Option.series[0].data = that.line4Data;
-
+                            }
                             that.barChart1.clear();
                             that.barChart1.setOption(that.bar1Option);
                             that.barChart2.clear();