-
+
-
+
@@ -29,98 +16,34 @@
-
-
+
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
@@ -220,7 +143,9 @@ const onComfirm = () => {
proxy.$message.warning("请选择环林卡口");
return;
}
- emits("choosedJcz", [...jczList, ...checkopenList.value]);
+ console.log(checkopenList.value,'checkopenList.value');
+
+ emits("choosedJcz", [...jczList, ...checkopenList?.value]);
}
closed();
};
@@ -250,7 +175,7 @@ const getListData = async () => {
loading.value = false
multipleUser(props.data, tableData.value);
total.value = Number(res.total);
- }).catch(()=>{ loading.value = false });
+ }).catch(() => { loading.value = false });
};
const handleFilter = () => {
listQuery.value.pageCurrent = 1;
@@ -324,14 +249,16 @@ watch(
diff --git a/src/components/GdMap/index.vue b/src/components/GdMap/index.vue
index 997da80..8c35759 100644
--- a/src/components/GdMap/index.vue
+++ b/src/components/GdMap/index.vue
@@ -1,13 +1,7 @@
@@ -98,35 +85,30 @@ onMounted(() => {
box[0].style.right = !res ? "4px" : "398px";
box[0].style.transition = "0.5s";
});
-
+
map = new EliMap({
id: props.mapid,
- crs: "EPSG:4490",
+ crs: "EPSG:3857",
style: {
glyphs: "./fonts/{fontstack}/{range}.pbf",
- center: [94.36057012, 29.64276831],
- zoom: 15
+ center: [94.36,29.65],
+ zoom: 10
},
- minZoom: 7,
- maxZoom: 18
+ transformRequest: (url) => {
+ if (url.indexOf("TileMatrix=") != -1) {
+ const arr = url.split("TileMatrix=");
+ const arr1 = arr[1].split("&");
+ const nurl = `${arr[0]}&TileMatrix=${Number(arr1[0])}&${arr1[1]}&${arr1[2]}`;
+
+ }
+ }
});
+
window.map = map;
map.mapboxGLMap.on("load", () => {
- map.addWMTSLayer(
- "/PGIS_S_TileMapServer/Maps/XZDJ_SL/EzMap",
- {
- Service: "getImage",
- Type: "RGB",
- ZoomOffset: "0",
- V: "0.3",
- Zoom: "{z}",
- Row: "{y}",
- Col: "{x}"
- },
- {
- tileSize: 300
- }
- );
+ map.addGaudLayer({
+ url: 'http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+ })
zoomTarget.value = map.mapboxGLMap.getZoom();
});
mapUtil.value = new MapUtil(map);
@@ -184,7 +166,7 @@ onMounted(() => {
});
// 回显线
emitter.on("echoLine", (res) => {
- mapUtil.value.createLine(res, res.flag);
+ mapUtil.value.createLine(res);
});
//创建边界面（geojson）
emitter.on("setBoundarys", (res) => {
@@ -215,6 +197,11 @@ onMounted(() => {
mapUtil.value.diffusionCircle(res);
});
+ // 清除全部覆盖物
+ emitter.on("removeElementAll", () => {
+ mapUtil.value.removeElementAll();
+ });
+
// 展示盘曲
emitter.on("showGapText", (obj) => {
mapUtil.value.gapText(obj);
@@ -313,6 +300,7 @@ onUnmounted(() => {
emitter.off("diffusionCircle");
emitter.off("SsCircle");
emitter.off("ClearssCircle");
+ emitter.off("removeElementAll");
});
@@ -335,35 +323,29 @@ onUnmounted(() => {
right: 398px;
bottom: 4px;
z-index: 9;
-
.mapImageItem {
border: 1px solid #08aae8;
background: rgb(9, 26, 70);
-
& > img {
width: 100%;
height: 50px;
}
-
& > div {
text-align: center;
position: relative;
top: -3px;
}
}
-
.zoomTargetBox {
margin-top: 10px;
margin-left: 23px;
}
-
::v-deep .el-input-number__decrease,
::v-deep .el-input-number__increase {
background: #133362;
color: #fff;
border: none;
}
-
::v-deep .el-input__inner {
background: #0c1641;
}
diff --git a/src/components/GdMap/indexnw.vue b/src/components/GdMap/indexnw.vue
new file mode 100644
index 0000000..997da80
--- /dev/null
+++ b/src/components/GdMap/indexnw.vue
@@ -0,0 +1,371 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/chooseList/chooseTable.vue b/src/components/chooseList/chooseTable.vue
index 9bb1fc4..3e5dfc8 100644
--- a/src/components/chooseList/chooseTable.vue
+++ b/src/components/chooseList/chooseTable.vue
@@ -420,7 +420,7 @@ const handleData = (val, type) => {
break;
case "zdsb":
title.value = "终端选择";
- url.value = "/mosty-jcgl/tbJcglZdsb/selectPage";
+ url.value = "/mosty-qwzx/tbQwglZdsb/selectPage";
arr = [
{ label: "设备编号", prop: "sbbh" },
{ label: "设备名称", prop: "sbmc" },
@@ -526,7 +526,7 @@ const handleData = (val, type) => {
break;
case "zfjly":
title.value = "选择执法记录仪";
- url.value = "/mosty-jcgl/tbJcglTcsb/selectPage";
+ url.value = "/mosty-qwzx/tbQwglTcsb/selectPage";
let crr = [
{ label: "设备名称", prop: "sbmc" },
{ label: "设备编号", prop: "sbbh" },
diff --git a/src/main.js b/src/main.js
index 012fac2..ffffd6c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,8 +1,6 @@
import * as ElIcons from "@element-plus/icons-vue";
import Axios from 'axios'
-import {
- createApp
-} from "vue";
+import { createApp } from "vue";
import App from "./App.vue";
import router from "./router";
import store from "./store";
@@ -47,13 +45,8 @@ import installFilter from "@/filters";
//事件总线
import mitt from "mitt";
-import {
- resetForm
-} from "@/utils/validate";
-import {
- getDict,
- setCascader
-} from '@/utils/dict';
+import { resetForm } from "@/utils/validate";
+import { getDict, setCascader } from '@/utils/dict';
import axios from "axios";
//挂载全局方法
diff --git a/src/router/index.js b/src/router/index.js
index 4db9123..f277804 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -312,80 +312,80 @@ export const publicRoutes = [
]
},
// 考勤管理 流程管理 请休假管理 请休假审批 外出管理 外出审批 出差管理 出差审批
- {
- path: "/kaoQinGL",
- name: "kaoQinGL",
- redirect: "/lcgl",
- meta: {
- title: "考勤管理",
- icon: "article"
- },
- children: [{
- path: "/lcgl",
- name: "lcgl",
- component: () => import("@/views/backOfficeSystem/kaoQinGL/lcgl/index"),
- meta: {
- title: "流程管理",
- icon: "role"
- }
- },
- // {
- // path: "/qxjgl",
- // name: "qxjgl",
- // component: () => import("@/views/backOfficeSystem/kaoQinGL/qxjgl/index"),
- // meta: {
- // title: "请休假管理",
- // icon: "role"
- // }
- // },
- {
- path: "/qxjsp",
- name: "qxjsp",
- component: () => import("@/views/backOfficeSystem/kaoQinGL/qxjsp/index"),
- meta: {
- title: "请休假审批",
- icon: "role"
- }
- },
- {
- path: "/wcgl",
- name: "wcgl",
- component: () => import("@/views/backOfficeSystem/kaoQinGL/wcgl/index"),
- meta: {
- title: "外出管理",
- icon: "role"
- }
- },
- {
- path: "/wcsp",
- name: "wcsp",
- component: () => import("@/views/backOfficeSystem/kaoQinGL/wcsp/index"),
- meta: {
- title: "外出审批",
- icon: "role"
- }
- },
- {
- path: "/ccgl",
- name: "ccgl",
- component: () => import("@/views/backOfficeSystem/kaoQinGL/ccgl/index"),
- meta: {
- title: "出差管理",
- icon: "role"
- }
- },
- {
- path: "/ccsp",
- name: "ccsp",
- component: () => import("@/views/backOfficeSystem/kaoQinGL/ccsp/index"),
- meta: {
- title: "出差审批",
- icon: "role"
- }
- },
+ // {
+ // path: "/kaoQinGL",
+ // name: "kaoQinGL",
+ // redirect: "/lcgl",
+ // meta: {
+ // title: "考勤管理",
+ // icon: "article"
+ // },
+ // children: [{
+ // path: "/lcgl",
+ // name: "lcgl",
+ // component: () => import("@/views/backOfficeSystem/kaoQinGL/lcgl/index"),
+ // meta: {
+ // title: "流程管理",
+ // icon: "role"
+ // }
+ // },
+ // // {
+ // // path: "/qxjgl",
+ // // name: "qxjgl",
+ // // component: () => import("@/views/backOfficeSystem/kaoQinGL/qxjgl/index"),
+ // // meta: {
+ // // title: "请休假管理",
+ // // icon: "role"
+ // // }
+ // // },
+ // {
+ // path: "/qxjsp",
+ // name: "qxjsp",
+ // component: () => import("@/views/backOfficeSystem/kaoQinGL/qxjsp/index"),
+ // meta: {
+ // title: "请休假审批",
+ // icon: "role"
+ // }
+ // },
+ // {
+ // path: "/wcgl",
+ // name: "wcgl",
+ // component: () => import("@/views/backOfficeSystem/kaoQinGL/wcgl/index"),
+ // meta: {
+ // title: "外出管理",
+ // icon: "role"
+ // }
+ // },
+ // {
+ // path: "/wcsp",
+ // name: "wcsp",
+ // component: () => import("@/views/backOfficeSystem/kaoQinGL/wcsp/index"),
+ // meta: {
+ // title: "外出审批",
+ // icon: "role"
+ // }
+ // },
+ // {
+ // path: "/ccgl",
+ // name: "ccgl",
+ // component: () => import("@/views/backOfficeSystem/kaoQinGL/ccgl/index"),
+ // meta: {
+ // title: "出差管理",
+ // icon: "role"
+ // }
+ // },
+ // {
+ // path: "/ccsp",
+ // name: "ccsp",
+ // component: () => import("@/views/backOfficeSystem/kaoQinGL/ccsp/index"),
+ // meta: {
+ // title: "出差审批",
+ // icon: "role"
+ // }
+ // },
- ]
- },
+ // ]
+ // },
{
path: "/systemConfig",
name: "systemConfigModel",
@@ -588,7 +588,7 @@ export const publicRoutes = [
}];
const router = createRouter({
- history: createWebHistory(),
+ history: createWebHashHistory(),
routes: publicRoutes
});
//初始化路由表
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 805af53..5ac81e6 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -111,45 +111,45 @@ export default {
/*
*单点登录
*/
- // oatuhLogin(ctx, userInfo) {
- // const { token, systemId } = userInfo;
- // return new Promise((resolve, reject) => {
- // unifiedLogin({
- // token,
- // systemId
- // })
- // .then((data) => {
- // if (data.deptList.length === 1) {
- // this.commit("user/setToken", data.jwtToken);
- // this.commit("user/setDeptId", data.deptList);
- // this.commit("user/setUserName", data.userName);
- // setItem("USERNAME", data.userName);
- // setItem("SFRH", data.sfrh);
- // setItem("USERID", data.userId);
- // setItem("PermissionsInfo", data.permissionsInfo);
- // this.commit("user/setMenuList", data.menuList);
- // setItem("menusPermission", data.menuCodeSet);
- // setItem("isOatuh", 1);
- // setItem("idEntityCard", data.idEntityCard);
- // this.commit("user/setUserInfo", {
- // token: data.jwtToken,
- // permission: {
- // buttonPermission: ["removeTest", "viewTest"],
- // menus: data.menuCodeSet
- // },
- // menuList: data.menuList,
- // deptList: data.deptList
- // });
- // }
- // // 保存登录时间
- // setTimeStamp();
- // resolve(data);
- // })
- // .catch((err) => {
- // reject(err);
- // });
- // });
- // },
+ oatuhLogin(ctx, userInfo) {
+ const { token, systemId } = userInfo;
+ return new Promise((resolve, reject) => {
+ unifiedLogin({
+ token,
+ systemId
+ })
+ .then((data) => {
+ if (data.deptList.length === 1) {
+ this.commit("user/setToken", data.jwtToken);
+ this.commit("user/setDeptId", data.deptList);
+ this.commit("user/setUserName", data.userName);
+ setItem("USERNAME", data.userName);
+ setItem("SFRH", data.sfrh);
+ setItem("USERID", data.userId);
+ setItem("PermissionsInfo", data.permissionsInfo);
+ this.commit("user/setMenuList", data.menuList);
+ setItem("menusPermission", data.menuCodeSet);
+ setItem("isOatuh", 1);
+ setItem("idEntityCard", data.idEntityCard);
+ this.commit("user/setUserInfo", {
+ token: data.jwtToken,
+ permission: {
+ buttonPermission: ["removeTest", "viewTest"],
+ menus: data.menuCodeSet
+ },
+ menuList: data.menuList,
+ deptList: data.deptList
+ });
+ }
+ // 保存登录时间
+ setTimeStamp();
+ resolve(data);
+ })
+ .catch((err) => {
+ reject(err);
+ });
+ });
+ },
// refreshToken(ctx, parmas) {
// return new Promise((resolve, reject) => {
diff --git a/src/views/backOfficeSystem/qwManagement/qwdj/index.vue b/src/views/backOfficeSystem/qwManagement/qwdj/index.vue
index 61677aa..d58a3af 100644
--- a/src/views/backOfficeSystem/qwManagement/qwdj/index.vue
+++ b/src/views/backOfficeSystem/qwManagement/qwdj/index.vue
@@ -87,7 +87,7 @@ import TableEdit from "./tableEdit.vue";
const { proxy } = getCurrentInstance();
const { D_BZ_JWZLX, D_BZ_DJQW ,D_BZ_SF} = proxy.$dict("D_BZ_JWZLX", "D_BZ_DJQW","D_BZ_SF");
const addEditDialog = ref();
-const searchConfiger = reactive({ qwdj: "", qwkssj: "", qwjssj: "" });
+const searchConfiger = ref({ qwdj: "", qwkssj: "", qwjssj: "" });
const pageData = reactive({
tableData: [], // 表格数据
keyCount: 0,
@@ -165,7 +165,15 @@ const changeSize = (val) => {
pageData.pageConfiger.pageSize = val;
getList();
};
-
+// 重置
+const reset = () => {
+ pageData.pageConfiger = {
+ pageCurrent: 1,
+ pageSize: 20,
+ };
+ searchConfiger.value={}
+ getList();
+};
// 处理删除数据
function delDictItem(row) {
if (row.fbzt === "1") {
@@ -214,7 +222,7 @@ const queryTime = ref([]);
// 处理勤务数据
const getList=()=> {
loadingTable.value = true;
- let params = { ...searchConfiger, ...pageData.pageConfiger };
+ let params = { ...searchConfiger.value, ...pageData.pageConfiger };
qwjdSelectList(params)
.then((res) => {
pageData.tableData = res.records.map((item) => {
@@ -232,8 +240,8 @@ const getList=()=> {
}
const handleFilter = () => {
if (queryTime.value.length > 0) {
- searchConfiger.qwkssj = queryTime.value[0];
- searchConfiger.qwjssj = queryTime.value[1];
+ searchConfiger.value.qwkssj = queryTime.value[0];
+ searchConfiger.value.qwjssj = queryTime.value[1];
}
getList();
diff --git a/src/views/backOfficeSystem/qwManagement/qwfa/editAddForm.vue b/src/views/backOfficeSystem/qwManagement/qwfa/editAddForm.vue
index 1e60614..c0e8080 100644
--- a/src/views/backOfficeSystem/qwManagement/qwfa/editAddForm.vue
+++ b/src/views/backOfficeSystem/qwManagement/qwfa/editAddForm.vue
@@ -339,6 +339,8 @@ const buttonLoading = ref(false);
// 选择检查站
const chooseUserVisible = ref(false);
const choosedJcz = (row) => {
+ console.log(row,'row');
+
listData.jczList = row;
formData.value.kdbbs = row.length;
};
diff --git a/src/views/backOfficeSystem/qwManagement/qwgl/calendar.vue b/src/views/backOfficeSystem/qwManagement/qwgl/calendar.vue
index edfbbca..ef48786 100644
--- a/src/views/backOfficeSystem/qwManagement/qwgl/calendar.vue
+++ b/src/views/backOfficeSystem/qwManagement/qwgl/calendar.vue
@@ -10,7 +10,7 @@
今天
下一月
- 排班报表导出
+
列表切换
diff --git a/src/views/backOfficeSystem/qwManagement/qwgl/components/bbInfo.vue b/src/views/backOfficeSystem/qwManagement/qwgl/components/bbInfo.vue
index 1202f80..db0578c 100644
--- a/src/views/backOfficeSystem/qwManagement/qwgl/components/bbInfo.vue
+++ b/src/views/backOfficeSystem/qwManagement/qwgl/components/bbInfo.vue
@@ -88,8 +88,8 @@ const bbcxData = ref([])
const lookCount = async () => {
isHideen.value = !isHideen.value;
if (!isHideen.value) {
- const res = await selectDayMFCBbzlCount({ ksrq: props.data.year, jsrq: props.data.year, tjrq: props.data.year })
- const res1 = await qwselectList({ startTime: props.data.year, endTime: props.data.year })
+ const res = await selectDayMFCBbzlCount({ ksrq: props.data.year, jsrq: props.data.year, tjrq: props.data.year,ssbmdm:props.dep.bmdm })
+ const res1 = await qwselectList({ startTime: props.data.year, endTime: props.data.year,ssbmdm:props.dep.bmdm })
const res2 = await getXfbbBy24h()
bbcxData.value = res1 ? res1 : []
diff --git a/src/views/largeScreen/home/components/search.vue b/src/views/largeScreen/home/components/search.vue
index 1665e80..2276a4d 100644
--- a/src/views/largeScreen/home/components/search.vue
+++ b/src/views/largeScreen/home/components/search.vue
@@ -2,73 +2,38 @@