From f50451fcb85ab7d67a51a725fed1b7b7360b01b0 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Mon, 28 Oct 2024 11:36:31 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=E6=B0=B4=E5=BA=93=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E7=89=88=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 +- src/api/reservoir/index.js | 44 + src/assets/image/right.png | Bin 0 -> 866 bytes src/assets/image/warning.png | Bin 0 -> 789 bytes src/assets/styles/element-ui.scss | 7 + src/assets/styles/index.scss | 6 + src/layout/components/Navbar.vue | 2 +- src/permission.js | 2 - src/router/index.js | 2 +- src/store/modules/permission.js | 20 +- .../waterSetting/runScene/layerTree/index.js | 1 + src/views/components/SyMixMap.vue | 18 +- src/views/mobilePage/index.vue | 26 +- .../reservoir/safeMonitorSetting/index.vue | 359 +++++++++ .../safeOperation/components/BaseInfo.vue | 751 ++++++++++++++++++ .../components/ProjectDetail.vue | 38 + .../components/RealTimeMonitor.vue | 185 +++++ src/views/reservoir/safeOperation/index.vue | 381 +++++++++ .../reservoir/safeOperation/js/initEcharts.js | 124 +++ .../reservoir/safeOperation/js/mapUtils.js | 119 +++ 20 files changed, 2062 insertions(+), 27 deletions(-) create mode 100644 src/api/reservoir/index.js create mode 100644 src/assets/image/right.png create mode 100644 src/assets/image/warning.png create mode 100644 src/views/reservoir/safeMonitorSetting/index.vue create mode 100644 src/views/reservoir/safeOperation/components/BaseInfo.vue create mode 100644 src/views/reservoir/safeOperation/components/ProjectDetail.vue create mode 100644 src/views/reservoir/safeOperation/components/RealTimeMonitor.vue create mode 100644 src/views/reservoir/safeOperation/index.vue create mode 100644 src/views/reservoir/safeOperation/js/initEcharts.js create mode 100644 src/views/reservoir/safeOperation/js/mapUtils.js diff --git a/package.json b/package.json index 6f6571c..25d8e0d 100644 --- a/package.json +++ b/package.json @@ -63,6 +63,8 @@ "jspdf": "^2.5.1", "jsplumb": "^2.15.6", "jszip": "^3.0.0", + "lodash-es": "^4.17.21", + "mitt": "^3.0.1", "node-jsencrypt": "^1.0.0", "normalize.css": "7.0.0", "nprogress": "0.2.0", @@ -132,4 +134,4 @@ "> 1%", "last 2 versions" ] -} \ No newline at end of file +} diff --git a/src/api/reservoir/index.js b/src/api/reservoir/index.js new file mode 100644 index 0000000..ddfa8a0 --- /dev/null +++ b/src/api/reservoir/index.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 获取场景列表 +export const getSceneListData = async (data) => { + return request({ + url: `/map/scene/sceneList`, + method: 'post', + data: { + pageNum: 1, + pageSize: 10, + data: { + id: '', + name: data.name + }, + params: { + order: 'asc', + orderBy: 'pub_date' + } + } + }); +}; + +// 根据id获取图层树 +export const getLayerData = async (sceneId) => { + return request({ + url: `/map/scene/getLayerTree/${sceneId}`, + method: 'get' + }); +}; + +// 水库基础信息详情 +export const getReservoirBaseDetailData = (id) =>{ + return request({ + url: `/sk/base/${id}`, + method: 'get' + }) +} +// 水库特征信息详情 +export const getReservoirRsppDetailData = (id) =>{ + return request({ + url: `/sk/rspp/${id}`, + method: 'get' + }) +} diff --git a/src/assets/image/right.png b/src/assets/image/right.png new file mode 100644 index 0000000000000000000000000000000000000000..b6bccc92870b509ff19b9c9790c37aad2dc0c181 GIT binary patch literal 866 zcmV-o1D*VdP)Px#1am@3R0s$N2z&@+hyVZs3`s;mR9J<*m$7RbXBdZ{_q&sIU^nL>r5Ze_kP<^v zsA(+%bp{QAb|{HyI&>`L53til3Us+8V4IM*b2Vhk;^1cMrX>aA(o(3C$Za4RG^lj( zsVY5L-|6iT#n`oCUF3^@>%HGS5BJ@@_q{^GMAWCvy8CLN2Z>w*O?Z!7mDhY=e~u)OuLhns>6f+F zyCEW8Lhym8Y9z)i)po+06a$-BAiuei^IUfwI6n$_KsF+4=j(-1bEv?XUvIzb^!Pzw zDkV4o3XRzC@zeLOJ$k7?esd+4b={xRhVPf?SUbD_Ntiu&HSj#wU4LD00D&pbb=Ro| z?jZqh(l3+Vo*$L-)06%;`=t7h-f^Cd`nHddc4X~4^+Ks>0J0gUe1dR*iEPFx14zCa zc%FaiFOoNzqa%6?l{toQXFCd8Z<>rhK9?3;g@xM8SJzG0x+o$Khm=ob{P8*C;(V4C ze0%2Fw*ZfeLHl3$bl4gP=aNyFP7@A5HE^@4-z8Xj&H(vD6p_0s@_iEcS^v~Mfh!5_ zI%R;UwdwKlW(<@QeaIk1)z93W?gRVXyJXBHO$C)4$yQ12}V} zgv#pn2Yrb_84(UVH9%virRc)hpYPmB84l1e0<|QS10{|J2iP)}_V;BMj9EG{yvVH=$FjXfRNDz}0vjiQ-{`YAAV4v&k+t)hpf8LXg+^rU{Qeo?Kr5~n zN=*~TpS%tUg@*Qe7ymyS9QqeLnZ3T%v38bpw_~GY?dPx#1am@3R0s$N2z&@+hyVZrzez+vR9J<@SFvu>P!v7)IY}+m)Kw*_w910o1+jF< z(xIYAFtrP`vKYGX4@fOj)rnN%AG&mM3mt%sfvRhV3?LYS%8)`77~;f8A&Gq$(u9yU z#I_vuOxJ#X_ni0cyVv�-|igFg0^Uh-Cm-0vQoW0|3dA07U?&6ufsl=k2rwH;7*u z_5qK~xu%aT5E~HD1F0qJ5bP%va`Mpm5=p?>9`xB8=C%l)0+I+sd|640#EWk=XXn-v z)B_9PkvZ4&(dGnH z*@gjPBbY37RZ+qL~#;1kOVg6wq(fFP?#WUh;!khB_Q z;TZ-2GHUo|qlFSMWDds%0ZR$CJDJd7_DK010p|ib|PPNoSm+i-m$tpF)x~&2u9SDf+czbnoH?*T_p9SN2||6VWo zB>@01_SpSEk4v$JgUHk4(%5?KbN|qlKO^0$7S3yxMG@x0W=9`$ON6=eT4k|+.el-tree-node__content{ + background: #36B29E1a; + // border-right: 2px solid #36B29E; + box-shadow: inset -4px 0px 0px 0px #36B29E; +} + + diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 71f1aed..fbfe653 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -191,6 +191,12 @@ aside { .text-center { text-align: center } +.text-left { + text-align: left; +} +.text-right{ + text-align: right; +} .sub-navbar { height: 50px; diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 9819808..3e3c21d 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -144,7 +144,7 @@ export default { sessionStorage.setItem("topTab", e); this.$store.dispatch("changeTopTab", e); this.$router.replace({ - path: "/", + path: `/`, query: { timestamp: new Date().getTime(), }, diff --git a/src/permission.js b/src/permission.js index cdb36f6..3efbe42 100644 --- a/src/permission.js +++ b/src/permission.js @@ -23,7 +23,6 @@ router.beforeEach((to, from, next) => { store.dispatch('GetInfo').then(res => { // 拉取user_info const roles = res.roles - console.log('GenerateRoutes >>>>> ') store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => { // 测试 默认静态页面 // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => { @@ -40,7 +39,6 @@ router.beforeEach((to, from, next) => { }) } else { if(!store.getters.permission_add_routes.length){ - console.log('GenerateRoutes >>>>> ') store.dispatch('GenerateRoutes').then(accessRoutes => { // 测试 默认静态页面 // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => { diff --git a/src/router/index.js b/src/router/index.js index 3201505..00643fa 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -157,7 +157,7 @@ const router = createRouter() // 注册一个全局前置守卫 router.beforeEach((to, from, next) => { - + if (to.path === "/singleLogin") { console.log("单点登录设置token", to.query.token); //判断当前路由是否需要进行权限控制 if (to.query.token) { diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index db81dab..381b131 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -167,7 +167,7 @@ function filterAsyncRouter(asyncRouterMap) { return asyncRouterMap.filter((route) => { if (route.component) { // Layout组件特殊处理 - if (route.component === 'Layout') { + if ( route.component === 'Layout') { route.component = Layout; } else { route.component = loadView(route.component); @@ -202,6 +202,24 @@ function resolveChildrenRoutes(routes, pickRoute = permission.state.selectTab) { path: `${parentRoute.path}/${v.path}` }; }) || []; + + newChildrenRoutes = newChildrenRoutes.map(v=> { + if(v.path && v.path != '/' && (!v.children || !v.children.length)){ + // 为了让非目录的一级菜单正常展示 + return { + path: '/', + orderNum: v.orderNum, + meta: v.meta, + component: Layout, + hidden: v.hidden, + children: [ + v + ] + } + } else { + return v + } + }) } } return { diff --git a/src/views/aiSupervision/waterSetting/runScene/layerTree/index.js b/src/views/aiSupervision/waterSetting/runScene/layerTree/index.js index 539c17d..a2f940b 100644 --- a/src/views/aiSupervision/waterSetting/runScene/layerTree/index.js +++ b/src/views/aiSupervision/waterSetting/runScene/layerTree/index.js @@ -183,6 +183,7 @@ const zoomToLayerActions = { // 添加图层 export async function addLayer(layerData) { + console.log('addLayer-layerData >>>>> ', layerData) const { layerType, url, id } = layerData; let action = null; // 超图 S3M图层 diff --git a/src/views/components/SyMixMap.vue b/src/views/components/SyMixMap.vue index 892268e..f0398f1 100644 --- a/src/views/components/SyMixMap.vue +++ b/src/views/components/SyMixMap.vue @@ -23,9 +23,7 @@ const viewerClick = (e) => { if (e.graphic?._style?.canEdit) { currentGraphic = e.graphic; plot.edit(e.graphic, () => { - console.log('编辑viewerClick >>>>> ', e.graphic, graphicsList) let res = graphicsList.find(item => item.graphicId === e.graphic.graphicId); - console.log('res >>>>> ', res) if(res){ res.position = e.graphic.position; res.positions = e.graphic.positions; @@ -201,14 +199,14 @@ export default { // ); setTimeout(() => { viewer.scene.camera.setView({ - destination: new Cesium.Cartesian3.fromDegrees(113.27, 23.13, this.defaultHeight), - // orientation: { - // heading: 0, - // pitch: -90, - // roll: 0, - // }, - duration: 2, - }); + destination: new Cesium.Cartesian3.fromDegrees(113.27, 23.13, this.defaultHeight), + // orientation: { + // heading: 0, + // pitch: -90, + // roll: 0, + // }, + duration: 2, + }); }, 300); }, handleKeyUpFunc(e){ diff --git a/src/views/mobilePage/index.vue b/src/views/mobilePage/index.vue index f6889dc..3ab4467 100644 --- a/src/views/mobilePage/index.vue +++ b/src/views/mobilePage/index.vue @@ -1,6 +1,11 @@ diff --git a/src/views/reservoir/safeMonitorSetting/index.vue b/src/views/reservoir/safeMonitorSetting/index.vue new file mode 100644 index 0000000..868185e --- /dev/null +++ b/src/views/reservoir/safeMonitorSetting/index.vue @@ -0,0 +1,359 @@ + + + diff --git a/src/views/reservoir/safeOperation/components/BaseInfo.vue b/src/views/reservoir/safeOperation/components/BaseInfo.vue new file mode 100644 index 0000000..3c0be5c --- /dev/null +++ b/src/views/reservoir/safeOperation/components/BaseInfo.vue @@ -0,0 +1,751 @@ + + + diff --git a/src/views/reservoir/safeOperation/components/ProjectDetail.vue b/src/views/reservoir/safeOperation/components/ProjectDetail.vue new file mode 100644 index 0000000..6a0251a --- /dev/null +++ b/src/views/reservoir/safeOperation/components/ProjectDetail.vue @@ -0,0 +1,38 @@ + + + diff --git a/src/views/reservoir/safeOperation/components/RealTimeMonitor.vue b/src/views/reservoir/safeOperation/components/RealTimeMonitor.vue new file mode 100644 index 0000000..d962716 --- /dev/null +++ b/src/views/reservoir/safeOperation/components/RealTimeMonitor.vue @@ -0,0 +1,185 @@ + + + + diff --git a/src/views/reservoir/safeOperation/index.vue b/src/views/reservoir/safeOperation/index.vue new file mode 100644 index 0000000..ca941aa --- /dev/null +++ b/src/views/reservoir/safeOperation/index.vue @@ -0,0 +1,381 @@ + + + + diff --git a/src/views/reservoir/safeOperation/js/initEcharts.js b/src/views/reservoir/safeOperation/js/initEcharts.js new file mode 100644 index 0000000..28ef4de --- /dev/null +++ b/src/views/reservoir/safeOperation/js/initEcharts.js @@ -0,0 +1,124 @@ +// 倒立柱状图，y轴inverse +export const initReverseLineOptions = () => { + return { + title: { + // text: "统计", + }, + legend: { + orient: "horizontal", + top: "2%", + }, + grid: { + left: "10%", + right: "10%", + bottom: "10%", + top: '10%', + containLabel: true, + }, + tooltip: { + trigger: "axis", + axisPointer: { + type: "cross", + label: { + backgroundColor: "#283b56", + }, + }, + }, + xAxis: [ + { + type: "category", + name: "时间", + position: "bottom", + axisLine: { + show: true, + }, + axisTick: { + alignWithLabel: true, + }, + data: ['00:00','02:00','04:00','06:00','08:00','10:00','12:00', + '14:00','16:00','18:00','20:00','22:00'], + }, + ], + yAxis: [ + { + type: "value", + inverse: true, + name: "降雨量(mm)", + nameLocation: 'start', + }, + ], + series: [ + { + color: "#4a66bb", + type: 'line', + smooth: true, + name: '降雨量', + areaStyle: {}, + data: [0, 10, 4, 8, 1, 6, 3, 5, 2, 7, 9, 11], + }, + ], + }; +}; + +// 双y轴柱状图 +export const doubleYAxisOptions = () => { + return { + title: { + // text: "统计", + }, + grid: { + left: "10%", + right: "10%", + bottom: "10%", + top: '10%', + containLabel: true, + }, + tooltip: { + trigger: "axis", + axisPointer: { + type: "cross", + label: { + backgroundColor: "#283b56", + }, + }, + }, + xAxis:[ + { + type: 'category', + name: '时间', + nameLocation: 'middle', + nameGap: 30, + data: ['00:00','02:00','04:00','06:00','08:00','10:00','12:00', + '14:00','16:00','18:00','20:00','22:00'], + } + ], + yAxis: [ + { + type: 'value', + name: '降雨量(mm)', + nameLocation: 'end', + }, + { + type: 'value', + name: '温度(℃)', + position: 'right', + nameLocation: 'end', + } + ], + series: [ + { + name: '降雨量', + type: 'line', + smooth: true, + data: [0, 10, 4, 8, 1, 6, 3, 5, 2, 7, 9, 11], + }, + { + name: '温度', + type: 'line', + smooth: true, + yAxisIndex: 1, + data: [24,28,26,30,25,27,29,31,23,22,21,20], + } + ] + } +} diff --git a/src/views/reservoir/safeOperation/js/mapUtils.js b/src/views/reservoir/safeOperation/js/mapUtils.js new file mode 100644 index 0000000..19fde01 --- /dev/null +++ b/src/views/reservoir/safeOperation/js/mapUtils.js @@ -0,0 +1,119 @@ +import axios from 'axios' + +const identifyLayerActions = { + '021102': async (params) => { + return new Promise(async (resolve, reject) => { + const { url, input_geometry, geometry_type, layers = 'all', returnGeometry = false, tolerance = 1 } = params; + const result = await axios.get(`${url}.json`); + if (result.status === 200 && result.data) { + const { xmin, ymin, xmax, ymax } = result.data.fullExtent; + const mapExtent = `${xmin},${ymin},${xmax},${ymax}`; + const data = await axios.get( + `${url}/identify?geometry=${input_geometry}&geometryType=${geometry_type}&layers=${layers}&returnGeometry=${returnGeometry}&mapExtent=${mapExtent}&imageDisplay=600,550,96&tolerance=${tolerance}&out_fields=*&f=json` + ); + if (data.status === 200 && data.data) { + resolve(data.data); + } else { + resolve(null); + } + } + }); + }, + '030300': async (params) => { + console.log(params); + }, + '081100': async (params) => { + return new Promise(async (resolve, reject) => { + const { queryMode, bufferDistance, geometry, url, layerTable, layerName, k } = params; + const queryUrl = url.split('maps/')[0].replace('map-', 'data-'); + let requestUrl = `${queryUrl}data/featureResults.rjson?returnContent=true`; + if (k) { + requestUrl += `&k=${k}`; + } + const result = await axios.post( + requestUrl, + JSON.stringify({ + datasetNames: [layerTable || layerName], + getFeatureMode: queryMode, + bufferDistance, + geometry + }), + { + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' + } + } + ); + resolve(result); + }); + } +}; + +export const queryLayersByPos = (position, layerList = [], cb) => { + + const { lng, lat } = position; + const layers = layerList + layers.forEach(async (layer) => { + const action = identifyLayerActions[layer.layerType]; + switch (layer.layerType) { + case '021102': { + const input_geometry = `${lng},${lat}`; + const geometry_type = 'esriGeometryPoint'; + const result = await action({ + input_geometry, + geometry_type, + url: layer.url + }); + let res; + if (result?.results?.length > 0) { + res = result.results[0] + } + if(cb) cb(res) + break; + } + case '030300': + break; + case '081100': { + const queryMode = 'BUFFER'; + const bufferDistance = 0.0005; // 缓冲距离大概是50米 + const spatialQueryMode = 'INTERSECT'; + const geometry = { + id: 0, + style: null, + parts: [1], + points: [ + { + x: lng, + y: lat + } + ], + type: 'POINT' + }; + let type = ''; + let isSite = false; + let layerTable = ''; + if (layer.extendData) { + const extendData = JSON.parse(layer.extendData); + + } + const result = await action({ + queryMode, + spatialQueryMode, + bufferDistance, + geometry, + layerName: layer.text, + layerTable, + url: layer.url, + k: layer.serviceToken + }); + if ([200, 201].includes(result.status)) { + console.log('处理业务数据 >>>>>> ', result) + + } + break; + } + default: + break; + } + }); +}; From 811c23a44ea7a0292b2bbbb4565387028fae1ece Mon Sep 17 00:00:00 2001 From: panyuyi Date: Mon, 28 Oct 2024 17:29:00 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/reservoir/index.js | 16 +++ src/utils/index.js | 7 ++ .../components/ProjectDetail.vue | 2 +- .../components/RealTimeMonitor.vue | 108 ++++++++++++------ src/views/reservoir/safeOperation/index.vue | 34 +++++- vue.config.js | 2 +- 6 files changed, 129 insertions(+), 40 deletions(-) diff --git a/src/api/reservoir/index.js b/src/api/reservoir/index.js index ddfa8a0..3eab868 100644 --- a/src/api/reservoir/index.js +++ b/src/api/reservoir/index.js @@ -42,3 +42,19 @@ export const getReservoirRsppDetailData = (id) =>{ method: 'get' }) } + +// 水库实时监测--监测站树数据 +export const getReservoirMonitorTreeData = (id) =>{ + return request({ + url: `/sk/??`, + method: 'get' + }) +} + +// 水库实时监测--降雨量等详情 +export const getReservoirRainDetailData = (id) =>{ + return request({ + url: `/sk/??`, + method: 'get' + }) +} diff --git a/src/utils/index.js b/src/utils/index.js index c416ada..2ff3755 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -466,3 +466,10 @@ export function loadScript(url) { document.head.appendChild(script) }) } + +// 开发时候生效 +export function devRun(cb){ + if(process.env.NODE_ENV === 'development'){ + if(cb) cb() + } +} diff --git a/src/views/reservoir/safeOperation/components/ProjectDetail.vue b/src/views/reservoir/safeOperation/components/ProjectDetail.vue index 6a0251a..b147ff3 100644 --- a/src/views/reservoir/safeOperation/components/ProjectDetail.vue +++ b/src/views/reservoir/safeOperation/components/ProjectDetail.vue @@ -27,7 +27,7 @@ export default { methods: { initData(code) { this.$refs.baseInfoRef.initData(code); - this.$refs.realTimeMonitor.initData(code); + // this.$refs.realTimeMonitor.initData(code); }, }, }; diff --git a/src/views/reservoir/safeOperation/components/RealTimeMonitor.vue b/src/views/reservoir/safeOperation/components/RealTimeMonitor.vue index d962716..082b5d0 100644 --- a/src/views/reservoir/safeOperation/components/RealTimeMonitor.vue +++ b/src/views/reservoir/safeOperation/components/RealTimeMonitor.vue @@ -9,6 +9,9 @@ @@ -18,6 +21,9 @@ @@ -55,9 +61,15 @@ diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue index 05bf376..3a60572 100644 --- a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue +++ b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue @@ -38,15 +38,17 @@ export default { name: "", planDateArr: [], }, - choiceDate: '', - pickerOption: { // 设置不能选择的日期 + choiceDate: "", + pickerOption: { + // 设置不能选择的日期 onPick: ({ maxDate, minDate }) => { - this.choiceDate = minDate.getTime() + this.choiceDate = minDate.getTime(); if (maxDate) { - this.choiceDate = ''; + this.choiceDate = ""; } }, - disabledDate: (time) => {//只能选择5年数据 + disabledDate: (time) => { + //只能选择5年数据 if (this.choiceDate) { let three = 5 * 12 * 30 * 24 * 3600 * 1000; let min = this.choiceDate + three; @@ -55,14 +57,14 @@ export default { } else { return false; } - } + }, }, dialog: { - title: '预览', - dom: '', - visible: false + title: "预览", + dom: "", + visible: false, }, - preViewFile: '', + preViewFile: "", currentRow: {}, dialogVisible: false, areasOptions: [], // 行政区划 @@ -115,12 +117,12 @@ export default { query: { auditId: row.id, id: row.formId, - type: 'audit', + type: "audit", }, }); }) .catch((action) => { - if (action === 'cancel') { + if (action === "cancel") { postYhPlanApprovalPassed({ id: row.id, comment: "同意", @@ -141,7 +143,7 @@ export default { query: { auditId: row.id, id: row.formId, - type: 'audit', + type: "audit", }, }); }, @@ -219,39 +221,41 @@ export default { let name = ""; supplements.forEach((supplement) => { const dict = this.supplementOptions?.find((element) => { - return element.dictValue == supplement.type - }) - let subName = `${dict.dictLabel}/${supplement.amount.replace(/\B(?=(\d{3})+(?!\d))/g, ",")}` - name = name + ' ' + subName - }) + return element.dictValue == supplement.type; + }); + let subName = `${dict.dictLabel}/${supplement.amount.replace( + /\B(?=(\d{3})+(?!\d))/g, + "," + )}`; + name = name + " " + subName; + }); return name; }, getFileName(doc) { if (!doc || !doc.docs) { - return '' + return ""; } return doc.docs.map((v) => { return { name: v.split("/")[v.split("/").length - 1], - file: v - } - - }) + file: v, + }; + }); }, // 关闭dialog closeDialog() { - this.dialog.visible = false + this.dialog.visible = false; }, handlePreview(file) { - this.dialog.visible = true - this.preViewFile = file + this.dialog.visible = true; + this.preViewFile = file; }, // 过滤时间日期 formatDate(dateStr) { const date = new Date(dateStr); - console.log(date) - return date.toISOString().split('T')[0]; - } + console.log(date); + return date.toISOString().split("T")[0]; + }, }, created() { this.getTreeData(); @@ -379,7 +383,7 @@ export default { border @selection-change="handleSelectionChange" > - + @@ -389,12 +393,12 @@ export default { {{ getDikeTypeName(scope.row.detail.dikeType) }} - + - + @@ -405,7 +409,11 @@ export default { label="计划开始/结束时间" > @@ -423,7 +431,11 @@ export default { }} - + @@ -446,10 +458,18 @@ export default { @@ -554,7 +574,7 @@ export default { :destroy-on-close="true" >
-
- @@ -571,14 +591,14 @@ export default {
- - + :title="dialog.title" + @close="closeDialog" + :visible.sync="dialog.visible" + width="80%" + append-to-body + > + + @@ -659,7 +679,7 @@ export default { padding-bottom: 72px; overflow: auto; } -/deep/.el-button--text { +::v-deep.el-button--text { text-wrap: wrap; } diff --git a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue index 992e90e..64d877e 100644 --- a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue +++ b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue @@ -882,7 +882,7 @@ export default { } } -/deep/.el-input__count { +::v-deep.el-input__count { height: 15px; line-height: 15px; margin-right: 10px; diff --git a/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue b/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue index 0c06d2f..7f8c0c4 100644 --- a/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue +++ b/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue @@ -302,7 +302,7 @@ export default { } } -/deep/.el-input__count { +::v-deep.el-input__count { height: 15px; line-height: 15px; margin-right: 10px; diff --git a/src/views/loginbg.vue b/src/views/loginbg.vue index f21f188..1841dca 100644 --- a/src/views/loginbg.vue +++ b/src/views/loginbg.vue @@ -288,14 +288,14 @@ export default { .el-input { height: 50px; - /deep/ .el-input__inner { + ::v-deep .el-input__inner { height: 50px; background: #fff; border: none; } } - // /deep/ .el-form-item { + // ::v-deep .el-form-item { // margin-bottom: 30px; // } diff --git a/src/views/reservoir/runManage/enginerring/components/Drawer.vue b/src/views/reservoir/runManage/enginerring/components/Drawer.vue index 9f0307b..049b027 100644 --- a/src/views/reservoir/runManage/enginerring/components/Drawer.vue +++ b/src/views/reservoir/runManage/enginerring/components/Drawer.vue @@ -1,75 +1,106 @@ \ No newline at end of file + diff --git a/src/views/aiSupervision/waterSetting/runScene/detail/index.vue b/src/views/aiSupervision/waterSetting/runScene/detail/index.vue index 34f62fe..9450e6e 100644 --- a/src/views/aiSupervision/waterSetting/runScene/detail/index.vue +++ b/src/views/aiSupervision/waterSetting/runScene/detail/index.vue @@ -433,7 +433,7 @@ export default { } } } - ::v-deep.el-tabs { + ::v-deep .el-tabs { height: calc(100% - 130px); margin-top: 12px; @@ -486,7 +486,7 @@ export default { } } - ::v-deep.sy-dialog { + ::v-deep .sy-dialog { .el-dialog__body { padding: 0 20px; .dialog-content { diff --git a/src/views/aiSupervision/waterSetting/runScene/layerTree/index.vue b/src/views/aiSupervision/waterSetting/runScene/layerTree/index.vue index 1188659..77bde60 100644 --- a/src/views/aiSupervision/waterSetting/runScene/layerTree/index.vue +++ b/src/views/aiSupervision/waterSetting/runScene/layerTree/index.vue @@ -109,7 +109,7 @@ export default { .search-btn { margin-bottom: 12px; } - ::v-deep.el-tree { + ::v-deep .el-tree { .custom-tree-node { flex: 1; display: flex; diff --git a/src/views/dike/engineeringCondition/dikeBaseInfo copy/index.vue b/src/views/dike/engineeringCondition/dikeBaseInfo copy/index.vue index 8b2e53e..9042457 100644 --- a/src/views/dike/engineeringCondition/dikeBaseInfo copy/index.vue +++ b/src/views/dike/engineeringCondition/dikeBaseInfo copy/index.vue @@ -1269,9 +1269,7 @@ export default { diff --git a/src/views/dike/engineeringCondition/dikeBaseInfo copy/options/projectManagement.vue b/src/views/dike/engineeringCondition/dikeBaseInfo copy/options/projectManagement.vue index 43253ac..0d89e48 100644 --- a/src/views/dike/engineeringCondition/dikeBaseInfo copy/options/projectManagement.vue +++ b/src/views/dike/engineeringCondition/dikeBaseInfo copy/options/projectManagement.vue @@ -920,17 +920,16 @@ export default { }; diff --git a/src/views/dike/engineeringCondition/dikeCompare/components/managementSystem.vue b/src/views/dike/engineeringCondition/dikeCompare/components/managementSystem.vue index cf07ccf..249905e 100644 --- a/src/views/dike/engineeringCondition/dikeCompare/components/managementSystem.vue +++ b/src/views/dike/engineeringCondition/dikeCompare/components/managementSystem.vue @@ -41,11 +41,6 @@ export default { diff --git a/src/views/dike/engineeringCondition/identificationPlate/index.vue b/src/views/dike/engineeringCondition/identificationPlate/index.vue index 179938a..caab272 100644 --- a/src/views/dike/engineeringCondition/identificationPlate/index.vue +++ b/src/views/dike/engineeringCondition/identificationPlate/index.vue @@ -1188,11 +1188,11 @@ export default { diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue index 3a60572..296db84 100644 --- a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue +++ b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue @@ -679,7 +679,7 @@ export default { padding-bottom: 72px; overflow: auto; } -::v-deep.el-button--text { +::v-deep .el-button--text { text-wrap: wrap; } diff --git a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue index 64d877e..f4f5637 100644 --- a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue +++ b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue @@ -882,7 +882,7 @@ export default { } } -::v-deep.el-input__count { +::v-deep .el-input__count { height: 15px; line-height: 15px; margin-right: 10px; diff --git a/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue b/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue index 7f8c0c4..40d5d6e 100644 --- a/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue +++ b/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue @@ -302,7 +302,7 @@ export default { } } -::v-deep.el-input__count { +::v-deep .el-input__count { height: 15px; line-height: 15px; margin-right: 10px; diff --git a/src/views/dike/safetyManage/confirmDelimitationManage/index.vue b/src/views/dike/safetyManage/confirmDelimitationManage/index.vue index e448262..501e6a5 100644 --- a/src/views/dike/safetyManage/confirmDelimitationManage/index.vue +++ b/src/views/dike/safetyManage/confirmDelimitationManage/index.vue @@ -880,9 +880,7 @@ export default { diff --git a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/index.vue b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/index.vue index 4c51797..4035dde 100644 --- a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/index.vue +++ b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/index.vue @@ -1419,32 +1419,31 @@ export default { diff --git a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/transform.vue b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/transform.vue index b06b3ef..1c2cdff 100644 --- a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/transform.vue +++ b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/transform.vue @@ -184,13 +184,13 @@ - @@ -736,35 +736,35 @@ export default { diff --git a/src/views/dike/safetyManage/declarationManage/examine/components/listPage/options/managementSystem.vue b/src/views/dike/safetyManage/declarationManage/examine/components/listPage/options/managementSystem.vue index cf07ccf..90ba1d1 100644 --- a/src/views/dike/safetyManage/declarationManage/examine/components/listPage/options/managementSystem.vue +++ b/src/views/dike/safetyManage/declarationManage/examine/components/listPage/options/managementSystem.vue @@ -41,11 +41,7 @@ export default { diff --git a/src/views/dike/safetyManage/declarationManage/examine/components/listPage/transform.vue b/src/views/dike/safetyManage/declarationManage/examine/components/listPage/transform.vue index e176c5e..1721a59 100644 --- a/src/views/dike/safetyManage/declarationManage/examine/components/listPage/transform.vue +++ b/src/views/dike/safetyManage/declarationManage/examine/components/listPage/transform.vue @@ -583,11 +583,7 @@ export default { diff --git a/src/views/dike/safetyManage/floodControlManagement/preplan.vue b/src/views/dike/safetyManage/floodControlManagement/preplan.vue index cfc9a96..a3de46b 100644 --- a/src/views/dike/safetyManage/floodControlManagement/preplan.vue +++ b/src/views/dike/safetyManage/floodControlManagement/preplan.vue @@ -640,9 +640,4 @@ export default { diff --git a/src/views/dike/safetyManage/floodControlManagement/supplies.vue b/src/views/dike/safetyManage/floodControlManagement/supplies.vue index 56d0761..4e97763 100644 --- a/src/views/dike/safetyManage/floodControlManagement/supplies.vue +++ b/src/views/dike/safetyManage/floodControlManagement/supplies.vue @@ -645,9 +645,4 @@ export default { diff --git a/src/views/dike/safetyManage/floodControlManagement/tissue.vue b/src/views/dike/safetyManage/floodControlManagement/tissue.vue index 2e62543..15357d7 100644 --- a/src/views/dike/safetyManage/floodControlManagement/tissue.vue +++ b/src/views/dike/safetyManage/floodControlManagement/tissue.vue @@ -789,11 +789,6 @@ export default { diff --git a/src/views/dike/safetyManage/safeProduction/components/list.vue b/src/views/dike/safetyManage/safeProduction/components/list.vue index e73b8e7..81bc956 100644 --- a/src/views/dike/safetyManage/safeProduction/components/list.vue +++ b/src/views/dike/safetyManage/safeProduction/components/list.vue @@ -689,9 +689,4 @@ export default { diff --git a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue index 47193e0..5f8e596 100644 --- a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue +++ b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue @@ -593,12 +593,6 @@ export default { diff --git a/src/views/engineeringCondition/baseInfo/dyke/dykeBaseInfo/index.vue b/src/views/engineeringCondition/baseInfo/dyke/dykeBaseInfo/index.vue index 34ed089..b426e2a 100644 --- a/src/views/engineeringCondition/baseInfo/dyke/dykeBaseInfo/index.vue +++ b/src/views/engineeringCondition/baseInfo/dyke/dykeBaseInfo/index.vue @@ -1269,9 +1269,7 @@ export default { diff --git a/src/views/engineeringCondition/baseInfo/dyke/dykeBaseInfo/options/projectManagement.vue b/src/views/engineeringCondition/baseInfo/dyke/dykeBaseInfo/options/projectManagement.vue index 61e7c12..b5e3902 100644 --- a/src/views/engineeringCondition/baseInfo/dyke/dykeBaseInfo/options/projectManagement.vue +++ b/src/views/engineeringCondition/baseInfo/dyke/dykeBaseInfo/options/projectManagement.vue @@ -916,16 +916,14 @@ export default { }; diff --git a/src/views/engineeringCondition/baseInfo/sluice/sluiceBaseInfo/options/projectManagement.vue b/src/views/engineeringCondition/baseInfo/sluice/sluiceBaseInfo/options/projectManagement.vue index 44f831d..dddc996 100644 --- a/src/views/engineeringCondition/baseInfo/sluice/sluiceBaseInfo/options/projectManagement.vue +++ b/src/views/engineeringCondition/baseInfo/sluice/sluiceBaseInfo/options/projectManagement.vue @@ -1072,17 +1072,17 @@ export default { }; diff --git a/src/views/reservoir/runManage/enginerring/components/GaoDeMap.vue b/src/views/reservoir/runManage/enginerring/components/GaoDeMap.vue index 8f88195..a51fd97 100644 --- a/src/views/reservoir/runManage/enginerring/components/GaoDeMap.vue +++ b/src/views/reservoir/runManage/enginerring/components/GaoDeMap.vue @@ -393,7 +393,7 @@ export default { z-index: 9; } -::v-deep.amap-marker-label { +::v-deep .amap-marker-label { background-color: rgba(0, 0, 0, 0.6); border: none; border-radius: 2px; diff --git a/src/views/reservoir/safeOperation/index.vue b/src/views/reservoir/safeOperation/index.vue index e96aa2c..3539350 100644 --- a/src/views/reservoir/safeOperation/index.vue +++ b/src/views/reservoir/safeOperation/index.vue @@ -135,9 +135,7 @@ export default { ); }, initMap() { - viewer = new sycim.Viewer("reservoir-map-container", { - sceneMode: this.mapSceneType, // 2: 2D, 3: 3D - }); + viewer = new sycim.Viewer("reservoir-map-container"); window.viewer = viewer; let baseLayer = sycim.ImageryLayerFactory.createImageryLayer( sycim.ImageryType.ARCGIS, @@ -185,7 +183,7 @@ export default { }, handleAddHtmlLayer(position, data) { - console.log("handleAddHtmlLayer-position,data >>>>> ", position, data); + console.log("添加DivIcon >>>>> ", position, data); htmlLayer?.clear(); let divIcon = new sycim.DivIcon( `${position.lng}, ${position.lat}`, diff --git a/src/views/safetyManage/confirmDelimitationManage/sluice/index.vue b/src/views/safetyManage/confirmDelimitationManage/sluice/index.vue index e125811..63e9cd4 100644 --- a/src/views/safetyManage/confirmDelimitationManage/sluice/index.vue +++ b/src/views/safetyManage/confirmDelimitationManage/sluice/index.vue @@ -856,9 +856,7 @@ export default { diff --git a/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/index.vue b/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/index.vue index 723dd47..bea7914 100644 --- a/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/index.vue +++ b/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/index.vue @@ -505,13 +505,13 @@ /> - @@ -1099,32 +1099,30 @@ export default { diff --git a/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue b/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue index b19d30f..cac1cfc 100644 --- a/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue +++ b/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue @@ -187,13 +187,13 @@ - @@ -734,35 +734,34 @@ export default { diff --git a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/managementSystem.vue b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/managementSystem.vue index 31e4156..b4d8ff3 100644 --- a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/managementSystem.vue +++ b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/managementSystem.vue @@ -37,11 +37,7 @@ export default { diff --git a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue index d4ccdf8..c5e6f20 100644 --- a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue +++ b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue @@ -582,11 +582,7 @@ export default { diff --git a/src/views/safetyManage/floodControlManagement/sluice/preplan.vue b/src/views/safetyManage/floodControlManagement/sluice/preplan.vue index a0d9d47..b27121a 100644 --- a/src/views/safetyManage/floodControlManagement/sluice/preplan.vue +++ b/src/views/safetyManage/floodControlManagement/sluice/preplan.vue @@ -604,9 +604,4 @@ export default { diff --git a/src/views/safetyManage/floodControlManagement/sluice/supplies.vue b/src/views/safetyManage/floodControlManagement/sluice/supplies.vue index b1b5c88..0685b89 100644 --- a/src/views/safetyManage/floodControlManagement/sluice/supplies.vue +++ b/src/views/safetyManage/floodControlManagement/sluice/supplies.vue @@ -609,9 +609,4 @@ export default { diff --git a/src/views/safetyManage/responsiblePersonManage/sluice/index.vue b/src/views/safetyManage/responsiblePersonManage/sluice/index.vue index a30a5e9..51a3701 100644 --- a/src/views/safetyManage/responsiblePersonManage/sluice/index.vue +++ b/src/views/safetyManage/responsiblePersonManage/sluice/index.vue @@ -614,9 +614,4 @@ export default { diff --git a/src/views/safetyManage/safeProduction/sluice/index.vue b/src/views/safetyManage/safeProduction/sluice/index.vue index eba03c8..17388f2 100644 --- a/src/views/safetyManage/safeProduction/sluice/index.vue +++ b/src/views/safetyManage/safeProduction/sluice/index.vue @@ -682,9 +682,4 @@ export default { diff --git a/src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo.vue b/src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo.vue index 198a161..83110fe 100644 --- a/src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo.vue +++ b/src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo.vue @@ -593,12 +593,6 @@ export default { diff --git a/src/views/sluice/engineeringCondition/identificationPlate/index.vue b/src/views/sluice/engineeringCondition/identificationPlate/index.vue index e8da4be..91d408e 100644 --- a/src/views/sluice/engineeringCondition/identificationPlate/index.vue +++ b/src/views/sluice/engineeringCondition/identificationPlate/index.vue @@ -1198,10 +1198,8 @@ export default { diff --git a/src/views/sluice/engineeringCondition/sluiceBaseInfo copy/options/projectManagement.vue b/src/views/sluice/engineeringCondition/sluiceBaseInfo copy/options/projectManagement.vue index b979f30..b5d0d7e 100644 --- a/src/views/sluice/engineeringCondition/sluiceBaseInfo copy/options/projectManagement.vue +++ b/src/views/sluice/engineeringCondition/sluiceBaseInfo copy/options/projectManagement.vue @@ -1076,17 +1076,16 @@ export default { }; diff --git a/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue b/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue index 8b7ffe3..0fb3aa7 100644 --- a/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue +++ b/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue @@ -954,10 +954,8 @@ export default { diff --git a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue index ab29e86..eda0c29 100644 --- a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue +++ b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue @@ -672,7 +672,7 @@ export default { padding-bottom: 72px; overflow: auto; } -::v-deep.el-button--text { +::v-deep .el-button--text { text-wrap: wrap; } diff --git a/src/views/sluice/runManage/supervisionInspetion/methodsManage/index.vue b/src/views/sluice/runManage/supervisionInspetion/methodsManage/index.vue index 84069fb..87104c8 100644 --- a/src/views/sluice/runManage/supervisionInspetion/methodsManage/index.vue +++ b/src/views/sluice/runManage/supervisionInspetion/methodsManage/index.vue @@ -302,7 +302,7 @@ export default { } } -::v-deep.el-input__count { +::v-deep .el-input__count { height: 15px; line-height: 15px; margin-right: 10px; diff --git a/src/views/sluice/safetyManage/confirmDelimitationManage/index.vue b/src/views/sluice/safetyManage/confirmDelimitationManage/index.vue index 7aade5c..576dd3e 100644 --- a/src/views/sluice/safetyManage/confirmDelimitationManage/index.vue +++ b/src/views/sluice/safetyManage/confirmDelimitationManage/index.vue @@ -879,9 +879,7 @@ export default { diff --git a/src/views/sluice/safetyManage/declarationManage/declare/components/listPage/index.vue b/src/views/sluice/safetyManage/declarationManage/declare/components/listPage/index.vue index 1ba9a55..6c7b3b3 100644 --- a/src/views/sluice/safetyManage/declarationManage/declare/components/listPage/index.vue +++ b/src/views/sluice/safetyManage/declarationManage/declare/components/listPage/index.vue @@ -1119,32 +1119,30 @@ export default { diff --git a/src/views/sluice/safetyManage/floodControlManagement/components/pRTable.vue b/src/views/sluice/safetyManage/floodControlManagement/components/pRTable.vue index 1c5f831..f0dd414 100644 --- a/src/views/sluice/safetyManage/floodControlManagement/components/pRTable.vue +++ b/src/views/sluice/safetyManage/floodControlManagement/components/pRTable.vue @@ -394,10 +394,8 @@ export default { diff --git a/src/views/sluice/safetyManage/safetyAppraisal/list.vue b/src/views/sluice/safetyManage/safetyAppraisal/list.vue index 8e647ab..03ae658 100644 --- a/src/views/sluice/safetyManage/safetyAppraisal/list.vue +++ b/src/views/sluice/safetyManage/safetyAppraisal/list.vue @@ -542,51 +542,49 @@ export default { diff --git a/src/views/system/datas/repeat.vue b/src/views/system/datas/repeat.vue index 4783ae8..167f4d5 100644 --- a/src/views/system/datas/repeat.vue +++ b/src/views/system/datas/repeat.vue @@ -408,7 +408,7 @@ export default { white-space: nowrap; text-overflow: ellipsis; } -::v-deep.el-carousel__container { +::v-deep .el-carousel__container { height: 100%; } .app-container { diff --git a/src/views/system/tag/index.vue b/src/views/system/tag/index.vue index c6af8d7..664b41a 100644 --- a/src/views/system/tag/index.vue +++ b/src/views/system/tag/index.vue @@ -736,7 +736,7 @@ export default { background: #ffffff; } } -::v-deep.tree-line { +::v-deep .tree-line { width: 100%; .el-tree-node { white-space: normal; From 45b98811558b4f2305cafeef60bd6d146b8db02f Mon Sep 17 00:00:00 2001 From: panyuyi Date: Tue, 29 Oct 2024 17:26:24 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/reservoir/safeMonitorSetting/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/reservoir/safeMonitorSetting/index.vue b/src/views/reservoir/safeMonitorSetting/index.vue index 868185e..bd20e32 100644 --- a/src/views/reservoir/safeMonitorSetting/index.vue +++ b/src/views/reservoir/safeMonitorSetting/index.vue @@ -33,7 +33,7 @@ v-for="item in searchTypeOptions" :label="item.dictLabel" :value="item.dictValue" - :key="dictValue" + :key="item.dictValue" > From f3eb6bb3e191b8e7e9cabb1bc03aca9466fe7b50 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Thu, 31 Oct 2024 16:55:04 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/logo/logo-shuili2.png | Bin 0 -> 4092 bytes src/assets/styles/index.scss | 8 +- src/assets/styles/sidebar.scss | 7 +- src/layout/components/Navbar.vue | 6 +- src/layout/components/Sidebar/Logo.vue | 3 +- src/mixins/calcTableHeight.js | 36 ++ .../dangerWeakProject/inspectGroup/index.vue | 37 +- .../inspectItemsSetting/index.vue | 15 +- .../inspectItemsSetting/itemDetails.vue | 13 +- .../inspectProjects/index.vue | 192 ++++----- .../dangerWeakProject/inspectReport/index.vue | 168 ++++---- .../inspectStatistics/index.vue | 9 +- .../dangerWeakProject/inspectTasks/index.vue | 196 ++++----- .../inspectTasks/taskDetails.vue | 11 +- .../enginerring/inspectionItems/index.vue | 74 ++-- .../enginerring/inspectionPlan/index.vue | 194 ++++----- .../enginerring/inspectionRecords/index.vue | 312 +++++++------- .../inspectionRouteManage/index.vue | 288 ++++++------- .../maintenance/maintenancePlan/index.vue | 395 +++++++++--------- .../maintenancePlanAccept/index.vue | 201 ++++----- .../maintenancePlanAudit/index.vue | 210 +++++----- .../maintenance/maintenanceRecords/index.vue | 327 ++++++++------- .../dike/runManage/monitoring/dike/index.vue | 100 +++-- .../monitoring/dike/manage/index.vue | 119 +++--- .../monitoring/dike/record/index.vue | 128 +++--- .../pestAnimalControl/controlManage/index.vue | 58 +-- .../governanceRecords/index.vue | 78 ++-- .../planManagement/index.vue | 81 ++-- .../methodsManage/details.vue | 14 +- .../methodsManage/index.vue | 130 +++--- .../methodsManage/itemsDetails.vue | 80 ++-- .../methodsManage/itemsList.vue | 19 +- .../projectManage/index.vue | 65 +-- .../projectManage/projectReport.vue | 14 +- .../questionManage/index.vue | 61 +-- .../statisticAnalysis/index.vue | 4 +- .../tasksManage/index.vue | 67 +-- .../tasksManage/tasksDetails.vue | 9 +- .../waterRainReport/monitoring/index.vue | 68 ++- .../waterRainReport/smartAnalyse/index.vue | 4 +- .../testReportManage/index.vue | 90 ++-- .../dangerWeakProject/inspectGroup/index.vue | 37 +- .../inspectItemsSetting/index.vue | 15 +- .../inspectItemsSetting/itemDetails.vue | 13 +- .../inspectProjects/index.vue | 192 ++++----- .../dangerWeakProject/inspectReport/index.vue | 164 ++++---- .../inspectStatistics/index.vue | 10 +- .../dangerWeakProject/inspectTasks/index.vue | 192 ++++----- .../inspectTasks/taskDetails.vue | 11 +- .../enginerring/inspectionItems/index.vue | 79 ++-- .../enginerring/inspectionPlan/index.vue | 191 ++++----- .../enginerring/inspectionRecords/index.vue | 312 +++++++------- .../inspectionRouteManage/index.vue | 288 ++++++------- .../maintenance/maintenancePlan/index.vue | 374 +++++++++-------- .../maintenancePlanAccept/index.vue | 201 ++++----- .../maintenancePlanAudit/index.vue | 200 ++++----- .../maintenance/maintenanceRecords/index.vue | 350 ++++++++-------- .../runManage/monitoring/sluice/index.vue | 100 +++-- .../monitoring/sluice/manage/index.vue | 119 +++--- .../monitoring/sluice/record/index.vue | 130 +++--- .../methodsManage/details.vue | 11 +- .../methodsManage/index.vue | 128 +++--- .../methodsManage/itemsDetails.vue | 80 ++-- .../methodsManage/itemsList.vue | 15 +- .../projectManage/index.vue | 65 +-- .../projectManage/projectReport.vue | 14 +- .../questionManage/index.vue | 65 +-- .../statisticAnalysis/index.vue | 4 +- .../tasksManage/index.vue | 63 +-- .../tasksManage/tasksDetails.vue | 6 +- .../waterRainReport/monitoring/index.vue | 64 ++- .../waterRainReport/smartAnalyse/index.vue | 4 +- .../testReportManage/index.vue | 84 ++-- 73 files changed, 3890 insertions(+), 3582 deletions(-) create mode 100644 src/assets/logo/logo-shuili2.png create mode 100644 src/mixins/calcTableHeight.js diff --git a/src/assets/logo/logo-shuili2.png b/src/assets/logo/logo-shuili2.png new file mode 100644 index 0000000000000000000000000000000000000000..0040e0aeb0083955faa728f6e2c7397199026e14 GIT binary patch literal 4092 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 .el-submenu__title .el-submenu__icon-arrow { transform: rotate(180deg); } - + .el-submenu.is-opened > .el-submenu__title { margin-bottom: 0; } @@ -93,6 +93,11 @@ background-color: #ebf7f5 !important; } } + + .el-menu-item{ + height: 48px; + line-height: 48px; + } } // menu hover diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 3e3c21d..0ad8bb4 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -11,7 +11,6 @@
-
{{ item.label }}
-