From d33acff5eaafe9ab6dc78a01f0b00d43c73833a5 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 16 五月 2024 17:41:39 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/tool/value-table.vue | 1 +
src/components/view/b1-report-preparation.vue | 1 +
src/components/view/role-manage.vue | 2 +-
src/main.js | 3 ++-
src/components/view/b1-unpass.vue | 20 ++++++++++----------
5 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 9a36a6c..0387ae4 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -596,6 +596,7 @@
this.total = res.data.body.total
this.tableHead = res.data.head
this.tableData = res.data.body.records
+ // console.log(JSON.stringify(this.tableHead)+"---------"+JSON.stringify(this.tableData))
for (var a in this.data.selectField) {
if (this.data.selectField[a].choose == true) {
this.tableData.map(b => {
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index 97addd9..5bfb65e 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -160,6 +160,7 @@
import {
convertToHtml
} from 'mammoth';
+ import axios from "axios";
export default {
components: {
ValueTable,
diff --git a/src/components/view/b1-unpass.vue b/src/components/view/b1-unpass.vue
index dd63b44..945cd80 100644
--- a/src/components/view/b1-unpass.vue
+++ b/src/components/view/b1-unpass.vue
@@ -45,8 +45,8 @@
<div class="search_thing">
<div class="search_label">瑙勬牸鍨嬪彿锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.model" @keyup.enter.native="refreshTable()"></el-input></div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.model"
+ @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing">
<div class="search_label">鏍峰搧鍚嶇О锛�</div>
@@ -86,23 +86,24 @@
entity: {
sample: null,
model: null,
+ orderBy: {
+ field: 'id',
+ order: 'asc'
+ }
},
isIndex: true,
showSelect: false,
select: false,
do: [
],
- linkEvent: {
- // code: {
- // method: 'selectAllByOne'
- // }
- },
-
+ tagField: [],
+ selectField: [],
+ requiredAdd: ['model','sample',],
+ requiredUp: []
},
entityCopy: {},
upIndex: 0,
statusList: [],
-
}
},
mounted() {
@@ -124,4 +125,3 @@
}
}
</script>
-
diff --git a/src/components/view/role-manage.vue b/src/components/view/role-manage.vue
index 6b41247..2b4d91b 100644
--- a/src/components/view/role-manage.vue
+++ b/src/components/view/role-manage.vue
@@ -115,7 +115,7 @@
entity: {
name: null,
orderBy: {
- field: 'id',
+ field: 'id',
order: 'asc'
}
},
diff --git a/src/main.js b/src/main.js
index 24fdc91..580b072 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,10 +13,11 @@
//鏈湴
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-const javaApi = 'http://192.168.11.200:8001';//鏉�
+// const javaApi = 'http://192.168.11.200:8001';//鏉�
// const javaApi = 'http://10.20.102.168:8001';//寮�
// const javaApi = 'http://172.20.10.3:8001';//濮�
// const javaApi = 'http://192.168.11.2:8001';//鏌�
+ const javaApi = 'http://127.0.0.1:8001';//鏅�
// const javaApi = 'http://114.132.189.42:1234';//娴嬭瘯鏈�
//鑳滀簯鏈嶅姟鍣�
// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
--
Gitblit v1.9.3