From 636e651b6d537f6533b731947c7f7447a8ce12db Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 29 Jan 2021 14:47:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/public/map/views/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js b/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
similarity index 98%
rename from public/map/views/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
rename to public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
index 77944e2..91879e5 100644
--- a/public/map/views/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
+++ b/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
@@ -227,7 +227,7 @@
// 警情列表中的点击事件
$('.analysis-container-police .analysis-table-content .tbody').off('click', 'tr').on('click', 'tr', function () {
var id = $(this).attr('term-list');
- var url = '../../popup/html/police-details.html?obj=' + id;
+ var url = './popup/html/police-details.html?obj=' + id;
layui.use('layer', function () {
that.layuiLayer = layui.layer;
that.layuiLayer.config({
@@ -262,7 +262,7 @@
// 业主列表中的点击事件
$('.analysis-container-owner .analysis-table-content .tbody').off('click', 'tr').on('click', 'tr', function () {
var id = $(this).attr('term-list');
- var url = '../../popup/html/owner-details.html?id=' + id;
+ var url = './popup/html/owner-details.html?id=' + id;
layui.use('layer', function () {
that.layuiLayer = layui.layer;
that.layuiLayer.config({
@@ -297,7 +297,7 @@
// 设备列表中的点击事件
$('.analysis-container-equipment .analysis-table-content .tbody').off('click', 'tr').on('click', 'tr', function () {
var id = $(this).attr('term-listid');
- var url = '../../popup/html/equipment-details.html?obj=' + id;
+ var url = './popup/html/equipment-details.html?obj=' + id;
layui.use('layer', function () {
that.layuiLayer = layui.layer;
that.layuiLayer.config({
@@ -520,7 +520,7 @@
*/
policeDetails: function (id) {
var that = this;
- var url = '../../popup/html/police-details.html?obj=' + id;
+ var url = './popup/html/police-details.html?obj=' + id;
layui.use('layer', function () {
that.layuiLayer = layui.layer;
that.layuiLayer.config({
@@ -548,7 +548,7 @@
*/
ownerDetails: function (id) {
var that = this;
- var url = '../../popup/html/owner-details.html?id=' + id;
+ var url = './popup/html/owner-details.html?id=' + id;
layui.use('layer', function () {
that.layuiLayer = layui.layer;
that.layuiLayer.config({
@@ -576,7 +576,7 @@
*/
equipmentDetails: function (id) {
var that = this;
- var url = '../../popup/html/equipment-details.html?obj=' + id;
+ var url = './popup/html/equipment-details.html?obj=' + id;
layui.use('layer', function () {
that.layuiLayer = layui.layer;
that.layuiLayer.config({
--
Gitblit v1.9.3