From b6c6b2278eba6895000c396987c64c10ef72d886 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 18 七月 2024 18:01:57 +0800
Subject: [PATCH] 修改检验任务
---
src/components/do/b1-ins-order/add.vue | 2
src/main.js | 6
src/components/do/b1-inspect-order-plan/Inspection.vue | 265 ++++++++++++++++++++++++++++++++++++----------------
src/components/do/b1-ins-order/fiberoptic-config.vue | 12 +
src/assets/api/controller.js | 2
5 files changed, 196 insertions(+), 91 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 00ab72b..4a53106 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -151,6 +151,8 @@
saveDataAcquisitionConfiguration: "/deviceScope/saveDataAcquisitionConfiguration", // 缁存姢鏁伴噰閰嶇疆
queryDataAcquisitionConfiguration: "/deviceScope/queryDataAcquisitionConfiguration", // 鏌ヨ鏁伴噰閰嶇疆
deleteDataAcquisitionConfiguration: "/deviceScope/deleteDataAcquisitionConfiguration", // 鍒犻櫎鏁伴噰閰嶇疆
+ determineWhetherToCollectData: "/deviceScope/determineWhetherToCollectData", // 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�
+ dataCollection: "/deviceScope/dataCollection", // 鏁伴噰-鏁版嵁閲囬泦
}
const insOrder = {
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 623669a..17c467f 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -2655,6 +2655,7 @@
getTotal() {
this.totalArr = []
this.total = 0;
+ console.log(this.sampleList)
this.sampleList.forEach(item => {
if (item.insProduct && item.insProduct.length > 0) {
item.insProduct.forEach(a => {
@@ -2700,6 +2701,7 @@
if (item.manHourGroup === '' || !item.manHourGroup) {
return true
} else {
+ console.log(item)
mySet.add(item.manHourGroup)
let num2 = mySet.size
if (num2 > num1) {
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index 8255f67..94f73f9 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -107,8 +107,8 @@
<el-col :span="12" v-if="packageInfo.ismiers">
<div class="grid-content">
<h5>鍏夌氦甯�
- <el-button size="mini" type="primary" class="btns" @click="addFibers"
- :disabled="miresModel===null||miresStandard===null" v-if="active==1">鐢熸垚鍏夌氦甯�</el-button>
+ <!-- <el-button size="mini" type="primary" class="btns" @click="addFibers"
+ :disabled="miresModel===null||miresStandard===null" v-if="active==1">鐢熸垚鍏夌氦甯�</el-button> -->
<el-button size="mini" class="btns" @click="clearFibers" :disabled="selectBushing.length === 0" v-if="active==1">娓呴櫎</el-button>
</h5>
<div
@@ -152,8 +152,10 @@
</el-col>
<el-col :span="!packageInfo.ismiers?24:12">
<div class="grid-content">
- <h5>鍏夌氦<el-button size="mini" type="primary" class="btns" @click="addFiber"
- :disabled="mireModel===null||mireStandard===null" v-if="active==1">鍏夌氦閰嶈壊</el-button></h5>
+ <h5>鍏夌氦
+ <!-- <el-button size="mini" type="primary" class="btns" @click="addFiber"
+ :disabled="mireModel===null||mireStandard===null" v-if="active==1">鍏夌氦閰嶈壊</el-button> -->
+ </h5>
<div
style="display: flex;align-items: center;justify-content: space-between;margin: 4px 0 6px 0;padding: 0 12px;box-sizing: border-box;">
<div class="search-item" style="width: 50%;margin-right: 16px;">
@@ -544,6 +546,7 @@
this.productList.forEach(a => {
if (a.state == 1) this.toggleSelection(a)
})
+ this.addFiber()
}, 200)
})
},
@@ -566,6 +569,7 @@
this.productList2.forEach(a => {
if (a.state == 1) this.toggleSelection(a)
})
+ this.addFibers()
}, 200)
})
},
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index ef99776..1d3b6c3 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -257,7 +257,7 @@
</el-form>
</div>
<div class="center">
- <div class="search" style="text-align: left;display: flex;align-items: center;justify-content: space-between;overflow-x: auto;">
+ <div class="search" style="text-align: left;display: flex;align-items: center;justify-content: space-between;">
<div style="display: flex;align-items: center;">
<span v-if="tableList.length>0">妫�楠屾ā鏉匡細</span>
<el-radio-group v-model="currentTable" size="small">
@@ -267,15 +267,35 @@
</div>
<div style="display: flex;align-items: center;">
<span v-if="fibers.length>0"> 鍏夌氦甯︼細</span>
- <el-radio-group v-model="currentTab" size="small" v-if="fibers.length>0" @input="m=>handleChange(m,1)">
+ <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,1)" v-if="fibers.length>0" size="small">
+ <el-option
+ v-for="item in fibers"
+ :key="item.value"
+ :label="item.code"
+ :value="item.id">
+ <span style="float: left">{{ item.code}}</span>
+ <el-tag :type="item.state==1?'success':'danger'" style="float: right;margin-top: 5px;" size="small">{{ item.state==1?'宸叉':'鏈' }}</el-tag>
+ </el-option>
+ </el-select>
+ <!-- <el-radio-group v-model="currentTab" size="small" v-if="fibers.length>0" @input="m=>handleChange(m,1)">
<el-radio-button :label="item.id" v-for="(item,index) in fibers" :key="index"
size="small">{{ item.code }}</el-radio-button>
- </el-radio-group>
+ </el-radio-group> -->
<span v-if="fiber.length>0"> 鍏夌氦锛�</span>
- <el-radio-group v-model="currentTab" size="small" v-if="fiber.length>0" @input="m=>handleChange(m,2)">
+ <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,2)" v-if="fiber.length>0" size="small">
+ <el-option
+ v-for="item in fiber"
+ :label="item.bushColor+'-'+item.color"
+ :key="item.id"
+ :value="item.id">
+ <span style="float: left">{{ item.bushColor+'-'+item.color }}</span>
+ <el-tag :type="item.state==1?'success':'danger'" style="float: right;margin-top: 5px;" size="small">{{ item.state==1?'宸叉':'鏈' }}</el-tag>
+ </el-option>
+ </el-select>
+ <!-- <el-radio-group v-model="currentTab" size="small" v-if="fiber.length>0" @input="m=>handleChange(m,2)">
<el-radio-button :label="item.id" v-for="(item,index) in fiber" :key="index"
- size="small">{{ item.color }}</el-radio-button>
- </el-radio-group>
+ size="small">{{ item.bushColor+'-'+item.color }}</el-radio-button>
+ </el-radio-group> -->
<el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;" v-if="PROJECT=='妫�娴嬩腑蹇�'">
<el-form-item label="娓╁害:" style="margin-bottom: 0;">
<el-input v-model="otherForm.temperature" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
@@ -286,6 +306,7 @@
<span style="margin-left: 4px;">%</span>
</el-form-item>
</el-form>
+ <el-button type="primary" size="small">缂栬緫鏁伴噰</el-button>
</div>
</div>
<div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'">
@@ -298,7 +319,7 @@
:style="`background:${n.v.bg?n.v.bg:''};color:${n.v.fc};font-size:${n.v.fs}px;width:${handleWidth(n)}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
<div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`"
:style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]}px;`">
- <template v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��' && state==1">
+ <template v-if="n.v.ps!=undefined && typeof n.v.ps.value ==='string'&& n.v.ps.value.includes('妫�楠屽��') && state==1">
<el-input v-if="getInspectionValueType(n.i) == 1" class="table_input" v-model="n.v.v"
:disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
@input="handleInput(n)"
@@ -336,6 +357,7 @@
<el-option v-for="item in equipOptions" :key="item.value" :label="item.value" :value="item.value">
</el-option>
</el-select>
+ <el-button type="primary" icon="el-icon-document-copy" size="small" circle title="鏁伴噰" v-if="n.isItADataAcquisitionDevice&&PROJECT=='妫�娴嬩腑蹇�'" @click="getDataAcquisitionDevice(n.v.v)"></el-button>
</template>
<template v-else-if="n.v.ps!=undefined && n.v.ps.value==='瑕佹眰鍊�' && state==1">
<span :style="`font-family:${n.v.ff} !important;`">{{getTell(n.i)}}</span>
@@ -395,9 +417,9 @@
</tbody>
</table>
</div>
- <div class="center-box" v-loading="tableLoading" v-else>
+ <div v-loading="tableLoading" v-else>
<el-divider></el-divider>
- <h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;">娓╁害寰幆妫�楠屽師濮嬭褰�</h4>
+ <h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;text-align: center;">娓╁害寰幆妫�楠屽師濮嬭褰�</h4>
<el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
<el-form-item label="鍨嬪彿:" style="margin-bottom: 0;">
<el-input clearable v-model="wareForm0.model" disabled size="small" placeholder=""></el-input>
@@ -468,76 +490,92 @@
<el-table-column
label="搴忓彿"
type="index"
- width="65"
+ width="60"
align="center"
>
</el-table-column>
<el-table-column
prop="bushColor"
label="绠¤壊鏍�"
- width="120"
+ width="80"
align="center">
</el-table-column>
<el-table-column
prop="code"
label="鍏夌氦甯︾紪鍙�"
- width="150"
+ width="110"
align="center">
</el-table-column>
<el-table-column
prop="color"
label="鍏夌氦鑹叉爣"
align="center"
- width="120">
+ width="90">
</el-table-column>
- <el-table-column
- prop="inspectionItemClass"
- label="鍏夌氦椤圭洰"
- align="center"
- width="130">
- </el-table-column>
- <el-table-column
- prop="value0"
- label="澶栫"
- align="center"
- width="130">
- <template slot-scope="scope">
- <el-input size="small" v-model="scope.row.value0" placeholder="" @change="m=>changeItem(scope.row)"></el-input>
- </template>
- </el-table-column>
- <el-table-column
- prop="value1"
- label="鍐呯"
- align="center"
- width="130">
- <template slot-scope="scope">
- <el-input size="small" v-model="scope.row.value1" placeholder="" @change="m=>changeItem(scope.row)"></el-input>
- </template>
- </el-table-column>
- <el-table-column
- prop="comValue"
- align="center"
- label="琛板噺绯绘暟"
- min-width="150">
- </el-table-column>
- <el-table-column
- prop="resValue"
- label="琛板噺宸�"
- align="center"
- v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'"
- min-width="150">
- </el-table-column>
- <el-table-column
- prop="insResult"
- label="缁撹"
- align="center"
- min-width="150" v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'">
- <template slot-scope="scope">
- <span v-if="scope.row.insResult===1" style="color: green;">鍚堟牸</span>
- <span v-else-if="scope.row.insResult===0" style="color: red;">涓嶅悎鏍�</span>
- <span v-else>寰呭畾</span>
- </template>
- </el-table-column>
+ <template v-for="(item,index) in wareLength">
+ <el-table-column
+ prop="value0"
+ label="澶栫"
+ align="center"
+ width="80" :key="(new Date())+'1'">
+ <template slot="header">
+ {{ '澶栫'+(index+1) }}
+ </template>
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.arr[index].value0" placeholder="" @change="m=>changeItem(scope.row.arr[index])"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="value1"
+ label="鍐呯"
+ align="center"
+ width="80" :key="(new Date())+'2'">
+ <template slot="header">
+ {{ '鍐呯'+(index+1) }}
+ </template>
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.arr[index].value1" placeholder="" @change="m=>changeItem(scope.row.arr[index])"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="comValue"
+ align="center"
+ min-width="150" :key="(new Date())+'3'">
+ <template slot="header">
+ {{ '琛板噺绯绘暟'+item }}
+ </template>
+ <template slot-scope="scope">
+ <span>{{ scope.row.arr[index].comValue }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="resValue"
+ label="琛板噺宸�"
+ align="center"
+ v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'"
+ min-width="90" :key="(new Date())+'4'">
+ <template slot="header">
+ {{ '琛板噺宸�'+(index+1) }}
+ </template>
+ <template slot-scope="scope">
+ <span>{{ scope.row.arr[index].resValue }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="insResult"
+ label="缁撹"
+ align="center"
+ min-width="70" v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'" :key="(new Date())+'5'">
+ <template slot="header">
+ {{ '缁撹'+(index+1) }}
+ </template>
+ <template slot-scope="scope">
+ <span v-if="scope.row.arr[index].insResult===1" style="color: green;">鍚堟牸</span>
+ <span v-else-if="scope.row.arr[index].insResult===0" style="color: red;">涓嶅悎鏍�</span>
+ <span v-else>寰呭畾</span>
+ </template>
+ </el-table-column>
+ </template>
</el-table>
</div>
<el-upload :action="action"
@@ -798,9 +836,7 @@
wareForm0:{},
numOptions:[],
temperatureOptions:[],
- wareTableData:[
- {}
- ],
+ wareTableData:[],
otherForm:{
humidity:null,
temperature:null,
@@ -813,6 +849,8 @@
},
result: null,
worker: null,
+ dataAcquisitionBtn:{},
+ wareLength:[]
}
},
computed: {
@@ -957,6 +995,11 @@
this.stopWorker();
},
methods: {
+ getDataAcquisitionDevice(managementNumber){
+ this.$axios.get(this.$api.deviceScope.dataCollection+'?managementNumber='+managementNumber+'&entrustCode='+this.insOrder.entrustCode+'&sampleCode='+this.currentSample.sampleCode).then(res=>{
+ console.log(111,res)
+ })
+ },
startWorker() {
if (this.worker) {
this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
@@ -997,7 +1040,7 @@
}
}]
if(this.wareForm.inspectionItemSubclass!='20(甯告俯)'){
- row.resValue = row.comValue?Math.abs(row.comValue-20).toFixed(3):''
+ row.resValue = row.comValue?Math.abs(row.comValue-Number(row.insProduct.complue)).toFixed(3):''
this.param[row.id].resValue.v.v = row.resValue
if(row.ask&&row.resValue){
if(row.ask.includes('<')){
@@ -1020,9 +1063,10 @@
this.saveInsContext()
},
wareFormChange(m,type){
- if(this.PROJECT!='妫�娴嬩腑蹇�'){
+ if(this.PROJECT!='妫�娴嬩腑蹇�'||!this.tableLists.find(m=>m.templateId==this.currentTable)||this.tableLists.find(m=>m.templateId==this.currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'){
return
}
+ // this.$refs.wareTableData&&this.$refs.wareTableData.doLayout()
if(m&&type){
this.wareForm[type] = m
}
@@ -1120,9 +1164,54 @@
}
return obj
})
- this.wareTableData = productVos
+ let arr = []
+ let arr0 = []
+ let mySet = new Set()
+ productVos.forEach((m,i)=>{
+ let num0 = mySet.size
+ mySet.add(m.inspectionItemClass)
+ let num1 = mySet.size
+ if(num0!=num1){
+ if(i>0){
+ arr.push(arr0)
+ }
+ arr0 = []
+ arr0.push(m)
+ }else{
+ arr0.push(m)
+ }
+ })
+ arr.push(arr0)
+ let arr1 = []
+ this.wareLength = [];
+ for(let i=0;i<arr.length;i++){
+ arr1.push([])
+ this.wareLength.push(arr[i][0].inspectionItemClass)
+ }
+ arr.forEach((item,index)=>{
+ item.forEach((m,i)=>{
+ try {
+ arr1[i].push(m)
+ } catch (e) {
+ console.log(e)
+ }
+ })
+ })
+ let arr2 = []
+ arr1.forEach(item=>{
+ let obj = {
+ bushColor:item[0].bushColor,
+ code:item[0].code,
+ color:item[0].color,
+ arr:item
+ }
+ arr2.push(obj)
+ })
+ console.log(arr2)
+ this.wareTableData = arr2
})
this.getEquipOptions(true,this.currentSample.insProduct[0].id)
+ // this.$refs.wareTableData&&this.$refs.wareTableData.doLayout()
},
subOtherForm(m,type){
let ids = []
@@ -1279,6 +1368,7 @@
}
})
this.getTableLists0(list)
+ this.getReportModel(this.currentSample.id)
}else{
this.tableLists = []
this.tableList = []
@@ -1484,22 +1574,11 @@
count4 += 1
}
}
- // else if (c.v.ps != undefined && c.v.ps.value === '鍗曚綅'&&this.PROJECT=='妫�娴嬩腑蹇�'){
- // if(count4==1||count4==2){
- // str += c.v.v?c.v.v:''
- // console.log('str',str,c)
- // count4 += 1
- // }
- // }
}
})
if (str != '') {
- console.log('str',str)
let count2 = 0
for (let i in this.currentSample.insProduct) {
- // (this.currentSample
- // .insProduct[i].unit?this.currentSample
- // .insProduct[i].unit:'')
if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample
.insProduct[i].inspectionItem +(this.currentSample.insProduct[i].inspectionItemSubclass == null ? '' : this.currentSample.insProduct[i].inspectionItemSubclass)+(this.currentSample.insProduct[i].inspectionItemClass==null||this.PROJECT!='瑁呭鐢电紗'?'':this.currentSample.insProduct[i].inspectionItemClass) ===
str) {
@@ -1568,7 +1647,7 @@
let finalList = []; //鏈�缁堝�煎垪琛�
conclusionList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '缁撹')
finalList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '鏈�缁堝��')
- a.template.forEach(b => {
+ a.template.forEach( b => {
if (b.v.ps != undefined && b.v.ps.value === '搴忓彿' && (b.v.mc == undefined || Object.keys(b.v.mc)
.length === 4)) {
count1++
@@ -1577,7 +1656,7 @@
if (b.v.ps != undefined && b.v.ps.value === '瑕佹眰鍊�') {
b.v.v = this.getAsk(b.i)
}
- if (b.v.ps != undefined && b.v.ps.value === '妫�楠屽��') {
+ if (b.v.ps != undefined && typeof b.v.ps.value ==='string'&&b.v.ps.value.includes('妫�楠屽��')) {
b.v.v = ''
b.u = ''
b.i && this.param[b.i].insValue.push(b)
@@ -1639,7 +1718,7 @@
this.tableWidth += (a.style.columnlen[i] === undefined ? 100 : a.style.columnlen[i])
}
})
- this.currentSample.insProduct.forEach(a => {
+ this.currentSample.insProduct.forEach(async a => {
try {
let comValue = JSON.parse(a.insProductResult.comValue)
for (var i = 0; i < comValue.length; i++) {
@@ -1648,9 +1727,14 @@
} catch (e) {}
try {
let insValue = JSON.parse(a.insProductResult.insValue)
+ console.log(2222,insValue)
for (let i = 0; i < insValue.length; i++) {
- this.param[a.id].insValue[i].v.v = insValue[i].v
- this.param[a.id].insValue[i].u = insValue[i].u
+ if(this.param[a.id].insValue.find(m=>m.c==insValue[i].c&&m.r==insValue[i].r)){
+ this.param[a.id].insValue.find(m=>m.c==insValue[i].c&&m.r==insValue[i].r).v.v = insValue[i].v
+ this.param[a.id].insValue.find(m=>m.c==insValue[i].c&&m.r==insValue[i].r).u = insValue[i].u
+ // this.param[a.id].insValue[i].v.v = insValue[i].v
+ // this.param[a.id].insValue[i].u = insValue[i].u
+ }
}
} catch (e) {}
try {
@@ -1661,6 +1745,12 @@
this.$set(this.equipForm,`code`+i,equipValue[i].v)
}else{
this.param[a.id].equipValue[i].v.v = equipValue[i].v
+ if(equipValue[i].v){
+ let isItADataAcquisitionDevice = await this.determineWhetherToCollectData(equipValue[i].v)
+ this.param[a.id].equipValue[i].isItADataAcquisitionDevice = isItADataAcquisitionDevice
+ }else{
+ this.param[a.id].equipValue[i].isItADataAcquisitionDevice = false
+ }
}
}
} catch (e) {}
@@ -1728,6 +1818,7 @@
}
}
}
+ console.log(2222,this.param)
this.saveInsContext()
})
break;
@@ -1744,6 +1835,10 @@
// this.stopWorker(); // 澶勭悊瀹屾垚鍚庡仠姝� Worker
// }
};
+ },
+ async determineWhetherToCollectData(managementNumber){
+ let res = await this.$axios.get(this.$api.deviceScope.determineWhetherToCollectData+'?managementNumber='+managementNumber)
+ return res.data
},
handleFraction(str){
if(str&&typeof(str)=='string'&&str.includes('/')){
@@ -1939,6 +2034,7 @@
this.equipOptions = res.data.map(m => {
m.value = m.managementNumber
m.label = m.deviceName
+ m.isItADataAcquisitionDevice = m.isItADataAcquisitionDevice
return m
})
}
@@ -2096,8 +2192,9 @@
if (this.equipOptions[i].value === val) {
for (let i1 in this.param[n.i].equipName) {
if (this.param[n.i].equipName[i1].i === n.i && this.param[n.i].equipName[i1].r === n.r) {
+ this.$set(this.param[n.i].equipValue[i1].v,'v',val)
this.$set(this.param[n.i].equipName[i1].v,'v',this.equipOptions[i].label)
- // this.param[n.i].equipName[i1].v.v = this.equipOptions[i].label
+ this.param[n.i].equipValue[i1].isItADataAcquisitionDevice = this.equipOptions[i].isItADataAcquisitionDevice
}
}
}
diff --git a/src/main.js b/src/main.js
index 0f44237..0bd0e29 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,15 +20,15 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-// const javaApi = 'http://10.1.88.162:8001';
+const javaApi = 'http://192.168.15.249:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
// const javaApi = 'http://114.132.189.42:1234';
// //妫�娴嬩腑蹇冩寮忓簱
-Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
-const javaApi = 'http://10.1.200.86:8001';
+// Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
+// const javaApi = 'http://10.1.200.86:8001';
//瑁呭鐢电紗娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
--
Gitblit v1.9.3