From 5c9691cbb4dde05b003c418431cbe9411e54a944 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 26 四月 2024 22:03:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main.js | 4
src/components/view/a5-laboratory-qualifications.vue | 21 +-----
src/components/view/a5-laboratory-management.vue | 20 +++---
src/components/view/a6-device-management.vue | 66 ++++++++--------------
src/components/view/a7-standard-method.vue | 51 +++++++++-------
src/components/view/notice-detail.vue | 14 ++++
6 files changed, 83 insertions(+), 93 deletions(-)
diff --git a/src/components/view/a5-laboratory-management.vue b/src/components/view/a5-laboratory-management.vue
index b71d734..82e8e6d 100644
--- a/src/components/view/a5-laboratory-management.vue
+++ b/src/components/view/a5-laboratory-management.vue
@@ -192,7 +192,11 @@
type: 'text',
method: 'fileManagement'
}],
- tagField: {},
+ tagField: {
+ type:{
+ select:[]
+ }
+ },
selectField: {},
requiredAdd: ['laboratoryName', 'laboratoryNumber', 'head', 'phoneNumber'],
requiredUp: ['laboratoryName', 'laboratoryNumber', 'head', 'phoneNumber']
@@ -211,11 +215,7 @@
showSelect: false,
select: false,
do: [],
- tagField: {
- type:{
- select:[]
- }
- },
+ tagField: {},
selectField: {
type:{
select:[]
@@ -239,12 +239,12 @@
props: { multiple: false,emitPath:false,},
options:[
{
- value:0,
+ value:'瀹為獙瀹よ祫璐�',
label:'瀹為獙瀹よ祫璐�',
children:[]
},
{
- value:1,
+ value:'棰濆绫诲瀷',
label:'棰濆绫诲瀷',
children:null
},
@@ -278,7 +278,7 @@
return
}
let arr = res.data.body.records.map(m=>{
- m.value = m.id;
+ m.value = m.name;
m.label = m.name;
return m
})
@@ -356,7 +356,7 @@
let up = false
let del = false
let add = false
- let file = false
+ let file = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'upParameter') {
up = true
diff --git a/src/components/view/a5-laboratory-qualifications.vue b/src/components/view/a5-laboratory-qualifications.vue
index 748d535..a5baa5e 100644
--- a/src/components/view/a5-laboratory-qualifications.vue
+++ b/src/components/view/a5-laboratory-qualifications.vue
@@ -191,23 +191,12 @@
v-model="formData.explanation"></el-input>
</div>
</div>
- <!-- <div class="search_thing" style="margin-bottom: 16px;">
- <div class="search_label" style="width:120px">棣栨棰佸彂鏃堕棿锛�</div>
- <div class="search_input">
- <el-date-picker style="width:100%" v-model="formData.firstTime"
- type="datetime"
- size="small"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- clearable
- placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </div>
- </div>
+
+
<div class="search_thing" style="margin-bottom: 16px;">
- <div class="search_label" style="width:120px">鏈�杩戦鍙戞椂闂达細</div>
+ <div class="search_label" style="width:120px"><span class="required-span">* </span>棰佸彂鏃堕棿锛�</div>
<div class="search_input">
- <el-date-picker style="width:100%" v-model="formData.recentlyTime"
+ <el-date-picker style="width:100%" v-model="formData.dateOfIssuance"
type="datetime"
size="small"
format="yyyy-MM-dd HH:mm:ss"
@@ -216,7 +205,7 @@
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</div>
- </div> -->
+ </div>
<div class="search_thing" style="margin-bottom: 16px;">
<div class="search_label" style="width:120px"><span class="required-span">* </span>鍒版湡鏃堕棿锛�</div>
<div class="search_input">
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 3485c11..bf4cdcc 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -185,12 +185,12 @@
filterable
clearable></el-cascader>
</el-form-item>
- <el-form-item label="鏈�杩戞牎鍑嗘棩鏈�:">
+ <el-form-item label="鏈�杩戞牎鍑嗘棩鏈�:" v-if="isUp">
<el-date-picker :disabled="isUp" style="width:100%" v-model="formData.latestTraceability" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" type="date" size="small" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
- <el-form-item label="涓嬫鏍″噯鏃ユ湡:">
+ <el-form-item label="涓嬫鏍″噯鏃ユ湡:" v-if="isUp">
<el-date-picker :disabled="isUp" style="width:100%" v-model="formData.latestTraceability" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" type="date" size="small" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
@@ -327,7 +327,7 @@
</el-form-item>
<el-form-item label="妫�娴嬮」鐩�:">
<el-cascader
- v-model="formData.insProductIds"
+ v-model="formData2.insProductIds"
:options="options"
:show-all-levels="false"
:props="props"
@@ -335,18 +335,9 @@
style="width:100%"
collapse-tags
separator=","
+ filterable
clearable></el-cascader>
</el-form-item>
- <!-- <el-form-item label="鏈�杩戞牎鍑嗘棩鏈�:">
- <el-date-picker style="width:100%" v-model="formData2.latestTraceability" format="yyyy-MM-dd"
- value-format="yyyy-MM-dd" type="date" size="small" placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="涓嬫鏍″噯鏃ユ湡:">
- <el-date-picker style="width:100%" v-model="formData2.latestTraceability" format="yyyy-MM-dd"
- value-format="yyyy-MM-dd" type="date" size="small" placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </el-form-item> -->
<el-form-item label="璁惧绫诲瀷:">
<el-select v-model="formData2.largeCategory" placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option v-for="item in equipmentList" :key="item.value" :label="item.label"
@@ -400,13 +391,14 @@
return {
//鏄惁鏄。妗堜慨璁� true涓嶆槸 false鏄�
isUp: true,
- formData: {},
+ formData: {
+ },
formData2: {
imageUpload: '',
imageName: ''
},
value: '',
- props: { multiple: true,emitPath:false,value:'id',label:'name' },
+ props: { multiple: true,emitPath:false,value:'id',label:'name' },
options: [],
labelPosition: 'right',
dialogVisible: false,
@@ -439,23 +431,7 @@
}],
tagField: {
deviceStatus: {
- select: [{
- value: 0,
- type: 'success',
- label: '鑹ソ'
- }, {
- value: 1,
- type: 'info',
- label: '鎶ュ簾'
- }, {
- value: 2,
- type: 'danger',
- label: '鍋滅敤'
- }, {
- value: 3,
- type: 'danger',
- label: '瀛樼枒'
- }]
+ select: []
},
equipmentManager: {
select: []
@@ -523,7 +499,7 @@
this.selectEnumByCategory()
this.selectDevicePrincipal()
this.obtainItemParameterList()
- this.getInsProductIds()
+ this.getInsProductIds()
},
methods: {
obtainItemParameterList() {
@@ -576,6 +552,7 @@
category: "璁惧鐘舵��"
}).then(res => {
this.deviceStatusList = res.data
+ this.componentData.tagField.deviceStatus.select = res.data
})
this.$axios.post(this.$api.enums.selectEnumByCategory, {
category: "璁惧鍒嗙被"
@@ -617,10 +594,20 @@
})
},
handleClose() {
+ this.formData = {}
+ this.formData2 = {
+ imageUpload: '',
+ imageName: ''
+ }
this.dialogVisible = false;
this.upLoad = false;
},
handleClose2() {
+ this.formData = {}
+ this.formData2 = {
+ imageUpload: '',
+ imageName: ''
+ }
this.dialogVisible2 = false;
this.upLoad = false;
},
@@ -673,12 +660,10 @@
},
submitForm() {
this.upLoad = true;
- // let authorizedPerson = this.formData.authorizedPerson.length > 0 ? this.formData.authorizedPerson.join(',') : ''
- // delete this.formData.createTime
- // delete this.formData.updateTime
- // delete this.formData.createUser
- // delete this.formData.updateUser
- // this.formData.authorizedPerson = authorizedPerson
+ delete this.formData.createTime
+ delete this.formData.updateTime
+ delete this.formData.createUser
+ delete this.formData.updateUser
this.formData.insProductIds = this.formData.insProductIds.join()
this.$axios.post(this.$api.deviceScope.upDeviceParameter, this.formData, {
headers: {
@@ -701,9 +686,6 @@
},
submitForm2() {
this.upLoad2 = true;
- // let authorizedPerson = this.formData2.authorizedPerson.length > 0 ? this.formData2.authorizedPerson.join(',') :
- // ''
- // this.formData2.authorizedPerson = authorizedPerson
this.formData.insProductIds = this.formData.insProductIds.join()
this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
headers: {
diff --git a/src/components/view/a7-standard-method.vue b/src/components/view/a7-standard-method.vue
index 618b72b..60a635d 100644
--- a/src/components/view/a7-standard-method.vue
+++ b/src/components/view/a7-standard-method.vue
@@ -223,28 +223,35 @@
})
},
getQualificationList(){
- this.$axios.post(this.$api.certification.getCertificationDetail,{
- page: {
- current: -1,
- size: -1
- },
- entity:{
- name: null,
- }}, {
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res => {
- if(res.code==200){
- let list = res.data.body.records.map(item => {
- item.label = item.name
- item.value = item.id
- return item
- });
- this.componentData.selectField.qualificationId.select = list
- this.componentData.tagField.qualificationId.select = list
- }
- })
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "璧勮川鍚嶇О"
+ }).then(res => {
+ let list = res.data
+ this.componentData.selectField.qualificationId.select = list
+ this.componentData.tagField.qualificationId.select = list
+ })
+ // this.$axios.post(this.$api.certification.getCertificationDetail,{
+ // page: {
+ // current: -1,
+ // size: -1
+ // },
+ // entity:{
+ // name: null,
+ // }}, {
+ // headers: {
+ // 'Content-Type': 'application/json'
+ // }
+ // }).then(res => {
+ // if(res.code==200){
+ // let list = res.data.body.records.map(item => {
+ // item.label = item.name
+ // item.value = item.id
+ // return item
+ // });
+ // this.componentData.selectField.qualificationId.select = list
+ // this.componentData.tagField.qualificationId.select = list
+ // }
+ // })
}
}
}
diff --git a/src/components/view/notice-detail.vue b/src/components/view/notice-detail.vue
index bcea964..c4661e0 100644
--- a/src/components/view/notice-detail.vue
+++ b/src/components/view/notice-detail.vue
@@ -1,7 +1,7 @@
<template>
<div class="notice-detail-page">
<div class="notice-detail-head">
- <h4 style="margin-bottom: 16px;">{{ noticeInfo.theme }}</h4>
+ <h4 style="margin-bottom: 16px;">{{ noticeInfo.theme }} <el-tag style="margin-left: 10px;" :type="options.find(m=>m.value==noticeInfo.messageType).type" v-if="options.find(m=>m.value==noticeInfo.messageType)">{{ options.find(m=>m.value==noticeInfo.messageType).label }}</el-tag></h4>
<p style="font-size: 12px;color: #999;margin-bottom: 20px;">
<!-- <span>娑堟伅绫诲瀷锛氬鎵� </span> -->
<span>鍙戦�佷汉锛歿{ noticeInfo.createUser }} </span>
@@ -38,6 +38,7 @@
data() {
return{
noticeInfo:{},
+ options:[]
}
},
created(){
@@ -50,7 +51,18 @@
console.log(this.noticeInfo);
sessionStorage.setItem("noticeInfo", msg);
});
+ this.getTypeDicts()
},
+ methods:{
+ getTypeDicts() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "娑堟伅绫诲瀷"
+ }).then(res => {
+ let data = res.data
+ this.options = data;
+ })
+ },
+ }
}
</script>
diff --git a/src/main.js b/src/main.js
index 4d5253b..43d09d1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,9 +13,9 @@
//鏈湴
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://192.168.11.249:8001';//寮�
-// const javaApi = 'http://192.168.11.50:8001';//濮�
+const javaApi = 'http://192.168.11.50:8001';//濮�
// const javaApi = 'http://192.168.11.2:8001';//鏌�
// const javaApi = 'http://114.132.189.42:9006';//娴嬭瘯鏈�
//鑳滀簯鏈嶅姟鍣�
--
Gitblit v1.9.3