|
@@ -1,23 +1,26 @@
|
|
|
<script lang="ts" setup>
|
|
|
import { computed, ref } from "vue";
|
|
|
import type { TabsPaneContext } from "element-plus";
|
|
|
-import { instrumentConfigPage, globalDataPage } from "@/api/config";
|
|
|
+import {
|
|
|
+ instrumentConfigPage,
|
|
|
+ globalDataPage,
|
|
|
+ configUpdate,
|
|
|
+ configAdd,
|
|
|
+ configDel,
|
|
|
+ globalDataAdd,
|
|
|
+ globalDataDel,
|
|
|
+ globalDataUpdate,
|
|
|
+} from "@/api/config";
|
|
|
|
|
|
const activeName = ref("仪器配置");
|
|
|
|
|
|
-import ConfigAdd from "./components/ConfigAdd.vue";
|
|
|
-import { fa } from "element-plus/es/locale";
|
|
|
-import { dataTool } from "echarts";
|
|
|
+import configAddVue from "./components/ConfigAdd.vue";
|
|
|
+import globalAddVue from "./components/globalDataAdd.vue";
|
|
|
|
|
|
const handleClick = (tab: TabsPaneContext, event: Event) => {
|
|
|
// console.log(tab, event);
|
|
|
};
|
|
|
|
|
|
-//
|
|
|
-
|
|
|
-const handleDelete = (index: number, row: any) => {
|
|
|
- console.log(index, row);
|
|
|
-};
|
|
|
//配置列表请求参数
|
|
|
const configParams = ref({
|
|
|
orders: [
|
|
@@ -68,11 +71,11 @@ const globalHandleChange = (currentPage: number, pageSize: number) => {
|
|
|
getglobalData();
|
|
|
};
|
|
|
|
|
|
-//测试仪器配置数组
|
|
|
+//全局数据数组
|
|
|
const globalDataList = ref([]);
|
|
|
-//数据total
|
|
|
+//全局数据数据total
|
|
|
const globalDataTotal = ref(1);
|
|
|
-//请求数据
|
|
|
+//请求数据 全局数据
|
|
|
const getglobalData = () => {
|
|
|
globalDataPage(globalParams.value).then((res) => {
|
|
|
console.log(res);
|
|
@@ -86,23 +89,80 @@ onMounted?.(() => {
|
|
|
getglobalData();
|
|
|
});
|
|
|
|
|
|
-//仪器配置弹框数据
|
|
|
-const configAdd = ref({
|
|
|
- show: false,
|
|
|
- type: "add", //add新增,edit修改
|
|
|
- data: {},
|
|
|
-});
|
|
|
+const configChildRef = ref();
|
|
|
+const configHandleEdit = (index: number, row: any) => {
|
|
|
+ configChildRef.value && configChildRef.value.showDialog("change", row);
|
|
|
+};
|
|
|
+
|
|
|
+const addConfigFun = () => {
|
|
|
+ configChildRef.value && configChildRef.value.showDialog("add", {});
|
|
|
+};
|
|
|
|
|
|
-const handleEdit = (index: number, row: any) => {
|
|
|
- // console.log(index, row);
|
|
|
- // console.log(row);
|
|
|
- showConfigAdd("edit", row);
|
|
|
+/**
|
|
|
+//新增或修改仪器配置
|
|
|
+ *
|
|
|
+ * @param {any} data - 要保存的仪器配置数据
|
|
|
+ * @param {string} flag - 操作标识,"add" 表示新增,其他值表示修改
|
|
|
+ *
|
|
|
+ * 根据 flag 的值调用相应的 API 进行新增或修改操作,
|
|
|
+ * 操作完成后关闭弹框并重新请求仪器配置数据。
|
|
|
+ */
|
|
|
+const configSaveFun = (data: any, flag: string) => {
|
|
|
+ if (flag === "add") {
|
|
|
+ configAdd(data).then((res) => {
|
|
|
+ configChildRef.value && configChildRef.value.hiddenDialog(); //关闭弹框
|
|
|
+ getInstrumentConfig(); //重新请求数据
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ configUpdate(data).then((res) => {
|
|
|
+ configChildRef.value && configChildRef.value.hiddenDialog(); //关闭弹框
|
|
|
+ getInstrumentConfig(); //重新请求数据
|
|
|
+ });
|
|
|
+ }
|
|
|
+};
|
|
|
+
|
|
|
+/**
|
|
|
+ * 处理删除配置项的函数
|
|
|
+ * @param {number} index - 配置项在列表中的索引
|
|
|
+ * @param {any} row - 当前配置项的数据对象
|
|
|
+ *
|
|
|
+ * 此函数调用 configDel 方法删除指定的配置项,并在成功后重新请求配置数据。
|
|
|
+ */
|
|
|
+const configHandleDelete = (index: number, row: any) => {
|
|
|
+ configDel({ id: row.id }).then((res) => {
|
|
|
+ getInstrumentConfig(); //重新请求数据
|
|
|
+ });
|
|
|
+};
|
|
|
+
|
|
|
+// =======================
|
|
|
+const globalChildRef = ref();
|
|
|
+
|
|
|
+const globalHandleEdit = (index: number, row: any) => {
|
|
|
+ globalChildRef.value && globalChildRef.value.showDialog("change", row);
|
|
|
+};
|
|
|
+
|
|
|
+const addglobalFun = () => {
|
|
|
+ globalChildRef.value && globalChildRef.value.showDialog("add", {});
|
|
|
+};
|
|
|
+
|
|
|
+const globalSaveFun = (data: any, flag: string) => {
|
|
|
+ if (flag === "add") {
|
|
|
+ globalDataAdd(data).then((res) => {
|
|
|
+ globalChildRef.value && globalChildRef.value.hiddenDialog(); //关闭弹框
|
|
|
+ getglobalData(); //重新请求数据
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ globalDataUpdate(data).then((res) => {
|
|
|
+ globalChildRef.value && globalChildRef.value.hiddenDialog(); //关闭弹框
|
|
|
+ getglobalData(); //重新请求数据
|
|
|
+ });
|
|
|
+ }
|
|
|
};
|
|
|
-const showConfigAdd = (type: string, data: any) => {
|
|
|
- console.log("1");
|
|
|
- configAdd.value.show = true;
|
|
|
- configAdd.value.type = type;
|
|
|
- configAdd.value.data = data;
|
|
|
+
|
|
|
+const globalHandledel = (index: number, row: any) => {
|
|
|
+ globalDataDel({ id: row.id }).then((res) => {
|
|
|
+ getglobalData(); //重新请求数据
|
|
|
+ });
|
|
|
};
|
|
|
</script>
|
|
|
|
|
@@ -112,7 +172,7 @@ const showConfigAdd = (type: string, data: any) => {
|
|
|
<el-tab-pane label="仪器配置" name="仪器配置">
|
|
|
<div class="global-config-pane">
|
|
|
<div class="btns">
|
|
|
- <el-button type="primary">
|
|
|
+ <el-button type="primary" @click="addConfigFun">
|
|
|
<span class="add">+</span>
|
|
|
新增
|
|
|
</el-button>
|
|
@@ -130,7 +190,7 @@ const showConfigAdd = (type: string, data: any) => {
|
|
|
text
|
|
|
size="small"
|
|
|
type="primary"
|
|
|
- @click="handleDelete(scope.$index, scope.row)"
|
|
|
+ @click="configHandleDelete(scope.$index, scope.row)"
|
|
|
>
|
|
|
删除
|
|
|
</el-button>
|
|
@@ -138,7 +198,7 @@ const showConfigAdd = (type: string, data: any) => {
|
|
|
text
|
|
|
size="small"
|
|
|
type="primary"
|
|
|
- @click="handleEdit(scope.$index, scope.row)"
|
|
|
+ @click="configHandleEdit(scope.$index, scope.row)"
|
|
|
>
|
|
|
修改
|
|
|
</el-button>
|
|
@@ -159,7 +219,7 @@ const showConfigAdd = (type: string, data: any) => {
|
|
|
<el-tab-pane label="全局数据" name="全局数据">
|
|
|
<div class="global-config-pane">
|
|
|
<div class="btns">
|
|
|
- <el-button type="primary" @click="">
|
|
|
+ <el-button type="primary" @click="addglobalFun">
|
|
|
<span class="add">+</span>
|
|
|
新增
|
|
|
</el-button>
|
|
@@ -168,11 +228,27 @@ const showConfigAdd = (type: string, data: any) => {
|
|
|
<div>
|
|
|
<el-table :data="globalDataList" style="width: 100%">
|
|
|
<el-table-column label="序号" type="index" width="80" />
|
|
|
- <el-table-column label="所需仪器类型" prop="instrumentType" />
|
|
|
- <el-table-column label="名称" prop="configName" />
|
|
|
- <el-table-column label="仪器地址" prop="configIp" />
|
|
|
+ <el-table-column label="数据项名称" prop="dataItemName" />
|
|
|
+ <el-table-column label="设定值" prop="setValue" />
|
|
|
<el-table-column label="操作" prop="操作" fixed="right">
|
|
|
- <template #default="scope"> </template>
|
|
|
+ <template #default="scope">
|
|
|
+ <el-button
|
|
|
+ text
|
|
|
+ size="small"
|
|
|
+ type="primary"
|
|
|
+ @click="globalHandledel(scope.$index, scope.row)"
|
|
|
+ >
|
|
|
+ 删除
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ text
|
|
|
+ size="small"
|
|
|
+ type="primary"
|
|
|
+ @click="globalHandleEdit(scope.$index, scope.row)"
|
|
|
+ >
|
|
|
+ 修改
|
|
|
+ </el-button>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<el-pagination
|
|
@@ -188,7 +264,8 @@ const showConfigAdd = (type: string, data: any) => {
|
|
|
</el-tab-pane>
|
|
|
</el-tabs>
|
|
|
|
|
|
- <ConfigAdd :options="configAdd"></ConfigAdd>
|
|
|
+ <configAddVue ref="configChildRef" @save="configSaveFun"></configAddVue>
|
|
|
+ <globalAddVue ref="globalChildRef" @save="globalSaveFun"></globalAddVue>
|
|
|
</div>
|
|
|
</template>
|
|
|
|