Skip to content

Z
zhxf_vue
Commit 6dc3fe88 authored by xiexingan's avatar xiexingan
Browse files
Options

Merge

parents 0c2ecc1c beaf5d45
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 20023 additions and 4961 deletions
package-lock.json 0 → 100644
View file @ 6dc3fe88
This diff is collapsed.
package.json
View file @ 6dc3fe88
{ {
"name": "suntray-admin", "name": "suntray-admin",
"version": "1.0.0", "version": "1.0.0",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve --open", "serve": "vue-cli-service serve --open",
"start": "vue-cli-service serve --open", "start": "vue-cli-service serve --open",
"dev": "vue-cli-service serve --open", "dev": "vue-cli-service serve --open",
"build": "vue-cli-service build", "build": "vue-cli-service build",
"build:travis": "vue-cli-service build --mode travis", "build:travis": "vue-cli-service build --mode travis",
"lint": "vue-cli-service lint --fix", "lint": "vue-cli-service lint --fix",
"test:unit": "vue-cli-service test:unit" "test:unit": "vue-cli-service test:unit"
}, },
"dependencies": { "dependencies": {
"@d2-projects/d2-crud": "^1.2.0", "@d2-projects/d2-crud": "^1.2.0",
"axios": "^0.17.1", "axios": "^0.17.1",
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"better-scroll": "^1.12.1", "better-scroll": "^1.12.1",
"clipboard-polyfill": "^2.4.1", "clipboard-polyfill": "^2.4.1",
"countup.js": "^1.9.3", "countup.js": "^1.9.3",
"crypto-js": "^3.1.9-1", "crypto-js": "^3.1.9-1",
"dayjs": "^1.6.7", "dayjs": "^1.6.7",
"echarts": "^4.1.0", "echarts": "^4.1.0",
"el-table-infinite-scroll": "^1.0.8", "el-table-infinite-scroll": "^1.0.8",
"element-ui": "^2.12.0", "element-ui": "^2.12.0",
"file-saver": "^1.3.3", "file-saver": "^1.3.3",
"flex.css": "^1.1.7", "flex.css": "^1.1.7",
"fuse.js": "^3.2.1", "fuse.js": "^3.2.1",
"github-markdown-css": "^2.10.0", "github-markdown-css": "^2.10.0",
"highlight.js": "^9.12.0", "highlight.js": "^9.12.0",
"hotkeys-js": "^3.3.6", "hotkeys-js": "^3.3.6",
"js-base64": "^2.5.1", "js-base64": "^2.5.1",
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",
"lodash": "^4.17.10", "lodash": "^4.17.10",
"lowdb": "^1.0.0", "lowdb": "^1.0.0",
"marked": "^0.3.9", "marked": "^0.3.9",
"mockjs": "^1.0.1-beta3", "mockjs": "^1.0.1-beta3",
"nightwatch": "1.0.14", "nightwatch": "1.0.14",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"ol": "^6.3.1", "ol": "^6.3.1",
"papaparse": "^4.3.6", "papaparse": "^4.3.6",
"particles.js": "^2.0.0", "particles.js": "^2.0.0",
"pug": "^2.0.3", "pug": "^2.0.3",
"pug-plain-loader": "^1.0.0", "pug-plain-loader": "^1.0.0",
"quill": "^1.3.4", "quill": "^1.3.4",
"screenfull": "^3.3.2", "screenfull": "^3.3.2",
"simplemde": "^1.11.2", "simplemde": "^1.11.2",
"sortablejs": "^1.12.0", "sortablejs": "^1.12.0",
"ua-parser-js": "^0.7.18", "ua-parser-js": "^0.7.18",
"v-charts": "^1.17.6", "v-charts": "^1.17.6",
"v-contextmenu": "^2.7.0", "v-contextmenu": "^2.7.0",
"vue": "^2.5.17", "vue": "^2.5.17",
"vue-cropper": "^0.4.9", "vue-cropper": "^0.4.9",
"vue-directive-image-previewer": "^2.2.2", "vue-directive-image-previewer": "^2.2.2",
"vue-grid-layout": "^2.1.11", "vue-grid-layout": "^2.1.11",
"vue-i18n": "^7.4.2", "vue-i18n": "^7.4.2",
"vue-json-tree-view": "^2.1.4", "vue-json-tree-view": "^2.1.4",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"vue-runtime-helpers": "^1.1.2", "vue-runtime-helpers": "^1.1.2",
"vue-splitpane": "^1.0.2", "vue-splitpane": "^1.0.2",
"vuedraggable": "^2.23.2", "vuedraggable": "^2.23.2",
"vuex": "^3.0.1", "vuex": "^3.0.1",
"xlsx": "^0.12.0", "xlsx": "^0.12.0",
"xlsx-style": "^0.8.13" "xlsx-style": "^0.8.13"
}, },
"devDependencies": { "devDependencies": {
"@kazupon/vue-i18n-loader": "^0.3.0", "@kazupon/vue-i18n-loader": "^0.3.0",
"@vue/cli-plugin-babel": "^3.3.0", "@vue/cli-plugin-babel": "^3.3.0",
"@vue/cli-plugin-eslint": "^3.3.0", "@vue/cli-plugin-eslint": "^3.3.0",
"@vue/cli-plugin-unit-jest": "^3.3.0", "@vue/cli-plugin-unit-jest": "^3.3.0",
"@vue/cli-service": "^3.3.0", "@vue/cli-service": "^3.3.0",
"@vue/eslint-config-standard": "^3.0.0", "@vue/eslint-config-standard": "^3.0.0",
"@vue/test-utils": "^1.0.0-beta.20", "@vue/test-utils": "^1.0.0-beta.20",
"babel-core": "7.0.0-bridge.0", "babel-core": "7.0.0-bridge.0",
"babel-jest": "^23.0.1", "babel-jest": "^23.0.1",
"es6-promise": "^4.2.8", "es6-promise": "^4.2.8",
"lint-staged": "^7.2.0", "lint-staged": "^7.2.0",
"node-sass": "^4.9.0", "node-sass": "^4.9.0",
"sass-loader": "^7.0.1", "sass-loader": "^7.0.1",
"script-loader": "^0.7.2", "script-loader": "^0.7.2",
"svg-sprite-loader": "^3.8.0", "svg-sprite-loader": "^3.8.0",
"text-loader": "0.0.1", "text-loader": "0.0.1",
"vue-directive-image-previewer": "^2.2.2", "vue-directive-image-previewer": "^2.2.2",
"vue-template-compiler": "^2.5.17" "vue-template-compiler": "^2.5.17"
} }
} }
public/config.js
View file @ 6dc3fe88
...@@ -7,10 +7,10 @@ CONFIG.TITLE = '轨道交通后台管理系统' ...@@ -7,10 +7,10 @@ CONFIG.TITLE = '轨道交通后台管理系统'
CONFIG.requestPath = 'http://localhost:8046' CONFIG.requestPath = 'http://localhost:8046'
// CONFIG.requestPath = 'http://10.20.72.33:8046' // CONFIG.requestPath = 'http://59.110.43.122/:8046'
// 文件上传 // 文件上传
CONFIG.urlPath = 'http://10.20.72.33/' CONFIG.urlPath = 'http://59.110.43.122/'
// BIM // BIM
CONFIG.bimPath = 'http://10.20.2.98:8066/' CONFIG.bimPath = 'http://10.20.2.98:8066/'
src/pages/monitor/monitor/index1.vue deleted 100644 → 0
View file @ 0c2ecc1c
This diff is collapsed.
src/pages/monitor/monitor/index111.vue deleted 100644 → 0
View file @ 0c2ecc1c
This diff is collapsed.
src/pages/monitor/monitor/index222.vue deleted 100644 → 0
View file @ 0c2ecc1c
This diff is collapsed.
src/pages/ol/demo/index.vue
View file @ 6dc3fe88
...@@ -280,25 +280,6 @@ export default { ...@@ -280,25 +280,6 @@ export default {
this.resolutions.push(resolutionItem) this.resolutions.push(resolutionItem)
} }
} }
// 实例化鹰眼控件（OverviewMap），自定义其样式
// let overviewMapControl = new overviewmap({
// className: 'ol-overviewmap myOverview', //鹰眼控件样式
// // 在鹰眼中加载相同坐标系下不同数据源的图层
// layers: [
// new ImageLayer({
// source: new ImageStatic({
// url: this.imgurl, //这里添加静态图片的地址
// projection: projection,
// imageExtent: extent
// })
// })
// ],
// // layers:this.controlList,
// collapseLabel: '\u00BB', //鹰眼控件展开时功能按钮上的标识
// label: '\u00AB', //鹰眼控件折叠时功能按钮上的标识
// collapsed: false //初始为展开方式
// })
let zoomControl = new Zoom({ let zoomControl = new Zoom({
delta: 0.2, delta: 0.2,
zoomInTipLabel: '', zoomInTipLabel: '',
...@@ -316,10 +297,7 @@ export default { ...@@ -316,10 +297,7 @@ export default {
zoom: 2.5, zoom: 2.5,
maxZoom: 5.0, maxZoom: 5.0,
minZoom: 1.5, minZoom: 1.5,
// extent: [-1100, -200, 1500, 1000] //[minX, minY, maxX, maxY] 控制拖动
extent: [-1100, -100, 2000, 1000] //[minX, minY, maxX, maxY] 控制拖动 extent: [-1100, -100, 2000, 1000] //[minX, minY, maxX, maxY] 控制拖动
//   extent: extent//[minX, minY, maxX, maxY] 控制拖动
}) })
}) })
// 删除默认的双击事件 // 删除默认的双击事件
...@@ -334,20 +312,6 @@ export default { ...@@ -334,20 +312,6 @@ export default {
this.map.addControl(this.controlList[0]) this.map.addControl(this.controlList[0])
//点击事件 //点击事件
// ------------图标
// var startMarker = new OlFeature({
// type: 'icon',
// geometry: new OlGeomPoint([80, 320])
// })
// var startMarker1 = new OlFeature({
// type: 'icon',
// geometry: new OlGeomPoint([80, 320])
// })
// console.log(this.list, '----------')
// console.log(startMarker, startMarker1, '1111')
// console.log(that.list,'1111111')
this.changeVectorLayer(this.list) this.changeVectorLayer(this.list)
this.map.on('click', function(evt) { this.map.on('click', function(evt) {
...@@ -394,16 +358,6 @@ export default { ...@@ -394,16 +358,6 @@ export default {
} }
} }
}) })
// this.map.on('pointermove', function(e) {
// console.log(that.map.dragging)
// if(e.dragging) {
// return
// }
// let pixel = that.map.getEventPixel(e.originalEvent);
// let hit = that.map.hasFeatureAtPixel(pixel);
// that.map.getTarget().style.cursor = hit ? 'pointer' : '';
// })
}, },
mapClick(feature, item, flag) { mapClick(feature, item, flag) {
//默认样式 //默认样式
...@@ -492,13 +446,6 @@ export default { ...@@ -492,13 +446,6 @@ export default {
this.clearLayer() this.clearLayer()
} }
if (this.clearLayer()) return if (this.clearLayer()) return
// if (this.map) {
// this.map.removeLayer(this.vectorLayer)
// this.map.removeLayer(this.lineVectorLayer)
// } else {
// return
// }
this.lineVectorLayer = new OlLayerVector({ this.lineVectorLayer = new OlLayerVector({
source: new OlSourceVector({ source: new OlSourceVector({
features: [] features: []
...@@ -543,14 +490,6 @@ export default { ...@@ -543,14 +490,6 @@ export default {
let LinefeaturesArr = [] let LinefeaturesArr = []
for (let i in lineLastArr) { for (let i in lineLastArr) {
// let bean = JSON.parse(JSON.stringify(lineLastArr[i]))
// LinefeaturesArr.push(this.getFeature(bean.xpoint, bean.ypoint))
// let style = this.getPointStyle(bean.imageSrc + '.png', bean.name)
// LinefeaturesArr[i].setStyle(style)
// bean.id = getUUID()
// bean.key = lineLastArr[i].id
// LinefeaturesArr[i].setId(bean.key + 'end')
// this.list.push(bean)
LinefeaturesArr.push( LinefeaturesArr.push(
this.getFeature(lineLastArr[i].xpoint, lineLastArr[i].ypoint) this.getFeature(lineLastArr[i].xpoint, lineLastArr[i].ypoint)
) )
...@@ -732,60 +671,18 @@ export default { ...@@ -732,60 +671,18 @@ export default {
pointListClick(item) { pointListClick(item) {
//监视器列表点击 //监视器列表点击
//关闭其他窗口 //关闭其他窗口
// this.closeNoQueryDetailVisible()
if (this.transformationSta === 1) { if (this.transformationSta === 1) {
if ( if (
item.type === 'b6af764f2a6e454490a6b1b3c9057e57' || item.type === 'b6af764f2a6e454490a6b1b3c9057e57' ||
item.type === 'ece0b8b2db27411886254e81134988a3' item.type === 'ece0b8b2db27411886254e81134988a3'
) { ) {
// console.log('1')
this.queryDetail(item.id) this.queryDetail(item.id)
} else { } else {
// console.log('2')
this.noQueryDetail(item.id) this.noQueryDetail(item.id)
} }
// console.log('subCode', item.subCode, typeof (item.subCode))
// switch (item.subCode) {
// case '01' :
// //视频监控
// this.queryDetail01Visible = true
// this.$nextTick(() => {
// this.$refs.queryDetail01.init(item.id, this.checkedData.sId)
// })
// break
// case '02' :
// //出入口控制
// this.queryDetail02Visible = true
// this.$nextTick(() => {
// this.$refs.queryDetail02.init(item.id, this.checkedData.sId)
// })
// break
// case '03' :
// //入侵报警
// this.queryDetail03Visible = true
// this.$nextTick(() => {
// this.$refs.queryDetail03.init(item.id, this.checkedData.sId)
// })
// break
// case '04' :
// //安全检查
// this.queryDetail04Visible = true
// this.$nextTick(() => {
// this.$refs.queryDetail04.init(item.id, this.checkedData.sId)
// })
// break
// case '05' :
// //电子巡更
// this.queryDetail05Visible = true
// this.$nextTick(() => {
// this.$refs.queryDetail05.init(item.id, this.checkedData.sId)
// })
// break
// }
} }
this.activeChooseResourceBox(item.id) this.activeChooseResourceBox(item.id)
this.defaultExpandedKeys = [item.id] this.defaultExpandedKeys = [item.id]
// this.$refs.tree.setCurrentKey(item.id)
}, },
//初始化站点下的资源点 //初始化站点下的资源点
initTreeStationMap(save) { initTreeStationMap(save) {
...@@ -793,8 +690,8 @@ export default { ...@@ -793,8 +690,8 @@ export default {
let url = '' let url = ''
if (!save) { if (!save) {
// 摄像头列表接口路径 // 摄像头列表接口路径
// url = this.$http.adornUrl('/liResource/getTreeList') url = this.$http.adornUrl('/liResource/getTreeList')
url = this.$http.adornUrlEq('/liResource/getStationMapCodeTreeList') // url = this.$http.adornUrlEq('/liResource/getStationMapCodeTreeList')
} else { } else {
// 收藏夹接口路径 // 收藏夹接口路径
url = this.$http.adornUrlEq('/liEnshrine/getEnshrineStationMapTreeList') url = this.$http.adornUrlEq('/liEnshrine/getEnshrineStationMapTreeList')
...@@ -803,14 +700,13 @@ export default { ...@@ -803,14 +700,13 @@ export default {
url: url, url: url,
method: 'post', method: 'post',
data: { data: {
stationId: this.checkedData.sId, // stationId: this.checkedData.sId,
name: this.searchInput name: this.searchInput
} }
}) })
.then((data) => { .then((data) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.treeData = data.nodes this.treeData = data.nodes
// this.$refs.tree.updateKeyChildren(this.checkedData.sId, data.nodes)
if (this.treeData && this.treeData.length > 0) { if (this.treeData && this.treeData.length > 0) {
Vue.set(this.treeData[0], 'iconB', true) Vue.set(this.treeData[0], 'iconB', true)
} }
...@@ -824,10 +720,6 @@ export default { ...@@ -824,10 +720,6 @@ export default {
this.treeData.length > 0 this.treeData.length > 0
) { ) {
this.defaultExpandedKeys = [data.nodes[0].id] this.defaultExpandedKeys = [data.nodes[0].id]
//设置选中的节点
// console.log('默认选中节点', this.treeData[0].children[0])
// this.$refs.tree.setCurrentNode(this.treeData[0])
// console.log('this', this)
} }
this.initStation(this.checkedData.sId) this.initStation(this.checkedData.sId)
}) })
...@@ -895,7 +787,6 @@ export default { ...@@ -895,7 +787,6 @@ export default {
this.changeVectorLayer(this.list) this.changeVectorLayer(this.list)
}, },
initStation(id) { initStation(id) {
console.log('22222222222222')
this.$http({ this.$http({
url: this.$http.adornUrl(`/liStation/getId/${id}`), url: this.$http.adornUrl(`/liStation/getId/${id}`),
method: 'get', method: 'get',
...@@ -1011,27 +902,6 @@ export default { ...@@ -1011,27 +902,6 @@ export default {
}) })
boxFeature.setId(obj.id + 'box') boxFeature.setId(obj.id + 'box')
this.boxVectorLayer.getSource().addFeature(boxFeature) this.boxVectorLayer.getSource().addFeature(boxFeature)
if (this.boxBean) {
let itemList = this.boxBean.children
if (itemList) {
for (let i in itemList) {
// this.setStyle(this.list[parseInt(i)])
}
}
//修改在防区内资源点样式
// if (this.boxBean.resourceIds) {
// let resourceList = this.boxBean.resourceIds.split(',')
// this.addList = resourceList
// for (let i in resourceList) {
// for (let j in this.list) {
// if (resourceList[i] === this.list[j].id) {
// this.setStyle(this.list[j])
// }
// }
// }
// }
}
}, },
//线路资源点树节点点击事件 //线路资源点树节点点击事件
handleNodeClick(node) { handleNodeClick(node) {
...@@ -1049,9 +919,6 @@ export default { ...@@ -1049,9 +919,6 @@ export default {
status: false status: false
} }
} }
// if (this.activeName == 1) {
// this.isFlag(this.treeData, id)
// }
//每次选择节点都先清空资源位 //每次选择节点都先清空资源位
console.log('选中节点的层级', node) console.log('选中节点的层级', node)
......
src/pages/sys/point/index.vue
View file @ 6dc3fe88
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment