|
@@ -154,6 +154,7 @@ const multipleRow = ref(true);
|
|
|
|
|
|
const dataDeviceList = ref([]);
|
|
|
const onSelectedFinish = (val) => {
|
|
|
+ dataDeviceList.value=[];
|
|
|
if (Object.keys(val).length == 0) {
|
|
|
ElMessage.error("请选择设备,数据不能为空!");
|
|
|
}
|
|
@@ -181,11 +182,12 @@ const store = useProcessStore();
|
|
|
const ctableRef = ref({});
|
|
|
const csObj = ref<any>(null);
|
|
|
const startCreat = () => {
|
|
|
- ctableRef.value.startSelect({ deviceType: "DDS" });
|
|
|
ctableRef.value?.mergeOption({
|
|
|
selection: true,
|
|
|
reserveSelection: true,
|
|
|
});
|
|
|
+ ctableRef.value.startSelect({ deviceType: "DDS" });
|
|
|
+
|
|
|
};
|
|
|
const currentPage = ref(1);
|
|
|
const handlePageChange = (val: number) => {
|
|
@@ -232,6 +234,8 @@ const afterTimeStart = () => {
|
|
|
testParam.value.operationName = store.scanInfo.operationName;
|
|
|
testParam.value.deviceNo = currentToStartRow.deviceNo;
|
|
|
testParam.value.times = startSettingTime.value;
|
|
|
+ const param = ref({ processId: store.scanInfo.id });
|
|
|
+
|
|
|
startCSSJTesting(testParam.value).then((data) => {
|
|
|
if (data.code === "200") {
|
|
|
dialogDevice.value = false;
|
|
@@ -244,6 +248,9 @@ const afterTimeStart = () => {
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
+ getDataDevice(param.value).then((data) => {
|
|
|
+ selectedDeviceList.value = JSON.parse(JSON.stringify(data.data));
|
|
|
+ });
|
|
|
};
|
|
|
onMounted(() => {
|
|
|
getList();
|
|
@@ -320,9 +327,17 @@ const handleDialogCancel = () => {
|
|
|
|
|
|
// 开始测试后选择时间
|
|
|
let currentToStartRow = null;
|
|
|
+const rowTime=ref([]);
|
|
|
const preToStart = (row) => {
|
|
|
currentToStartRow = JSON.parse(JSON.stringify(row));
|
|
|
+ if(row.beginTime){
|
|
|
+ rowTime.value.push(row.beginTime);
|
|
|
+ rowTime.value.push(row.endTime);
|
|
|
+ }
|
|
|
+ startSettingTime.value=rowTime.value;
|
|
|
+ rowTime.value=[];
|
|
|
startSettingVisible.value = true;
|
|
|
+
|
|
|
};
|
|
|
|
|
|
const preDel = (row) => {
|