20190308

src/main/vue/src/pages/AreaShowPoint.vue

@@ -45,10 +45,10 @@
         </template>
         <template v-else>
           <el-form-item>
-            <el-button type="text" @closeMap="mapDialogVisible = !mapDialogVisible" @click="mapDialogVisible = !mapDialogVisible">点击打开地图选择地址</el-button>
+            <el-button type="text" @click="mapDialogVisible = !mapDialogVisible">点击打开地图选择地址</el-button>
 
             <div class="amap-page-container" v-if="mapDialogVisible">
-              <coordinate-select :value="[formData.longitude||118.79647,formData.latitude||32.05838]" @selected="coordinateSelected" v-if="mapDialogVisible"></coordinate-select>
+              <coordinate-select @closeMap="mapDialogVisible = !mapDialogVisible"   :value="[formData.longitude||118.79647,formData.latitude||32.05838]" @selected="coordinateSelected" v-if="mapDialogVisible"></coordinate-select>
             </div>
           </el-form-item>
 

src/main/vue/src/pages/LandMark.vue

@@ -31,28 +31,44 @@
             <el-form-item prop="markDescribe" :label="isScenicSpot?'景点简介':'地标简介'">
               <el-input type="textarea" v-model="formData.markDescribe" :disabled="'markDescribe'==subColumn"></el-input>
             </el-form-item>
+
             <el-form-item prop="logeSprite" label="地点Loge图">
               <single-upload v-model="formData.logeSprite" :disabled="'logeSprite'==subColumn"></single-upload>
             </el-form-item>
-            <el-form-item prop="logeSprite" label="地点Loge图URL">
-              <el-input v-model="formData.logeSprite" :disabled="'logeSprite'==subColumn"></el-input>
+
+            <el-form-item prop="openDescribe" :label="isScenicSpot?'开放时间':'营业/开放情况'">
+              <el-input v-model="formData.openDescribe" :disabled="'openDescribe'==subColumn"></el-input>
+            </el-form-item>
+
+            <el-form-item prop="keyword" label="关键词">
+              <template>
+                <div v-for="(item,index) in formData.keyword" style="margin-bottom:10px">
+                  <el-input v-model="formData.keyword[index]" style="width:180px"></el-input>
+                  <el-button @click="onDeleteKeyword(index)" type="danger">删除</el-button>
+                </div>
+                <el-button @click="addKeyword" type="primary">添加</el-button>
+              </template>
+            </el-form-item>
+
+            <el-form-item>
+              <el-button type="text" @click="mapDialogVisible = !mapDialogVisible">点击打开地图选择地址</el-button>
+
+              <div class="amap-page-container" v-if="mapDialogVisible">
+                <coordinate-select @closeMap="mapDialogVisible = !mapDialogVisible" :value="[formData.longitude||118.79647,formData.latitude||32.05838]" @selected="coordinateSelected" v-if="mapDialogVisible"></coordinate-select>
+              </div>
             </el-form-item>
 
             <el-form-item prop="adImage" label="闪屏">
               <single-upload v-model="formData.adImage" :disabled="'adImage'==subColumn"></single-upload>
             </el-form-item>
-            <el-form-item prop="adImage" label="闪屏URL">
-              <el-input v-model="formData.adImage" :disabled="'adImage'==subColumn"></el-input>
-            </el-form-item>
+
             <el-form-item prop="showInPanel" label="是否显示">
               <el-input v-model="formData.showInPanel" :disabled="'showInPanel'==subColumn"></el-input>
             </el-form-item>
             <el-form-item prop="mapSprite" label="平面图">
               <single-upload v-model="formData.mapSprite" :disabled="'mapSprite'==subColumn"></single-upload>
             </el-form-item>
-            <el-form-item prop="mapSprite" label="平面图URL">
-              <el-input v-model="formData.mapSprite" :disabled="'mapSprite'==subColumn"></el-input>
-            </el-form-item>
+
             <el-form-item prop="anchorImageGroupName" label="识别图组名称">
               <el-input v-model="formData.anchorImageGroupName" :disabled="'anchorImageGroupName'==subColumn"></el-input>
             </el-form-item>
@@ -83,10 +99,25 @@
                 </el-form-item>
               </template>
 
-              <el-form-item prop="openDescribe" :label="isScenicSpot?'开发时间':'营业/开放情况'">
-                <el-input v-model="formData.openDescribe" :disabled="'openDescribe'==subColumn"></el-input>
+              <el-form-item prop="logeSprite" label="地点Loge图URL">
+                <el-input v-model="formData.logeSprite" :disabled="'logeSprite'==subColumn"></el-input>
+              </el-form-item>
+
+              <el-form-item prop="adImage" label="闪屏URL">
+                <el-input v-model="formData.adImage" :disabled="'adImage'==subColumn"></el-input>
+              </el-form-item>
+
+              <el-form-item prop="mapSprite" label="平面图URL">
+                <el-input v-model="formData.mapSprite" :disabled="'mapSprite'==subColumn"></el-input>
+              </el-form-item>
+
+              <el-form-item prop="longitude" label="经度">
+                <el-input v-model="formData.longitude" :disabled="'longitude'==subColumn"></el-input>
               </el-form-item>
 
