diff --git a/src/assets/css/pulic.scss b/src/assets/css/pulic.scss index b343d1c..58c0da6 100644 --- a/src/assets/css/pulic.scss +++ b/src/assets/css/pulic.scss @@ -430,10 +430,13 @@ // 警情闪速动画 @keyframes alert-flash { - 0%, 100% { + + 0%, + 100% { opacity: 1; transform: scale(1); } + 50% { opacity: 0.3; transform: scale(1.05); @@ -444,19 +447,25 @@ 0% { box-shadow: 0 0 0 0 rgba(255, 77, 79, 0.7); } + 70% { box-shadow: 0 0 0 10px rgba(255, 77, 79, 0); } + 100% { box-shadow: 0 0 0 0 rgba(255, 77, 79, 0); } } @keyframes alert-blink { - 0%, 49% { + + 0%, + 49% { opacity: 1; } - 50%, 100% { + + 50%, + 100% { opacity: 0; } } @@ -489,3 +498,9 @@ color: #df6c07; animation: alert-flash 1s ease-in-out infinite; } + +.margTop { + padding: 10px; + margin-top: 10px; + background-color: #fff; +} \ No newline at end of file diff --git a/src/assets/images/jqjc.mp3 b/src/assets/images/jqjc.mp3 new file mode 100644 index 0000000..171c8f4 Binary files /dev/null and b/src/assets/images/jqjc.mp3 differ diff --git a/src/components/GdMap/index.vue b/src/components/GdMap/index.vue index 51fabfb..cd05015 100644 --- a/src/components/GdMap/index.vue +++ b/src/components/GdMap/index.vue @@ -1,7 +1,8 @@ @@ -44,7 +44,7 @@ import { getItem } from "@/utils/storage"; const conditionRoute = ref(true); //路况 const mMap = ref(null); //地图对象 const mapUtil = ref(null); //地图工具对象 -const zoomTarget = ref(6); +const zoomTarget = ref(15); const props = defineProps({ mapid: { @@ -70,12 +70,11 @@ const props = defineProps({ isShowDraw: { type: Boolean, default: false - }, - + } }); try { const userInfo = getItem("deptId")[0].deptCode; -} catch (error) {} +} catch (error) { } let map; let mapLayer; let mapLayer1; @@ -89,66 +88,37 @@ onMounted(() => { map = new EliMap({ id: props.mapid, - crs: "EPSG:3857", + crs: "EPSG:4490", style: { glyphs: "./fonts/{fontstack}/{range}.pbf", - center: [94.36,29.65], - zoom: 11 + center: [94.36057012, 29.64276831], + zoom: 15 }, - minZoom: 7, + minZoom: 5, 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.addGaudLayer({ - url: 'http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}', - }) + map.addWMTSLayer( + "/PGIS_S_TileMapServer/Maps/XZDJ_DJ/EzMap" + , + { + Service: "getImage", + Type: "RGB", + ZoomOffset: "0", + V: "0.3", + Zoom: "{z}", + Row: "{y}", + Col: "{x}" + }, + { + tileSize: 300 + } + ); zoomTarget.value = map.mapboxGLMap.getZoom(); - // 地图加载完成后发出事件 - // emit('mapLoaded') }); mapUtil.value = new MapUtil(map); - // map = new EliMap({ - // id: props.mapid, - // crs: "EPSG:4490", - // style: { - // glyphs: "./fonts/{fontstack}/{range}.pbf", - // center: [94.36057012, 29.64276831], - // zoom: 15 - // }, - // minZoom: 7, - // maxZoom: 18, - // }); - // 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 - // } - // ); - // zoomTarget.value = map.mapboxGLMap.getZoom(); - // }); - // mapUtil.value = new MapUtil(map); + mapUtil.value.Drawplot(); //初始化加载绘制工具 // 设置地图中心点及图层 @@ -184,6 +154,10 @@ onMounted(() => { emitter.on("showSquire", (obj) => { mapUtil.value.zdySquire(obj); }); + // 展示气泡框 + emitter.on("makerPopup", (obj) => { + mapUtil.value.makerPopup(obj); + }); // 绘制图形 - 回显区域 emitter.on("drawShape", (res) => { @@ -289,7 +263,6 @@ const mapSetLayer = (id, source) => { //获取地图绘制的数据 const resFun = (coord, type, flag, data) => { - emitter.emit("coordString", { coord: coord, type: type, @@ -303,12 +276,6 @@ const handleZoom = (val) => { map.mapboxGLMap.setZoom(val); }; -emitter.on("map-resize", () => { - if (map && map.mapboxGLMap) { - map.mapboxGLMap.resize(); - } -}); - // 是否打开或者关闭路况 const handleSwitch = (val) => { if (val) { @@ -325,6 +292,7 @@ onUnmounted(() => { emitter.off("showPoint"); emitter.off("deletePointArea"); emitter.off("deletePointAreaOne"); + emitter.off("makerPopup"); emitter.off("drawShape"); emitter.off("echoPlane"); emitter.off("removeEara"); @@ -338,7 +306,6 @@ onUnmounted(() => { emitter.off("diffusionCircle"); emitter.off("SsCircle"); emitter.off("ClearssCircle"); - emitter.off("map-resize"); }); @@ -361,29 +328,35 @@ onUnmounted(() => { right: 398px; bottom: 4px; z-index: 9; + .mapImageItem { border: 1px solid #08aae8; background: rgb(9, 26, 70); - & > img { + + &>img { width: 100%; height: 50px; } - & > div { + + &>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/indexs.vue b/src/components/GdMap/indexex.vue similarity index 82% rename from src/components/GdMap/indexs.vue rename to src/components/GdMap/indexex.vue index cd05015..51fabfb 100644 --- a/src/components/GdMap/indexs.vue +++ b/src/components/GdMap/indexex.vue @@ -1,8 +1,7 @@ @@ -44,7 +44,7 @@ import { getItem } from "@/utils/storage"; const conditionRoute = ref(true); //路况 const mMap = ref(null); //地图对象 const mapUtil = ref(null); //地图工具对象 -const zoomTarget = ref(15); +const zoomTarget = ref(6); const props = defineProps({ mapid: { @@ -70,11 +70,12 @@ const props = defineProps({ isShowDraw: { type: Boolean, default: false - } + }, + }); try { const userInfo = getItem("deptId")[0].deptCode; -} catch (error) { } +} catch (error) {} let map; let mapLayer; let mapLayer1; @@ -88,37 +89,66 @@ onMounted(() => { 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: 11 }, - minZoom: 5, + 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_DJ/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(); + // 地图加载完成后发出事件 + // emit('mapLoaded') }); mapUtil.value = new MapUtil(map); - + // map = new EliMap({ + // id: props.mapid, + // crs: "EPSG:4490", + // style: { + // glyphs: "./fonts/{fontstack}/{range}.pbf", + // center: [94.36057012, 29.64276831], + // zoom: 15 + // }, + // minZoom: 7, + // maxZoom: 18, + // }); + // 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 + // } + // ); + // zoomTarget.value = map.mapboxGLMap.getZoom(); + // }); + // mapUtil.value = new MapUtil(map); mapUtil.value.Drawplot(); //初始化加载绘制工具 // 设置地图中心点及图层 @@ -154,10 +184,6 @@ onMounted(() => { emitter.on("showSquire", (obj) => { mapUtil.value.zdySquire(obj); }); - // 展示气泡框 - emitter.on("makerPopup", (obj) => { - mapUtil.value.makerPopup(obj); - }); // 绘制图形 - 回显区域 emitter.on("drawShape", (res) => { @@ -263,6 +289,7 @@ const mapSetLayer = (id, source) => { //获取地图绘制的数据 const resFun = (coord, type, flag, data) => { + emitter.emit("coordString", { coord: coord, type: type, @@ -276,6 +303,12 @@ const handleZoom = (val) => { map.mapboxGLMap.setZoom(val); }; +emitter.on("map-resize", () => { + if (map && map.mapboxGLMap) { + map.mapboxGLMap.resize(); + } +}); + // 是否打开或者关闭路况 const handleSwitch = (val) => { if (val) { @@ -292,7 +325,6 @@ onUnmounted(() => { emitter.off("showPoint"); emitter.off("deletePointArea"); emitter.off("deletePointAreaOne"); - emitter.off("makerPopup"); emitter.off("drawShape"); emitter.off("echoPlane"); emitter.off("removeEara"); @@ -306,6 +338,7 @@ onUnmounted(() => { emitter.off("diffusionCircle"); emitter.off("SsCircle"); emitter.off("ClearssCircle"); + emitter.off("map-resize"); }); @@ -328,35 +361,29 @@ onUnmounted(() => { right: 398px; bottom: 4px; z-index: 9; - .mapImageItem { border: 1px solid #08aae8; background: rgb(9, 26, 70); - - &>img { + & > img { width: 100%; height: 50px; } - - &>div { + & > 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/aboutTable/Search copy.vue b/src/components/aboutTable/Search copy.vue new file mode 100644 index 0000000..46611be --- /dev/null +++ b/src/components/aboutTable/Search copy.vue @@ -0,0 +1,553 @@ + + + + + diff --git a/src/components/aboutTable/Search.vue b/src/components/aboutTable/Search.vue index 46611be..e36222f 100644 --- a/src/components/aboutTable/Search.vue +++ b/src/components/aboutTable/Search.vue @@ -1,77 +1,74 @@ @@ -485,69 +482,169 @@ watchEffect(() => { }); - diff --git a/src/components/checkBox/index.vue b/src/components/checkBox/index.vue index 1c8456b..40256f1 100644 --- a/src/components/checkBox/index.vue +++ b/src/components/checkBox/index.vue @@ -26,6 +26,7 @@ const checkAll = ref(false); const isIndeterminate = ref(true); const hasChecked = ref([]); //已经全选的数据 const checkedList = ref([]); +const isInit = ref(true); // 标记是否为初始化 watch( () => props.data, (val) => { @@ -38,16 +39,28 @@ watch( immediate: true } ); +// 监听hasChecked变化，初始化完成后才触发changeData +watch( + hasChecked, + (val) => { + if (isInit.value) { + isInit.value = false; + return; + } + emits("changeData", val); + }, + { deep: true } +); // 全选 function handleCheckAll(val) { hasChecked.value = val ? checkedList.value : []; isIndeterminate.value = false; - emits("changeData", hasChecked.value); + // emits 由 watch 处理 } // 处理多选框改变 function handleCheckedChange(val) { handleChange(val);////判断是否全选 - emits("changeData", hasChecked.value); + // emits 由 watch 处理 } //判断是否全选 function handleChange(val) { @@ -68,4 +81,4 @@ function handleChange(val) { margin: 0 20px 0 4px; } } - \ No newline at end of file + diff --git a/src/components/common/TestDiv.vue b/src/components/common/TestDiv.vue index 41f00bb..b690642 100644 --- a/src/components/common/TestDiv.vue +++ b/src/components/common/TestDiv.vue @@ -23,7 +23,7 @@ import emitter from "@/utils/eventBus.js"; // 导入事件总线 import { qcckGet } from '@/api/qcckApi' import Item from './item.vue' import { AudioPlayerClass } from '@/utils/audioPlayer.js' -import {getItem} from '@/utils/storage.js' +import { getItem } from '@/utils/storage.js' const dataList = ref([]) const timekeeping = ref(null) const countdown = ref(0) // 倒计时时间（秒） @@ -33,7 +33,8 @@ const audioPlayers = ref({ '02': null, // 信息上报 '03': null, // 研判审批 '04': null, // 研判指令 - '05': null // 线索下发 + '05': null, // 线索下发, + '06': null, // 警情监测 }) // 音频文件路径映射 @@ -41,7 +42,8 @@ const audioPaths = { '02': require('@/assets/images/cjyp.mp3'), '03': require('@/assets/images/ypbg.mp3'), '04': require('@/assets/images/ypzl.mp3'), - '05': require('@/assets/images/xsyp.mp3') + '05': require('@/assets/images/xsyp.mp3'), + '06': require('@/assets/images/jqjc.mp3') } // 初始化音频播放器 @@ -119,14 +121,14 @@ const dataModel = () => { if (yjmasg.length > 0) { emitter.emit('openYp', yjmasg[0].obj); // 触发音频播放 } else { -const data=res.filter(item=>item.sfzList.includes(idEntityCard.value)) - const infoMasge =data.map(item => { + const data = res.filter(item => item.sfzList.includes(idEntityCard.value)) + const infoMasge = data.map(item => { return { ...item.obj, typeMasgeLx: item.type } }) - console.log(infoMasge); + console.log(infoMasge,"xxxxxxxxxxxx"); emitter.emit('webSocketMessage', infoMasge) } } diff --git a/src/components/common/item.vue b/src/components/common/item.vue index 5e94c59..d28997c 100644 --- a/src/components/common/item.vue +++ b/src/components/common/item.vue @@ -31,6 +31,14 @@
{{ item.xtCjsj || '' }}
+
+
+
{{ item.gxdwmc || '' }}
+
{{ informationMap[item.typeMasgeLx] }}
+
+
{{ item.bcjjnr }}
+
{{ item.bjsj || '' }}
+
+ + + diff --git a/src/layout/components/SideBar/SideBarMenu copy.vue b/src/layout/components/SideBar/SideBarMenu copy.vue new file mode 100644 index 0000000..8e857aa --- /dev/null +++ b/src/layout/components/SideBar/SideBarMenu copy.vue @@ -0,0 +1,81 @@ + + + + + + diff --git a/src/layout/components/SideBar/SideBarMenu.vue b/src/layout/components/SideBar/SideBarMenu.vue index 289ab5a..8e857aa 100644 --- a/src/layout/components/SideBar/SideBarMenu.vue +++ b/src/layout/components/SideBar/SideBarMenu.vue @@ -16,6 +16,7 @@ const store = useStore(); const router = useRouter(); const routes = computed(() => { const fRoutes = filterRoutes(router.getRoutes()); + const data = fRoutes.filter(item => { if (item.name != "warningLists" && item.name != "behaviorWarnings" @@ -28,6 +29,8 @@ const routes = computed(() => { } } ) + console.log(data); + return generateMenus(data); }); if (!store.getters.token) { diff --git a/src/router/index.js b/src/router/index.js index 1453189..1dff57e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -172,6 +172,30 @@ export const publicRoutes = [ meta: { title: "预警列表", icon: "article-create" }, component: () => import("@/views/backOfficeSystem/fourColorManage/YjData/index.vue"), }, + { + path: "/jqjc", + name: "jqjc", + meta: { title: "警情监测", icon: "article-create" }, + children: [ + { + path: "/policeReport", + name: "policeReport", + component: () => import("@/views/backOfficeSystem/policeReport/index.vue"), + meta: { + title: "警情信息", + icon: "article-create" + } + }, { + path: "/policeSituations", + name: "policeSituations", + component: () => import("@/views/backOfficeSystem/PoliceIncidentMonitoring/index.vue"), + meta: { + title: "警情预警监测", + icon: "article-create" + } + }, + ] + }, // { // path: "/fouColorWarning", // name: "fouColorWarning", @@ -480,15 +504,7 @@ export const publicRoutes = [ icon: "article-ranking" }, children: [ - { - path: "/policeReport", - name: "policeReport", - component: () => import("@/views/backOfficeSystem/policeReport/index.vue"), - meta: { - title: "警情管理", - icon: "article-create" - } - }, + { path: "/policeManagement", name: "policeManagement", @@ -1266,8 +1282,6 @@ const router = createRouter({ //初始化路由表 export function resetRouter() { if (store.getters?.routeReady && store.getters?.userInfo?.permission?.menus) { - - const menus = store.getters.userInfo.permission.menus; menus.forEach((menu) => { router.removeRoute(menu); diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 9ce7903..51ffe85 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -84,7 +84,6 @@ export default { */ login(ctx, userInfo) { const { userName, password, kaptcha } = userInfo; - return new Promise((resolve, reject) => { login({ userName, password: Base64.encode(password), kaptcha }).then((data) => { if (data.deptList.length === 1) { diff --git a/src/views/backOfficeSystem/DeploymentDisposal/BaseLibrary/components/zdclPage.vue b/src/views/backOfficeSystem/DeploymentDisposal/BaseLibrary/components/zdclPage.vue index 7d82798..9f2bbb5 100644 --- a/src/views/backOfficeSystem/DeploymentDisposal/BaseLibrary/components/zdclPage.vue +++ b/src/views/backOfficeSystem/DeploymentDisposal/BaseLibrary/components/zdclPage.vue @@ -4,13 +4,8 @@
- -
+
- -
- - - + + 新增 + +
+ -
+
{ // 表格高度计算 const tabHeightFn = () => { - pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250; + pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 240; window.onresize = function () { tabHeightFn(); }; diff --git a/src/views/backOfficeSystem/DeploymentDisposal/BaseLibrary/components/zdrPage.vue b/src/views/backOfficeSystem/DeploymentDisposal/BaseLibrary/components/zdrPage.vue index 66b656f..cec4208 100644 --- a/src/views/backOfficeSystem/DeploymentDisposal/BaseLibrary/components/zdrPage.vue +++ b/src/views/backOfficeSystem/DeploymentDisposal/BaseLibrary/components/zdrPage.vue @@ -2,17 +2,12 @@
- -
- - - - + +
-
+
@@ -149,7 +144,7 @@ const isShiQzDelet = ref(false) onMounted(() => { getList(); tabHeightFn(); - const isShiQz = getItem('roleList').find(item => item.roleCode == 'JS_777777') != undefined + const isShiQz = getItem('roleList').find(item => item.roleCode == 'JS_777777') != undefined if (isShiQz) isShiQzDelet.value = true }); @@ -263,7 +258,7 @@ const addEdit = (type, row) => { // 表格高度计算 const tabHeightFn = () => { - pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 270; + pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250; window.onresize = function () { tabHeightFn(); }; diff --git a/src/views/backOfficeSystem/DeploymentDisposal/gzPeo/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/gzPeo/index.vue index 755ec7c..25e82ef 100644 --- a/src/views/backOfficeSystem/DeploymentDisposal/gzPeo/index.vue +++ b/src/views/backOfficeSystem/DeploymentDisposal/gzPeo/index.vue @@ -2,44 +2,18 @@
- -
- - - + +
+ -
+
@@ -328,7 +302,7 @@ const addEdit = (type, row) => { // 表格高度计算 const tabHeightFn = () => { - pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250; + pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 220; window.onresize = function () { tabHeightFn(); }; diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvCar/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvCar/index.vue index b43e93c..981017b 100644 --- a/src/views/backOfficeSystem/DeploymentDisposal/mpvCar/index.vue +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvCar/index.vue @@ -3,10 +3,17 @@
- + + + + + + 新增 + +
- - - + + -
+
@@ -315,7 +317,7 @@ const addEdit = (type, row) => { // 表格高度计算 const tabHeightFn = () => { - pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250; + pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 220; window.onresize = function () { tabHeightFn(); }; diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue index 3532f68..ee8dc87 100644 --- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue @@ -3,46 +3,17 @@
- -
- - - + +
-
+
@@ -317,7 +288,7 @@ const deleteRow = (id) => { // 表格高度计算 const tabHeightFn = () => { - pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250; + pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 220; window.onresize = function () { tabHeightFn(); }; diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroupSh/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroupSh/index.vue index a2760f6..8a924f4 100644 --- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroupSh/index.vue +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroupSh/index.vue @@ -3,10 +3,17 @@
- + + + + + + 新增 + +
- - - + + -
+
- -
- - - + +
+ -
+
@@ -331,7 +305,7 @@ const addEdit = (type, row) => { // 表格高度计算 const tabHeightFn = () => { - pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250; + pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 220; window.onresize = function () { tabHeightFn(); }; diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/model/info.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/model/info.vue index 8fdb9d5..6522d80 100644 --- a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/model/info.vue +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/model/info.vue @@ -17,7 +17,7 @@
-
+
@@ -25,11 +25,25 @@
- + + + +
+ diff --git a/src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/index.vue b/src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/index.vue index 0dce740..206a073 100644 --- a/src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/index.vue +++ b/src/views/backOfficeSystem/HumanIntelligence/appraisalManagement/index.vue @@ -2,20 +2,22 @@
- -
- -