20190311

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

@@ -9,7 +9,7 @@
             </el-form-item>
             <el-form-item prop="ownedCityId" label="所属城市Id">
               <template>
-                <el-select v-model="formData.ownedCityId" clearable placeholder="请选择" :disabled="'ownedCityId'==subColumn">
+                <el-select v-model="formData.ownedCityId" clearable filterable  placeholder="请选择" :disabled="'ownedCityId'==subColumn">
                   <el-option v-for="item in ownedCityIdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                 </el-select>
               </template>
@@ -74,7 +74,7 @@
             </el-form-item>
             <el-form-item prop="vuforiaDataName" label="识别图集名称">
               <template>
-                <el-select v-model="formData.vuforiaImageGroupId" clearable placeholder="请选择" @change="changeVuforiaImageGroup">
+                <el-select v-model="formData.vuforiaImageGroupId" filterable   clearable placeholder="请选择" @change="changeVuforiaImageGroup">
                   <el-option v-for="(item,index) in vuforiaImageGroupList" :key="item.id" :label="item.vuforiaDataName" :value="item.id"></el-option>
                 </el-select>
               </template>
@@ -145,7 +145,7 @@
               </el-form-item>
               <el-form-item prop="frontLevelId" label="上级地标ID">
                 <template>
-                  <el-select v-model="formData.frontLevelId" clearable placeholder="请选择" :disabled="'frontLevelId'==subColumn">
+                  <el-select v-model="formData.frontLevelId" clearable  filterable  placeholder="请选择" :disabled="'frontLevelId'==subColumn">
                     <el-option v-for="item in frontLevelIdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                   </el-select>
                 </template>
@@ -356,7 +356,7 @@ export default {
     changeVuforiaImageGroup(id) {
       this.vuforiaImageGroupList.forEach(item => {
         if (item.id == id) {
-          this.formData.vuforiaDataName = item.vuforiaDataName
+          this.formData.vuforiaDataName = item.vuforiaName
         }
       })
     },

src/main/vue/src/pages/LandMarkCreate.vue

@@ -16,7 +16,7 @@
               <el-input v-model="formData.mapName"></el-input>
             </el-form-item>
             <el-form-item label="所属城市" prop="ownedCityId">
-              <el-select v-model="formData.ownedCityId" clearable placeholder="请选择">
+              <el-select v-model="formData.ownedCityId" clearable  filterable  placeholder="请选择">
                 <el-option v-for="item in ownedCityIdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
               </el-select>
             </el-form-item>
@@ -124,7 +124,7 @@
 
             <el-form-item prop="vuforiaDataName" label="识别图集名称">
               <template>
-                <el-select v-model="formData.vuforiaImageGroupId" clearable placeholder="请选择" @change="changeVuforiaImageGroup">
+                <el-select v-model="formData.vuforiaImageGroupId" clearable filterable  placeholder="请选择" @change="changeVuforiaImageGroup">
                   <el-option v-for="(item,index) in vuforiaImageGroupList" :key="item.id" :label="item.vuforiaDataName" :value="item.id"></el-option>
                 </el-select>
               </template>
@@ -136,7 +136,7 @@
 
             <el-form-item prop="frontLevelId" label="上级地标">
               <template>
-                <el-select v-model="formData.frontLevelId" clearable placeholder="请选择">
+                <el-select v-model="formData.frontLevelId" clearable filterable  placeholder="请选择">
                   <el-option v-for="item in frontLevelIdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                 </el-select>
               </template>
@@ -411,7 +411,7 @@ export default {
     changeVuforiaImageGroup(id) {
       this.vuforiaImageGroupList.forEach(item => {
         if (item.id == id) {
-          this.formData.vuforiaDataName = item.vuforiaDataName
+          this.formData.vuforiaDataName = item.vuforiaName
         }
       })
     }

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.22597090688d7910bfc5201f337f912e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.fed7ae107b0e246d788b.js></script><script type=text/javascript src=/static/js/vendor.48a85186afc18aaab578.js></script><script type=text/javascript src=/static/js/admin.91e6a13bfe068a856d9f.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.452728f52f541567e0ec.js></script><script type=text/javascript src=/static/js/vendor.48a85186afc18aaab578.js></script><script type=text/javascript src=/static/js/admin.91e6a13bfe068a856d9f.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.fed7ae107b0e246d788b.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>
+<!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.452728f52f541567e0ec.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>