From 41aaa0dce08cc3cab1c6596c0e02cc8d07698fe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 18 Jun 2021 09:07:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue |  2 +-
 .../pages/rectificationDatabase.vue           | 78 +++++++++++++++----
 src/sysConfig/index.js                        |  2 +-
 3 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 67801d0cf..6273aa70e 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -2091,7 +2091,7 @@ export default {
           this.$message.success('导出信息成功')
         }
       } else if (this.saveExportType === 'all') {
-        console.log('批量导出')
+        console.log('全部导出')
         let exportEOStr = JSON.stringify(this.SarExportSearchEo)
         console.log(exportEOStr)
         exportEOStr = exportEOStr.replace(/""/g, null)
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 31ff05619..33a8a2f5d 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -71,8 +71,15 @@
         class="common-button-primary"
         type="primary"
         size="mini"
+        @click="exportStandard()"
         title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
       ><i class="iconfont">&#xe6e9;</i>导出</el-button>
+      <el-button
+        class="common-button-primary"
+        type="primary"
+        size="mini"
+        @click="batchClose()"
+      ><i class="iconfont">&#xe6e9;</i>批量关闭</el-button>
       <el-button
         class="common-button-primary"
         size="mini"
@@ -86,7 +93,7 @@
         :data="nonList"
         tooltip-effect="dark"
         style="width: 100%;"
-        height="100%"
+        height="500px"
         border
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
@@ -98,7 +105,7 @@
           align="center">
         </el-table-column>
         <el-table-column
-          prop="standNum"
+          prop="standId"
           fixed="left"
           width="180"
           label="标准编号">
@@ -116,47 +123,47 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="standNum"
+          prop="itemsNum"
           width="180"
           label="条款号">
         </el-table-column>
         <el-table-column
-          prop="standName"
+          prop="itemsName"
           width="180"
           label="条款名称">
         </el-table-column>
         <el-table-column
-          prop="productNameShow"
+          prop="productType"
           width="180"
           label="产品类型">
         </el-table-column>
         <el-table-column
-          prop="productNameShow"
+          prop="productLine"
           width="180"
           label="产品线">
         </el-table-column>
         <el-table-column
-          prop="productNameShow"
+          prop="productName"
           width="180"
           label="项目名称">
         </el-table-column>
         <el-table-column
-          prop="responseUnitShow"
+          prop="responsibleUnit"
           width="180"
           label="责任部门">
         </el-table-column>
         <el-table-column
-          prop="responseEnginShow"
+          prop="dutyEngineer"
           width="150"
           label="责任工程师">
         </el-table-column>
         <el-table-column
-          prop="responseEnginShow"
+          prop="authEngineer"
           width="150"
           label="认证工程师">
         </el-table-column>
         <el-table-column
-          prop="responseEnginShow"
+          prop="qaEngineer"
           width="150"
           label="质量工程师">
         </el-table-column>
@@ -186,6 +193,17 @@
         <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
       </div>
     </div>
+    <el-dialog :visible.sync="exportModelFlag" title="导出文件" width="300px">
+      <el-form :inline="true" class="label-input-form search-area">
+        <el-form-item label="导出名称" class="search-item">
+          <el-input v-model="exportName" placeholder="请输入导出文件名称" :maxlength="30" clearable label="导出名称"/>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="demo-drawer-footer">
+          <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="cancal">取消</el-button>
+          <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
+        </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -196,6 +214,8 @@ export default {
     return {
       loading: false,
       nonList:[], //未符合项表格数据
+      exportModelFlag: false, //导出模态窗
+      exportName: '',
       // 总数
       total: 0,
       // 当前页数
@@ -214,7 +234,13 @@ export default {
   methods: {
     // 查询未符合项table列表
     getTableByPage () {
-       console.log('查询符合项')
+      this.$http.get('sarStandUnqualified/sar-stand-unqualified', {}, {
+        _this: this
+      }, res => {
+            this.nonList = res.data.records
+           console.log(this.nonList);
+      }, e => {
+      })
     },
     // 点击历史记录按钮事件
     historyClick () {
@@ -222,6 +248,28 @@ export default {
         name: 'HistoricalData'
       })
     },
+    //导出
+    exportStandard () {
+      this.exportModelFlag = true
+    },
+    //取消导出
+    cancal () {
+      this.exportModelFlag = false
+    },
+    //确认导出
+    exportTestItem () {
+
+    },
+    //批量关闭
+    batchClose () {
+      this.$confirm('确认关闭这些数据?', '提示', {
+        confirmButtonText: '确定',
+        confirmButtonClass:  'common-button-primary',
+        cancelButtonTxe: '取消',
+        type: 'warning',
+        roundButton: false,
+      })
+    },
     // 清空 查询条件
     clearAllSearch (search = true) {
       this.nonConformitySearch = {
@@ -266,7 +314,9 @@ export default {
       this.getTableByPage()
     },
   },
-  mounted () {},
+  mounted () {
+    this.getTableByPage()
+  },
 };
 </script>
 
@@ -283,7 +333,7 @@ export default {
     height: 100%;
   }
   .footer {
-    margin-bottom: 430px;
+    margin-bottom: 0;
   }
 }
 </style>
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index efa7258d3..0756004e4 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -6,7 +6,7 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-const devIp = '192.168.10.47'
+const devIp = '192.168.10.51'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'