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="不勾选时默认导出所有筛选项;勾选时仅导出勾选项"
>导出
+ 批量关闭
@@ -116,47 +123,47 @@
@@ -186,6 +193,17 @@
+
+
+
+
+
+
+
+
@@ -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()
+ },
};
@@ -283,7 +333,7 @@ export default {
height: 100%;
}
.footer {
- margin-bottom: 430px;
+ margin-bottom: 0;
}
}
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'