diff --git a/src/api/mosty-jcz.js b/src/api/mosty-jcz.js index 554775c..9aacdb4 100644 --- a/src/api/mosty-jcz.js +++ b/src/api/mosty-jcz.js @@ -274,11 +274,11 @@ export const TtbJczSxtAdd = (data) => { *查询感知源头 * return promise 实例对象 */ -export const TtbgetPageList = (params) => { +export const TtbgetPageList = (data) => { return request({ url: api + `/tbJczSxt/getPageList`, - method: "get", - params + method: "post", + data }); }; /* @@ -596,12 +596,27 @@ export const JczXfbb = (id) => { export const tbJczXfbbJczXfbb = (data) => { return request({ - url: api + `/tpJczJyqx/addJyqx `, + url: api + `/tpJczJyqx/addJyqx`, method: "post", data }); }; +export const tbJczSelectJyqx = (params) => { + return request({ + url: api + `/tpJczJyqx/selectJyqx`, + method: "get", + params + }); +}; // 修改 +export const tbJczXfbbupdateJyqx = (data) => { + return request({ + url: api + `/tpJczJyqx/updateJyqx`, + method: "post", + data + }); +}; + export const tbJczXfbbdeleteJyQxzb = (data) => { return request({ url: api + `/tpJczJyqx/deleteJyQxzb`, @@ -609,10 +624,3 @@ export const tbJczXfbbdeleteJyQxzb = (data) => { data }); }; -// export const tbJczXfbbdeleteJyQxzb = (data) => { -// return request({ -// url: api + `/tpJczJyqx/deleteJyQxzb`, -// method: "post", -// data -// }); -// }; diff --git a/src/components/GdMap/index copy.vue b/src/components/GdMap/index copy.vue new file mode 100644 index 0000000..45d925a --- /dev/null +++ b/src/components/GdMap/index copy.vue @@ -0,0 +1,360 @@ + + + + + diff --git a/src/components/GdMap/index.vue b/src/components/GdMap/index.vue index 45d925a..5e5ad06 100644 --- a/src/components/GdMap/index.vue +++ b/src/components/GdMap/index.vue @@ -1,8 +1,7 @@ @@ -67,6 +49,7 @@ import Pages from "@/components/aboutTable/Pages.vue"; import Search from "@/components/aboutTable/Search.vue"; import EditAddForm from "./components/editAddForm.vue"; import { GjcltxselectPage, GjcltxdeleteById } from "@/api/mosty-jcz.js"; +import { isAuth } from '@/utils/tools.js' import { reactive, ref, onMounted, getCurrentInstance } from "vue"; const { proxy } = getCurrentInstance(); const { D_BZ_JCZLX, D_BZ_ZQLX, D_BZ_DLLX, D_BZ_JCZJB } = proxy.$dict( @@ -165,7 +148,10 @@ const pageData = reactive({ } ] }); +const Auth = ref(false) + onMounted(() => { + Auth.value = isAuth() tabHeightFn(); }); diff --git a/src/views/backOfficeSystem/peopleManag/Inspector/components/editAddForm.vue b/src/views/backOfficeSystem/peopleManag/Inspector/components/editAddForm.vue index ee63044..2433173 100644 --- a/src/views/backOfficeSystem/peopleManag/Inspector/components/editAddForm.vue +++ b/src/views/backOfficeSystem/peopleManag/Inspector/components/editAddForm.vue @@ -22,61 +22,61 @@ label-position="top" > - - -
+ +
{{ listQuery.kkMc }} 请选择布控卡口
- + - - + - - + - - + - - + + - - + - - - @@ -106,22 +106,22 @@ prop="xszztzdm" style="width: 40%" > - - + - + - + - { listQuery.value.kkMc = val.jczmc; listQuery.value.kkId = val.id; + listQuery.value.jczmsm= val.id; }; +const forbidden=ref(false) // 初始化数据 const init = (type, row) => { pageType.value = type; dialogForm.value = true; // 根据type和row初始化表单数据 tabHeightFn(); - if (type == "edit") { + if (type == "edit" || type == "detail") { listQuery.value = { ...row }; listQuery.value.rlt = row.rlt ? JSON.parse(row.rlt) : []; listQuery.value.swrltx = row.swrltx ? JSON.parse(row.swrltx) : []; listQuery.value.ryt = row.ryt ? JSON.parse(row.ryt) : []; + if (type == "detail") { + forbidden.value=true + } } else { listQuery.value = { rlt: [], @@ -258,6 +258,7 @@ const _onSave = () => { //页面关闭 const close = () => { dialogForm.value = false; + forbidden.value=false listQuery.value = {}; }; // 表格高度计算 diff --git a/src/views/backOfficeSystem/peopleManag/Inspector/index.vue b/src/views/backOfficeSystem/peopleManag/Inspector/index.vue index 4f04f27..279251a 100644 --- a/src/views/backOfficeSystem/peopleManag/Inspector/index.vue +++ b/src/views/backOfficeSystem/peopleManag/Inspector/index.vue @@ -2,7 +2,7 @@
- + 新增 { + Auth.value=isAuth() tabHeightFn(); }); diff --git a/src/views/backOfficeSystem/peopleManag/Intelligent/components/editAddForm.vue b/src/views/backOfficeSystem/peopleManag/Intelligent/components/editAddForm.vue index d802b58..c5e706e 100644 --- a/src/views/backOfficeSystem/peopleManag/Intelligent/components/editAddForm.vue +++ b/src/views/backOfficeSystem/peopleManag/Intelligent/components/editAddForm.vue @@ -21,51 +21,35 @@ :inline="true" label-position="top" > - - - + - - + + + + - - + - - + + + - - + - - + - - - - + - { pageType.value = type; dialogForm.value = true; // 根据type和row初始化表单数据 tabHeightFn(); - if (type == "edit") { + if (type == "edit"||type == "detail") { listQuery.value = { ...row }; + if (type == "detail") { + forbidden.value=true + } } else { listQuery.value = {}; } }; -const changeZblx = (val) => { - listQuery.value.sblx = val ? val : ""; -}; //保存 const _onSave = () => { if (!formRef) return; @@ -385,7 +266,12 @@ const tableHeight1 = ref(); const tabHeightFn = () => { tableHeight1.value = window.innerHeight - 450; }; - +const getDepValue = (res) => { + listQuery.value.sydwmc = res.orgName; +} +const getGldwdm = (res) => { + listQuery.value.gldwmc = res.orgName; +} defineExpose({ init }); diff --git a/src/views/backOfficeSystem/peopleManag/Intelligent/index.vue b/src/views/backOfficeSystem/peopleManag/Intelligent/index.vue index 4b2130f..f7b01e7 100644 --- a/src/views/backOfficeSystem/peopleManag/Intelligent/index.vue +++ b/src/views/backOfficeSystem/peopleManag/Intelligent/index.vue @@ -2,7 +2,7 @@
- + 新增 @@ -60,6 +63,7 @@ import MyTable from "@/components/aboutTable/MyTable.vue"; import Pages from "@/components/aboutTable/Pages.vue"; import Search from "@/components/aboutTable/Search.vue"; import EditAddForm from "./components/editAddForm.vue"; +import {isAuth }from '@/utils/tools.js' import { TcsbselectList, TcsbtbJczTcsb } from "@/api/mosty-jcz.js"; import { reactive, ref, onMounted, getCurrentInstance, watch } from "vue"; const { proxy } = getCurrentInstance(); @@ -122,7 +126,9 @@ const pageData = reactive({ { label: "设备编号", prop: "sbbh" } ] }); +const Auth=ref(true) onMounted(() => { + Auth.value=isAuth() tabHeightFn(); }); diff --git a/src/views/backOfficeSystem/peopleManag/PeoplePerson/components/editAddForm.vue b/src/views/backOfficeSystem/peopleManag/PeoplePerson/components/editAddForm.vue index 25268be..3c86ba5 100644 --- a/src/views/backOfficeSystem/peopleManag/PeoplePerson/components/editAddForm.vue +++ b/src/views/backOfficeSystem/peopleManag/PeoplePerson/components/editAddForm.vue @@ -3,86 +3,36 @@
{{ pageInfo[pageType].title }}
- 保存 + 保存 关闭
- + - + - + - + - + - - + + - - + + -
+
{{ listQuery.kkMc }} 请选择环林卡口
@@ -104,7 +54,7 @@ import { ElMessage } from "element-plus"; const props = defineProps({ dict: { type: Object, - default: () => {} + default: () => { } } }); const rules = reactive({ @@ -145,24 +95,34 @@ const pageInfo = { title: "详情" } }; -onMounted(() => {}); +onMounted(() => { }); let pageType = ref("add"); //打开弹窗 const showJcz = ref(false); - +const openJcz = (val) => { + if (!val) { + showJcz.value = true; + } +}; const JczMsg = (val) => { listQuery.value.kkMc = val.jczmc; listQuery.value.kkId = val.id; }; +const compile = ref(false) // 初始化数据 const init = (type, row) => { pageType.value = type; dialogForm.value = true; // 根据type和row初始化表单数据 tabHeightFn(); - if (type == "edit") { + if (type == 'detail') { + listQuery.value = { ...row }; + compile.value = true + } else if (type == "edit") { + compile.value = false listQuery.value = { ...row }; } else { + compile.value = false listQuery.value = {}; } }; @@ -208,21 +168,25 @@ defineExpose({ init }); diff --git a/src/views/backOfficeSystem/peopleManag/instrument/index copy.vue b/src/views/backOfficeSystem/peopleManag/instrument/index copy.vue deleted file mode 100644 index 4b2130f..0000000 --- a/src/views/backOfficeSystem/peopleManag/instrument/index copy.vue +++ /dev/null @@ -1,216 +0,0 @@ - - - - - diff --git a/src/views/backOfficeSystem/peopleManag/instrument/index.vue b/src/views/backOfficeSystem/peopleManag/instrument/index.vue index d17d414..1a28dfa 100644 --- a/src/views/backOfficeSystem/peopleManag/instrument/index.vue +++ b/src/views/backOfficeSystem/peopleManag/instrument/index.vue @@ -2,7 +2,7 @@
- + 新增 -