Compare commits

..

No commits in common. "5f08e152b80bc89fd46c0b55d13b94595123b768" and "80ed550e51a2c35a69d0a7daf6d4e67bf3eea6b2" have entirely different histories.

23 changed files with 34 additions and 35 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"remainingRequest":"F:\\lixiaobang\\suyi\\suyiScreen\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!F:\\lixiaobang\\suyi\\suyiScreen\\src\\views\\land\\index.vue","dependencies":[{"path":"F:\\lixiaobang\\suyi\\suyiScreen\\src\\views\\land\\index.vue","mtime":1672797732786},{"path":"F:\\lixiaobang\\suyi\\suyiScreen\\node_modules\\cache-loader\\dist\\cjs.js","mtime":1670891604112},{"path":"F:\\lixiaobang\\suyi\\suyiScreen\\node_modules\\vue-loader\\lib\\index.js","mtime":1670891614530}],"contextDependencies":[],"result":[{"type":"Buffer","data":"base64:aW1wb3J0IHsgcmVuZGVyLCBzdGF0aWNSZW5kZXJGbnMgfSBmcm9tICIuL2luZGV4LnZ1ZT92dWUmdHlwZT10ZW1wbGF0ZSZpZD00ODZlMDI0OCZzY29wZWQ9dHJ1ZSYiCmltcG9ydCBzY3JpcHQgZnJvbSAiLi9pbmRleC52dWU/dnVlJnR5cGU9c2NyaXB0Jmxhbmc9anMmIgpleHBvcnQgKiBmcm9tICIuL2luZGV4LnZ1ZT92dWUmdHlwZT1zY3JpcHQmbGFuZz1qcyYiCmltcG9ydCBzdHlsZTAgZnJvbSAiLi9pbmRleC52dWU/dnVlJnR5cGU9c3R5bGUmaW5kZXg9MCZsYW5nPXNjc3MmIgppbXBvcnQgc3R5bGUxIGZyb20gIi4vaW5kZXgudnVlP3Z1ZSZ0eXBlPXN0eWxlJmluZGV4PTEmaWQ9NDg2ZTAyNDgmbGFuZz1zY3NzJnNjb3BlZD10cnVlJiIKCgovKiBub3JtYWxpemUgY29tcG9uZW50ICovCmltcG9ydCBub3JtYWxpemVyIGZyb20gIiEuLi8uLi8uLi9ub2RlX21vZHVsZXMvdnVlLWxvYWRlci9saWIvcnVudGltZS9jb21wb25lbnROb3JtYWxpemVyLmpzIgp2YXIgY29tcG9uZW50ID0gbm9ybWFsaXplcigKICBzY3JpcHQsCiAgcmVuZGVyLAogIHN0YXRpY1JlbmRlckZucywKICBmYWxzZSwKICBudWxsLAogICI0ODZlMDI0OCIsCiAgbnVsbAogIAopCgovKiBob3QgcmVsb2FkICovCmlmIChtb2R1bGUuaG90KSB7CiAgdmFyIGFwaSA9IHJlcXVpcmUoIkY6XFxsaXhpYW9iYW5nXFxzdXlpXFxzdXlpU2NyZWVuXFxub2RlX21vZHVsZXNcXHZ1ZS1ob3QtcmVsb2FkLWFwaVxcZGlzdFxcaW5kZXguanMiKQogIGFwaS5pbnN0YWxsKHJlcXVpcmUoJ3Z1ZScpKQogIGlmIChhcGkuY29tcGF0aWJsZSkgewogICAgbW9kdWxlLmhvdC5hY2NlcHQoKQogICAgaWYgKCFhcGkuaXNSZWNvcmRlZCgnNDg2ZTAyNDgnKSkgewogICAgICBhcGkuY3JlYXRlUmVjb3JkKCc0ODZlMDI0OCcsIGNvbXBvbmVudC5vcHRpb25zKQogICAgfSBlbHNlIHsKICAgICAgYXBpLnJlbG9hZCgnNDg2ZTAyNDgnLCBjb21wb25lbnQub3B0aW9ucykKICAgIH0KICAgIG1vZHVsZS5ob3QuYWNjZXB0KCIuL2luZGV4LnZ1ZT92dWUmdHlwZT10ZW1wbGF0ZSZpZD00ODZlMDI0OCZzY29wZWQ9dHJ1ZSYiLCBmdW5jdGlvbiAoKSB7CiAgICAgIGFwaS5yZXJlbmRlcignNDg2ZTAyNDgnLCB7CiAgICAgICAgcmVuZGVyOiByZW5kZXIsCiAgICAgICAgc3RhdGljUmVuZGVyRm5zOiBzdGF0aWNSZW5kZXJGbnMKICAgICAgfSkKICAgIH0pCiAgfQp9CmNvbXBvbmVudC5vcHRpb25zLl9fZmlsZSA9ICJzcmMvdmlld3MvbGFuZC9pbmRleC52dWUiCmV4cG9ydCBkZWZhdWx0IGNvbXBvbmVudC5leHBvcnRz"}]}
{"remainingRequest":"F:\\lixiaobang\\suyi\\suyiScreen\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!F:\\lixiaobang\\suyi\\suyiScreen\\src\\views\\land\\index.vue","dependencies":[{"path":"F:\\lixiaobang\\suyi\\suyiScreen\\src\\views\\land\\index.vue","mtime":1670891618110},{"path":"F:\\lixiaobang\\suyi\\suyiScreen\\node_modules\\cache-loader\\dist\\cjs.js","mtime":1670891604112},{"path":"F:\\lixiaobang\\suyi\\suyiScreen\\node_modules\\vue-loader\\lib\\index.js","mtime":1670891614530}],"contextDependencies":[],"result":[{"type":"Buffer","data":"base64:aW1wb3J0IHsgcmVuZGVyLCBzdGF0aWNSZW5kZXJGbnMgfSBmcm9tICIuL2luZGV4LnZ1ZT92dWUmdHlwZT10ZW1wbGF0ZSZpZD00ODZlMDI0OCZzY29wZWQ9dHJ1ZSYiCmltcG9ydCBzY3JpcHQgZnJvbSAiLi9pbmRleC52dWU/dnVlJnR5cGU9c2NyaXB0Jmxhbmc9anMmIgpleHBvcnQgKiBmcm9tICIuL2luZGV4LnZ1ZT92dWUmdHlwZT1zY3JpcHQmbGFuZz1qcyYiCmltcG9ydCBzdHlsZTAgZnJvbSAiLi9pbmRleC52dWU/dnVlJnR5cGU9c3R5bGUmaW5kZXg9MCZsYW5nPXNjc3MmIgppbXBvcnQgc3R5bGUxIGZyb20gIi4vaW5kZXgudnVlP3Z1ZSZ0eXBlPXN0eWxlJmluZGV4PTEmaWQ9NDg2ZTAyNDgmbGFuZz1zY3NzJnNjb3BlZD10cnVlJiIKCgovKiBub3JtYWxpemUgY29tcG9uZW50ICovCmltcG9ydCBub3JtYWxpemVyIGZyb20gIiEuLi8uLi8uLi9ub2RlX21vZHVsZXMvdnVlLWxvYWRlci9saWIvcnVudGltZS9jb21wb25lbnROb3JtYWxpemVyLmpzIgp2YXIgY29tcG9uZW50ID0gbm9ybWFsaXplcigKICBzY3JpcHQsCiAgcmVuZGVyLAogIHN0YXRpY1JlbmRlckZucywKICBmYWxzZSwKICBudWxsLAogICI0ODZlMDI0OCIsCiAgbnVsbAogIAopCgovKiBob3QgcmVsb2FkICovCmlmIChtb2R1bGUuaG90KSB7CiAgdmFyIGFwaSA9IHJlcXVpcmUoIkY6XFxsaXhpYW9iYW5nXFxzdXlpXFxzdXlpU2NyZWVuXFxub2RlX21vZHVsZXNcXHZ1ZS1ob3QtcmVsb2FkLWFwaVxcZGlzdFxcaW5kZXguanMiKQogIGFwaS5pbnN0YWxsKHJlcXVpcmUoJ3Z1ZScpKQogIGlmIChhcGkuY29tcGF0aWJsZSkgewogICAgbW9kdWxlLmhvdC5hY2NlcHQoKQogICAgaWYgKCFhcGkuaXNSZWNvcmRlZCgnNDg2ZTAyNDgnKSkgewogICAgICBhcGkuY3JlYXRlUmVjb3JkKCc0ODZlMDI0OCcsIGNvbXBvbmVudC5vcHRpb25zKQogICAgfSBlbHNlIHsKICAgICAgYXBpLnJlbG9hZCgnNDg2ZTAyNDgnLCBjb21wb25lbnQub3B0aW9ucykKICAgIH0KICAgIG1vZHVsZS5ob3QuYWNjZXB0KCIuL2luZGV4LnZ1ZT92dWUmdHlwZT10ZW1wbGF0ZSZpZD00ODZlMDI0OCZzY29wZWQ9dHJ1ZSYiLCBmdW5jdGlvbiAoKSB7CiAgICAgIGFwaS5yZXJlbmRlcignNDg2ZTAyNDgnLCB7CiAgICAgICAgcmVuZGVyOiByZW5kZXIsCiAgICAgICAgc3RhdGljUmVuZGVyRm5zOiBzdGF0aWNSZW5kZXJGbnMKICAgICAgfSkKICAgIH0pCiAgfQp9CmNvbXBvbmVudC5vcHRpb25zLl9fZmlsZSA9ICJzcmMvdmlld3MvbGFuZC9pbmRleC52dWUiCmV4cG9ydCBkZWZhdWx0IGNvbXBvbmVudC5leHBvcnRz"}]}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"remainingRequest":"F:\\lixiaobang\\suyi\\suyiScreen\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!F:\\lixiaobang\\suyi\\suyiScreen\\src\\views\\land\\child\\index.vue","dependencies":[{"path":"F:\\lixiaobang\\suyi\\suyiScreen\\src\\views\\land\\child\\index.vue","mtime":1672800870725},{"path":"F:\\lixiaobang\\suyi\\suyiScreen\\node_modules\\cache-loader\\dist\\cjs.js","mtime":1670891604112},{"path":"F:\\lixiaobang\\suyi\\suyiScreen\\node_modules\\vue-loader\\lib\\index.js","mtime":1670891614530}],"contextDependencies":[],"result":[{"type":"Buffer","data":"base64:aW1wb3J0IHsgcmVuZGVyLCBzdGF0aWNSZW5kZXJGbnMgfSBmcm9tICIuL2luZGV4LnZ1ZT92dWUmdHlwZT10ZW1wbGF0ZSZpZD01NTI3MmE5NSZzY29wZWQ9dHJ1ZSYiCmltcG9ydCBzY3JpcHQgZnJvbSAiLi9pbmRleC52dWU/dnVlJnR5cGU9c2NyaXB0Jmxhbmc9anMmIgpleHBvcnQgKiBmcm9tICIuL2luZGV4LnZ1ZT92dWUmdHlwZT1zY3JpcHQmbGFuZz1qcyYiCmltcG9ydCBzdHlsZTAgZnJvbSAiLi9pbmRleC52dWU/dnVlJnR5cGU9c3R5bGUmaW5kZXg9MCZpZD01NTI3MmE5NSZsYW5nPXNjc3Mmc2NvcGVkPXRydWUmIgoKCi8qIG5vcm1hbGl6ZSBjb21wb25lbnQgKi8KaW1wb3J0IG5vcm1hbGl6ZXIgZnJvbSAiIS4uLy4uLy4uLy4uL25vZGVfbW9kdWxlcy92dWUtbG9hZGVyL2xpYi9ydW50aW1lL2NvbXBvbmVudE5vcm1hbGl6ZXIuanMiCnZhciBjb21wb25lbnQgPSBub3JtYWxpemVyKAogIHNjcmlwdCwKICByZW5kZXIsCiAgc3RhdGljUmVuZGVyRm5zLAogIGZhbHNlLAogIG51bGwsCiAgIjU1MjcyYTk1IiwKICBudWxsCiAgCikKCi8qIGhvdCByZWxvYWQgKi8KaWYgKG1vZHVsZS5ob3QpIHsKICB2YXIgYXBpID0gcmVxdWlyZSgiRjpcXGxpeGlhb2JhbmdcXHN1eWlcXHN1eWlTY3JlZW5cXG5vZGVfbW9kdWxlc1xcdnVlLWhvdC1yZWxvYWQtYXBpXFxkaXN0XFxpbmRleC5qcyIpCiAgYXBpLmluc3RhbGwocmVxdWlyZSgndnVlJykpCiAgaWYgKGFwaS5jb21wYXRpYmxlKSB7CiAgICBtb2R1bGUuaG90LmFjY2VwdCgpCiAgICBpZiAoIWFwaS5pc1JlY29yZGVkKCc1NTI3MmE5NScpKSB7CiAgICAgIGFwaS5jcmVhdGVSZWNvcmQoJzU1MjcyYTk1JywgY29tcG9uZW50Lm9wdGlvbnMpCiAgICB9IGVsc2UgewogICAgICBhcGkucmVsb2FkKCc1NTI3MmE5NScsIGNvbXBvbmVudC5vcHRpb25zKQogICAgfQogICAgbW9kdWxlLmhvdC5hY2NlcHQoIi4vaW5kZXgudnVlP3Z1ZSZ0eXBlPXRlbXBsYXRlJmlkPTU1MjcyYTk1JnNjb3BlZD10cnVlJiIsIGZ1bmN0aW9uICgpIHsKICAgICAgYXBpLnJlcmVuZGVyKCc1NTI3MmE5NScsIHsKICAgICAgICByZW5kZXI6IHJlbmRlciwKICAgICAgICBzdGF0aWNSZW5kZXJGbnM6IHN0YXRpY1JlbmRlckZucwogICAgICB9KQogICAgfSkKICB9Cn0KY29tcG9uZW50Lm9wdGlvbnMuX19maWxlID0gInNyYy92aWV3cy9sYW5kL2NoaWxkL2luZGV4LnZ1ZSIKZXhwb3J0IGRlZmF1bHQgY29tcG9uZW50LmV4cG9ydHM="}]}
{"remainingRequest":"F:\\lixiaobang\\suyi\\suyiScreen\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!F:\\lixiaobang\\suyi\\suyiScreen\\src\\views\\land\\child\\index.vue","dependencies":[{"path":"F:\\lixiaobang\\suyi\\suyiScreen\\src\\views\\land\\child\\index.vue","mtime":1672727475863},{"path":"F:\\lixiaobang\\suyi\\suyiScreen\\node_modules\\cache-loader\\dist\\cjs.js","mtime":1670891604112},{"path":"F:\\lixiaobang\\suyi\\suyiScreen\\node_modules\\vue-loader\\lib\\index.js","mtime":1670891614530}],"contextDependencies":[],"result":[{"type":"Buffer","data":"base64:aW1wb3J0IHsgcmVuZGVyLCBzdGF0aWNSZW5kZXJGbnMgfSBmcm9tICIuL2luZGV4LnZ1ZT92dWUmdHlwZT10ZW1wbGF0ZSZpZD01NTI3MmE5NSZzY29wZWQ9dHJ1ZSYiCmltcG9ydCBzY3JpcHQgZnJvbSAiLi9pbmRleC52dWU/dnVlJnR5cGU9c2NyaXB0Jmxhbmc9anMmIgpleHBvcnQgKiBmcm9tICIuL2luZGV4LnZ1ZT92dWUmdHlwZT1zY3JpcHQmbGFuZz1qcyYiCmltcG9ydCBzdHlsZTAgZnJvbSAiLi9pbmRleC52dWU/dnVlJnR5cGU9c3R5bGUmaW5kZXg9MCZpZD01NTI3MmE5NSZsYW5nPXNjc3Mmc2NvcGVkPXRydWUmIgoKCi8qIG5vcm1hbGl6ZSBjb21wb25lbnQgKi8KaW1wb3J0IG5vcm1hbGl6ZXIgZnJvbSAiIS4uLy4uLy4uLy4uL25vZGVfbW9kdWxlcy92dWUtbG9hZGVyL2xpYi9ydW50aW1lL2NvbXBvbmVudE5vcm1hbGl6ZXIuanMiCnZhciBjb21wb25lbnQgPSBub3JtYWxpemVyKAogIHNjcmlwdCwKICByZW5kZXIsCiAgc3RhdGljUmVuZGVyRm5zLAogIGZhbHNlLAogIG51bGwsCiAgIjU1MjcyYTk1IiwKICBudWxsCiAgCikKCi8qIGhvdCByZWxvYWQgKi8KaWYgKG1vZHVsZS5ob3QpIHsKICB2YXIgYXBpID0gcmVxdWlyZSgiRjpcXGxpeGlhb2JhbmdcXHN1eWlcXHN1eWlTY3JlZW5cXG5vZGVfbW9kdWxlc1xcdnVlLWhvdC1yZWxvYWQtYXBpXFxkaXN0XFxpbmRleC5qcyIpCiAgYXBpLmluc3RhbGwocmVxdWlyZSgndnVlJykpCiAgaWYgKGFwaS5jb21wYXRpYmxlKSB7CiAgICBtb2R1bGUuaG90LmFjY2VwdCgpCiAgICBpZiAoIWFwaS5pc1JlY29yZGVkKCc1NTI3MmE5NScpKSB7CiAgICAgIGFwaS5jcmVhdGVSZWNvcmQoJzU1MjcyYTk1JywgY29tcG9uZW50Lm9wdGlvbnMpCiAgICB9IGVsc2UgewogICAgICBhcGkucmVsb2FkKCc1NTI3MmE5NScsIGNvbXBvbmVudC5vcHRpb25zKQogICAgfQogICAgbW9kdWxlLmhvdC5hY2NlcHQoIi4vaW5kZXgudnVlP3Z1ZSZ0eXBlPXRlbXBsYXRlJmlkPTU1MjcyYTk1JnNjb3BlZD10cnVlJiIsIGZ1bmN0aW9uICgpIHsKICAgICAgYXBpLnJlcmVuZGVyKCc1NTI3MmE5NScsIHsKICAgICAgICByZW5kZXI6IHJlbmRlciwKICAgICAgICBzdGF0aWNSZW5kZXJGbnM6IHN0YXRpY1JlbmRlckZucwogICAgICB9KQogICAgfSkKICB9Cn0KY29tcG9uZW50Lm9wdGlvbnMuX19maWxlID0gInNyYy92aWV3cy9sYW5kL2NoaWxkL2luZGV4LnZ1ZSIKZXhwb3J0IGRlZmF1bHQgY29tcG9uZW50LmV4cG9ydHM="}]}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -58,7 +58,7 @@ export default {
props: {
htStatus: {
type: Number,
// default: () => ({}),
default: () => ({}),
},
searchShow: {
type: Boolean,

View File

@ -229,13 +229,13 @@
class="jiangshuixian"
@click="popShow1('jiangshuixian')"
>
<div style="position: absolute;top: 55px;z-index:100"><img src="../../../assets/mapInfo/textjiangshui.png"/></div>
<div style="color:#ffffff;position: absolute;top: 55px;">10kV江水线&nbsp;&nbsp;#4环网柜</div>
</div>
<div
class="xinguan"
@click="popShow1()"
>
<div style="position: absolute;top: 109px;left: 53px;z-index:100"><img src="../../../assets/mapInfo/textxinguan.png"/></div>
<div style="color:#ffffff;position: absolute;top: 109px;left: 62px;">新馆</div>
</div>
<div
class="ups1"
@ -249,13 +249,13 @@
class="jiuguan"
@click="popShow1()"
>
<div style="position: absolute;top: 111px;left: 70px;z-index:100"><img src="../../../assets/mapInfo/textjiuguan.png"/></div>
<div style="color:#ffffff;position: absolute;top: 111px;left: 70px;">旧馆</div>
</div>
<div
class="jiangshuixian1"
@click="popShow1('jiangshuixian1')"
>
<div style="color:#ffffff;position: absolute;top: 55px;z-index:100"><img src="../../../assets/mapInfo/textchunxiao.png"/></div>
<div style="color:#ffffff;position: absolute;top: 55px;">10kV春晓线#1环网柜</div>
</div>
<div
class="dianyuanche"
@ -288,12 +288,12 @@
<div
class="xian"
>
<div style="position: absolute;top: 168px;left:-29px;z-index:100"><img src="../../../assets/mapInfo/peidianjian.png"/></div>
<div style="position: absolute;top: 194px;left:253px;z-index:100"><img src="../../../assets/mapInfo/peidianjian.png"/></div>
<div style="position: absolute;top: 182px;left:423px;z-index:100"><img src="../../../assets/mapInfo/peidianjian.png"/></div>
<div style="position: absolute;top: 220px;left:536px;z-index:100"><img src="../../../assets/mapInfo/peidianjian.png"/></div>
<div style="position: absolute;top: 152px;left:666px;z-index:100"><img src="../../../assets/mapInfo/peidianjian.png"/></div>
<div style="position: absolute;top: 278px;left:668px;z-index:100"><img src="../../../assets/mapInfo/peidianjian.png"/></div>
<div style="color:#ffffff;position: absolute;top: 168px;left:-29px">一楼配电间</div>
<div style="color:#ffffff;position: absolute;top: 194px;left:253px">一楼配电间</div>
<div style="color:#ffffff;position: absolute;top: 182px;left:423px">一楼配电间</div>
<div style="color:#ffffff;position: absolute;top: 220px;left:536px">一楼配电间</div>
<div style="color:#ffffff;position: absolute;top: 152px;left:678px">一楼配电间</div>
<div style="color:#ffffff;position: absolute;top: 278px;left:668px">一楼配电间</div>
</div>
<div
class="shexiangtou"
@ -1272,8 +1272,7 @@
</div>
<div
class="btn"
:style="{ 'justify-content': htStatus == 1 ? 'space-around' : 'center' }"
style="align-items: center"
:style="{ 'justify-content': htStatus == 1 ? 'space-between' : 'center' }"
>
<img
src="@/assets/htBtn/inside.png"
@ -2953,7 +2952,7 @@ export default {
}
}
.mapBg{
background: url("../../../assets/mapInfo/bg1.png") no-repeat;
background: url("../../../assets/mapInfo/bg.png") no-repeat;
background-size: 100% 100%;
.jiangshuixian{
background: url("../../../assets/mapInfo/jiangshuixian.png") no-repeat;
@ -3100,7 +3099,7 @@ export default {
width: 115px;
height: 110px;
position: absolute;
top: 687px;
top: 676px;
left: 955px;
cursor: pointer;
z-index: 100;
@ -3217,17 +3216,15 @@ export default {
}
.btn {
position: fixed;
width: 304px;
height: 55px;
bottom: 30px;
width: 160px;
height: 54px;
bottom: 10px;
left: 0;
right: 0;
margin: auto;
display: flex;
flex-flow: row nowrap;
z-index: 100;
background: url("../../../assets/mapInfo/beijing.png") no-repeat;
background-size: 100% 100%;
img {
width: 40px;
height: 40px;
@ -3958,9 +3955,11 @@ export default {
.baodian{
width: 54px !important;
height: 32px !important;
position: fixed;
z-index: 999;
cursor: pointer;
bottom: 25px;
left: 1060px;
img {
width: 100%;
height: 100%;

View File

@ -374,7 +374,7 @@ export default {
}
}
})
},3000)
},1000)
},
// sockets:{