+              <el-form-item prop="latitude" label="纬度">
+                <el-input v-model="formData.latitude" :disabled="'latitude'==subColumn"></el-input>
+              </el-form-item>
               <el-form-item prop="mapInfo" label="地图信息">
                 <el-input type="textarea" v-model="formData.mapInfo" :disabled="'mapInfo'==subColumn"></el-input>
               </el-form-item>
@@ -100,31 +131,6 @@
                 <el-input v-model="formData.mapRate" :disabled="'mapRate'==subColumn"></el-input>
               </el-form-item>
 
-              <el-form-item prop="keyword" label="关键词">
-                <template>
-                  <div v-for="(item,index) in formData.keyword" style="margin-bottom:10px">
-                    <el-input v-model="formData.keyword[index]" style="width:180px"></el-input>
-                    <el-button @click="onDeleteKeyword(index)" type="danger">删除</el-button>
-                  </div>
-                  <el-button @click="addKeyword" type="primary">添加</el-button>
-                </template>
-              </el-form-item>
-
-              <el-form-item>
-                <el-button type="text" @click="mapDialogVisible = !mapDialogVisible">点击打开地图选择地址</el-button>
-
-                <div class="amap-page-container" v-if="mapDialogVisible">
-                  <coordinate-select @closeMap="mapDialogVisible = !mapDialogVisible" :value="[formData.longitude||118.79647,formData.latitude||32.05838]" @selected="coordinateSelected" v-if="mapDialogVisible"></coordinate-select>
-                </div>
-              </el-form-item>
-
-              <el-form-item prop="longitude" label="经度">
-                <el-input v-model="formData.longitude" :disabled="'longitude'==subColumn"></el-input>
-              </el-form-item>
-
-              <el-form-item prop="latitude" label="纬度">
-                <el-input v-model="formData.latitude" :disabled="'latitude'==subColumn"></el-input>
-              </el-form-item>
               <el-form-item prop="remark1" label="备注1">
                 <el-input v-model="formData.remark1" :disabled="'remark1'==subColumn"></el-input>
               </el-form-item>
@@ -148,15 +154,6 @@
               <el-form-item prop="mapAngle" label="地图角度">
                 <el-input v-model="formData.mapAngle"></el-input>
               </el-form-item>
-              <el-form-item prop="markLevel" label="景区级别">
-                <el-input v-model="formData.markLevel"></el-input>
-              </el-form-item>
-              <el-form-item prop="markPrice" label="门票">
-                <el-input v-model="formData.markPrice"></el-input>
-              </el-form-item>
-              <el-form-item prop="busRoute" label="公交路线">
-                <el-input v-model="formData.busRoute"></el-input>
-              </el-form-item>
             </template>
 
             <el-form-item>

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.286667da3a18934be460a9434728b6c8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.a8f86ff8450d4a995c92.js></script><script type=text/javascript src=/static/js/vendor.631c08d5fc0f22d7ee46.js></script><script type=text/javascript src=/static/js/admin.3ad500d88797b1ad0a4c.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.22597090688d7910bfc5201f337f912e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.1cd93d19bafff06cd0b2.js></script><script type=text/javascript src=/static/js/vendor.48a85186afc18aaab578.js></script><script type=text/javascript src=/static/js/admin.c5314d9247394d54ab23.js></script></body></html>

src/main/webapp/WEB-INF/html/loginAdmin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.fd00a5a4e42911280fc149a39bbdf891.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.a8f86ff8450d4a995c92.js></script><script type=text/javascript src=/static/js/vendor.631c08d5fc0f22d7ee46.js></script><script type=text/javascript src=/static/js/loginAdmin.6d00ead32297ef306ff1.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.fd00a5a4e42911280fc149a39bbdf891.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.1cd93d19bafff06cd0b2.js></script><script type=text/javascript src=/static/js/vendor.48a85186afc18aaab578.js></script><script type=text/javascript src=/static/js/loginAdmin.25c1240db71dbe0b44ae.js></script></body></html>

src/main/webapp/static/js/79.8d530b9dcb550adb7c7a.js → src/main/webapp/static/js/81.92e247d936678e569149.js

@@ -1 +1 @@
-webpackJsonp([79],{"5LNU":function(e,t){},Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("5LNU")},"data-v-3122cd72",null);t.default=s.exports}});
+webpackJsonp([81],{"5LNU":function(e,t){},Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("5LNU")},"data-v-3122cd72",null);t.default=s.exports}});

src/main/webapp/static/js/92.8e823bf932c2bb84a735.js → src/main/webapp/static/js/93.d77c23a1cf13beb5bf02.js

@@ -1 +1 @@
-webpackJsonp([92],{izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("xnY9")},"data-v-04168182",null);e.default=c.exports},xnY9:function(t,e){}});
+webpackJsonp([93],{izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("xnY9")},"data-v-04168182",null);e.default=c.exports},xnY9:function(t,e){}});