diff --git a/src/assets/sy-table/btn1.png b/src/assets/sy-table/btn1.png new file mode 100644 index 0000000..5f264fd Binary files /dev/null and b/src/assets/sy-table/btn1.png differ diff --git a/src/assets/sy-table/btn2.png b/src/assets/sy-table/btn2.png new file mode 100644 index 0000000..da5f591 Binary files /dev/null and b/src/assets/sy-table/btn2.png differ diff --git a/src/assets/sy-table/popk.png b/src/assets/sy-table/popk.png new file mode 100644 index 0000000..a9505ac Binary files /dev/null and b/src/assets/sy-table/popk.png differ diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue index ad3cf9f..271e82d 100644 --- a/src/view/dialog/dialogRW.vue +++ b/src/view/dialog/dialogRW.vue @@ -39,63 +39,72 @@ /> -
+
姓名：{{ data.character.xm }}
地址：{{ data.character.dz }}
年龄：{{ data.character.age }}
标签：{{ data.character.titleName }}
- 状态： + 状态： + +
+
确定要上报吗?
+
+
上报
+
取消
+
+
-
- - - -
+ + + + +
@@ -119,7 +128,7 @@ import { onMounted, reactive, ref, - onBeforeMount, + onBeforeUnmount, defineProps, watch, nextTick, @@ -135,6 +144,7 @@ import lamp6 from "../../assets/sy-table/yellow1.gif"; import lamp7 from "../../assets/sy-table/lampGreen3.png"; import lamp8 from "../../assets/sy-table/lampRed3.png"; import lamp9 from "../../assets/sy-table/lampYellow3.png"; +import { ElMessage } from "element-plus"; const router = useRouter(); const routers = useRoute(); @@ -173,7 +183,7 @@ const props = defineProps({ required: true, }, }); -const emit = defineEmits(["close", "handle", "loadTables", "openMessage"]); +const emit = defineEmits(["close", "handle", "openMessage"]); const handleRowClick = (row, column, event) => { if (props.dj) { @@ -183,9 +193,29 @@ const handleRowClick = (row, column, event) => { // query: { identNo: row.identNo, type: "detail" }, // }); // row 是当前行的数据 - emit("openMessage", { identNo: row.identNo }); + // emit("openMessage", { identNo: row.identNo }); } }; +// 上报 +const clicked = ref(false); +const lampBox = ref(null); +const escalation = () => { + if (data.character.zt !== 1) { + clicked.value = true; + } + console.log(clicked.value); +}; +const confirmEvent = () => { + console.log("confirm!"); + ElMessage.success({ + message: `上报成功`, + offset: 100, // 距离窗口顶部的偏移量 + }); + clicked.value = false; +}; +const cancelEvent = () => { + clicked.value = false; +}; // 详情弹框 const dialogShow = ref(); @@ -241,13 +271,13 @@ onMounted(() => { data.title = props.title; data.tableData = props.tableData; console.log("状态", data); - - const paginationTotal = document.querySelector(".el-pagination__total"); + // const paginationTotal = document.querySelector(".el-pagination__total"); // paginationTotal.innerText = `总共 ${props.pagination.total} 组数据`; }); const closeDialog = () => { dialogShow.value = false; + clicked.value = false; emit("close"); }; //分页器 @@ -255,6 +285,7 @@ const handle = (current) => { emit("handle", current); }; + diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index db01339..e92be3b 100644 --- a/src/view/sy_details.vue +++ b/src/view/sy_details.vue @@ -11,7 +11,7 @@
-
+
-
+
未享受对象
-->
-
+
{ titleName: formData.name, }; dialogShow.value = true; - } break; case "义务教育学生营养改善计划": @@ -2541,7 +2556,6 @@ const statusDetails = (val) => { titleName: formData.name, }; dialogShow.value = true; - } break; default: @@ -2661,7 +2675,6 @@ const handleRowClick = (row) => { path: `/home/index/person`, query: { identNo: data.identNo, type: "detail" }, }); - } break; case "义务教育学生营养改善计划": @@ -2747,7 +2760,7 @@ const listAssignment = () => { } }; onMounted(() => { - // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); + tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); if (routers.query.name) { data.name = routers.query.name; listAssignment(); @@ -2956,7 +2969,7 @@ onMounted(() => { diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue index 4920c2a..a87c60c 100644 --- a/src/view/sy_table.vue +++ b/src/view/sy_table.vue @@ -676,7 +676,7 @@ const sevenYX = (name) => { }; onMounted(() => { - // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); + tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); if (localStorage.getItem("taps1") !== undefined) { data.tapbody = JSON.parse(localStorage.getItem("taps1")); @@ -696,6 +696,7 @@ onMounted(() => { width: 100%; display: flex; margin-top: 112px; + .displayFlex { height: 100%; display: flex; diff --git a/vite.config.js b/vite.config.js index 7708875..99753df 100644 --- a/vite.config.js +++ b/vite.config.js @@ -15,8 +15,8 @@ export default defineConfig({ // 第一个代理 "/api": { // 匹配到啥来进行方向代理 - target: "http://10.0.0.65:8095/", //刘进 - // target: "http://220.191.238.50:996/", //线上 + // target: "http://10.0.0.65:8095/", //刘进 + target: "http://220.191.238.50:996/", //线上 changeOrigin: true, //是否支持跨域 //rewrite: (path) => path.replace(/^\/api/, '') // 如果不需要api 直接把路径上的api 替换成空，这个 },