合并master分支
This commit is contained in:
@@ -19,6 +19,7 @@ VITE_API_URL=/api
|
|||||||
|
|
||||||
# 开发环境跨域代理,支持配置多个
|
# 开发环境跨域代理,支持配置多个
|
||||||
|
|
||||||
|
#VITE_PROXY=[["/api","http://127.0.0.1:18092/"]]
|
||||||
VITE_PROXY=[["/api","http://192.168.1.124:18092/"]]
|
VITE_PROXY=[["/api","http://192.168.1.124:18092/"]]
|
||||||
#VITE_PROXY=[["/api","http://192.168.1.125:18092/"]]
|
#VITE_PROXY=[["/api","http://192.168.1.125:18092/"]]
|
||||||
# VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文
|
# VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文
|
||||||
|
|||||||
@@ -22,5 +22,5 @@ VITE_DROP_CONSOLE=true
|
|||||||
VITE_PWA=true
|
VITE_PWA=true
|
||||||
|
|
||||||
# 线上环境接口地址
|
# 线上环境接口地址
|
||||||
# VITE_API_URL="/api" # 打包时用
|
#VITE_API_URL="/api" # 打包时用
|
||||||
VITE_API_URL="http://192.168.1.125:18092/"
|
VITE_API_URL="http://192.168.1.125:18092/"
|
||||||
|
|||||||
@@ -193,6 +193,7 @@ const handleNodeClick = async (data: any) => {
|
|||||||
currentDesc.value = data.sourceDesc
|
currentDesc.value = data.sourceDesc
|
||||||
scriptType = data.scriptType ?? scriptType
|
scriptType = data.scriptType ?? scriptType
|
||||||
|
|
||||||
|
console.log("点击左侧树节点触发事件handleNodeClick", checkIndex.value)
|
||||||
if (checkIndex.value) {
|
if (checkIndex.value) {
|
||||||
await updateTableData()
|
await updateTableData()
|
||||||
activeTab.value = 'resultTab'
|
activeTab.value = 'resultTab'
|
||||||
@@ -244,7 +245,7 @@ watch(() => formContent.chnNum, async (newVal, oldVal) => {
|
|||||||
|
|
||||||
watch(currentCheckItem, (newVal, oldVal) => {
|
watch(currentCheckItem, (newVal, oldVal) => {
|
||||||
console.log("当前检测项", newVal);
|
console.log("当前检测项", newVal);
|
||||||
if (newVal) {
|
if (newVal!== '') {
|
||||||
doCurrentCheckItemUpdate(newVal)
|
doCurrentCheckItemUpdate(newVal)
|
||||||
} else {
|
} else {
|
||||||
activeTab.value = 'resultTab'
|
activeTab.value = 'resultTab'
|
||||||
@@ -272,8 +273,8 @@ const defaultOperate = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const updateTableData = async () => {
|
const updateTableData = async () => {
|
||||||
// console.log("左侧树被选中的叶子节点checkIndex", checkIndex.value);
|
console.log("左侧树被选中的叶子节点checkIndex", checkIndex.value);
|
||||||
if (checkIndex.value) {
|
if (checkIndex.value !== '') {
|
||||||
// console.log("更新表格数据");
|
// console.log("更新表格数据");
|
||||||
// 发起请求,查询该测试项的检测结果
|
// 发起请求,查询该测试项的检测结果
|
||||||
const {data} = await getTableData({
|
const {data} = await getTableData({
|
||||||
|
|||||||
@@ -152,10 +152,10 @@
|
|||||||
</el-drawer>
|
</el-drawer>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<resultPopup
|
<!-- <resultPopup-->
|
||||||
:visible="resultDialogVisible"
|
<!-- :visible="resultDialogVisible"-->
|
||||||
@update:visible="resultDialogVisible = $event"
|
<!-- @update:visible="resultDialogVisible = $event"-->
|
||||||
></resultPopup>
|
<!-- ></resultPopup>-->
|
||||||
<dataCheckSingleChannelSingleTestPopup ref="dataCheckSingleChannelSingleTestPopupRef"/>
|
<dataCheckSingleChannelSingleTestPopup ref="dataCheckSingleChannelSingleTestPopupRef"/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -225,7 +225,7 @@ const testLogList = reactive<CheckData.LogItem[]>([{type: 'info', log: '暂无
|
|||||||
const testStatus = toRef(props, 'testStatus')
|
const testStatus = toRef(props, 'testStatus')
|
||||||
const webMsgSend = toRef(props, 'webMsgSend')
|
const webMsgSend = toRef(props, 'webMsgSend')
|
||||||
|
|
||||||
const resultDialogVisible = ref(false)
|
// const resultDialogVisible = ref(false)
|
||||||
const scrollContainerRef = ref();
|
const scrollContainerRef = ref();
|
||||||
const dataCheckSingleChannelSingleTestPopupRef = ref<InstanceType<typeof dataCheckSingleChannelSingleTestPopup>>()
|
const dataCheckSingleChannelSingleTestPopupRef = ref<InstanceType<typeof dataCheckSingleChannelSingleTestPopup>>()
|
||||||
|
|
||||||
@@ -643,7 +643,6 @@ watch(webMsgSend, function (newValue, oldValue) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}, {deep: true})
|
}, {deep: true})
|
||||||
|
|
||||||
const handleStartItem = (code: string, desc: string | undefined) => {
|
const handleStartItem = (code: string, desc: string | undefined) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user