首頁 探索 說明
登入
suochencheng
/
yimishijie
1
0
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

20181210版本

suochencheng 7 年之前
父節點
232bb75be0
當前提交
660f08d197
共有 29 個文件被更改，包括 12 次插入 和 6 次删除
統一視圖 顯示文件統計
  1. 2 0
      src/main/vue/src/pages/AreaInfo.vue
  2. 6 4
      src/main/vue/src/pages/LandMark.vue
  3. 2 0
      src/main/vue/src/pages/ThingInfo.vue
  4. 1 1
      src/main/webapp/WEB-INF/html/admin.html
  5. 1 1
      src/main/webapp/WEB-INF/html/loginAdmin.html
  6. 0 0
      src/main/webapp/static/js/10.47629c4fb8f6cf3ed828.js
  7. 0 0
      src/main/webapp/static/js/10.ff44fe128541e9949bbc.js
  8. 0 0
      src/main/webapp/static/js/18.938fc3cdb3b4fe02e44e.js
  9. 0 0
      src/main/webapp/static/js/19.a2e7dbb41f13213baab7.js
  10. 0 0
      src/main/webapp/static/js/20.a424176b6c0d38e7a6f8.js
  11. 0 0
      src/main/webapp/static/js/21.4d1d72e93020c394abf9.js
  12. 0 0
      src/main/webapp/static/js/22.7da53de2e213be07f214.js
  13. 0 0
      src/main/webapp/static/js/23.8d187990f448d6f48a4c.js
  14. 0 0
      src/main/webapp/static/js/24.2438e0b4ccc5568715b8.js
  15. 0 0
      src/main/webapp/static/js/25.5fb700b08a0877440593.js
  16. 0 0
      src/main/webapp/static/js/26.b5fe423b3c16ed41cf27.js
  17. 0 0
      src/main/webapp/static/js/27.5b55df645a7d0d7f60af.js
  18. 0 0
      src/main/webapp/static/js/28.38f546a173a7d6ef39f1.js
  19. 0 0
      src/main/webapp/static/js/29.22a97493903971d34666.js
  20. 0 0
      src/main/webapp/static/js/30.19e0a8bdc2dc078523a2.js
  21. 0 0
      src/main/webapp/static/js/31.c7a94cb986ef379e2d86.js
  22. 0 0
      src/main/webapp/static/js/32.0de4439ced6b3f96a65d.js
  23. 0 0
      src/main/webapp/static/js/32.f57b5cef0697be93e0d8.js
  24. 0 0
      src/main/webapp/static/js/7.7821f3c33ed550b89c5c.js
  25. 0 0
      src/main/webapp/static/js/8.67e5e11f434a3d6c2b0d.js
  26. 0 0
      src/main/webapp/static/js/8.a64df34c5c2e6ce82daf.js
  27. 0 0
      src/main/webapp/static/js/9.b0d4549fd81806f348d7.js
  28. 0 0
      src/main/webapp/static/js/admin.3a3603f01a2da0dab85d.js
  29. 0 0
      src/main/webapp/static/js/manifest.f16dcf9dad3a97fbbd86.js

+ 2 - 0
src/main/vue/src/pages/AreaInfo.vue
查看文件 

@@ -130,6 +130,8 @@ export default {
 
 
 
                     if (res.data.keyword) {
 
                     if (res.data.keyword) {
 
                         res.data.keyword = res.data.keyword.split(',')
 
                         res.data.keyword = res.data.keyword.split(',')
 
+                    } else {
 
+                        res.data.keyword = [];
 
                     }
 
                     }
 
 
 
                     if (this.$route.query.column) {
 
                     if (this.$route.query.column) {

+ 6 - 4
src/main/vue/src/pages/LandMark.vue
查看文件 

@@ -97,7 +97,7 @@
 
                         <el-form-item prop="keyword" label="关键词">
 
                         <el-form-item prop="keyword" label="关键词">
 
                             <template>
 
                             <template>
 
                                 <div v-for="(item,index) in formData.keyword" style="margin-bottom:10px">
 
                                 <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-input v-model="formData.keyword[index]" style="width:180px"></el-input>
 
                                     <el-button @click="onDeleteKeyword(index)" type="danger">删除</el-button>
 
                                     <el-button @click="onDeleteKeyword(index)" type="danger">删除</el-button>
 
                                 </div>
 
                                 </div>
 
                                 <el-button @click="addKeyword" type="primary">添加</el-button>
 
                                 <el-button @click="addKeyword" type="primary">添加</el-button>
 
@@ -123,7 +123,7 @@
 
                 </div>
 
                 </div>
 
 
 
             </el-tab-pane>
 
             </el-tab-pane>
 
-            <el-tab-pane label="目标点内容" name="2" v-if="this.$route.query.id">
 
+            <!-- <el-tab-pane label="目标点内容" name="2" v-if="this.$route.query.id">
 
 
 
                 <el-container>
 
                 <el-container>
 
                     <el-aside width="50%">
 
                     <el-aside width="50%">
 
@@ -145,7 +145,7 @@
 
                         <Map-info :Mapstyle="'Position'" ref='mapInfo2' @addPoint='addPositions' @editPoint='editPositions'></Map-info>
 
                         <Map-info :Mapstyle="'Position'" ref='mapInfo2' @addPoint='addPositions' @editPoint='editPositions'></Map-info>
 
                     </el-main>
 
                     </el-main>
 
                 </el-container>
 
                 </el-container>
 
-            </el-tab-pane>
 
+            </el-tab-pane> -->
 
             <el-tab-pane label="识别图" name="4" v-if="this.$route.query.id">
 
             <el-tab-pane label="识别图" name="4" v-if="this.$route.query.id">
 
                 <VuforiaImageInfos></VuforiaImageInfos>
 
                 <VuforiaImageInfos></VuforiaImageInfos>
 
             </el-tab-pane>
 
             </el-tab-pane>
 
@@ -186,6 +186,8 @@ export default {
 
 
 
                     if (res.data.keyword) {
 
                     if (res.data.keyword) {
 
                         res.data.keyword = res.data.keyword.split(',')
 
                         res.data.keyword = res.data.keyword.split(',')
 
+                    } else {
 
+                        res.data.keyword = [];
 
                     }
 
                     }
 
 
 
                     this.formData = res.data;
 
                     this.formData = res.data;
 
@@ -348,7 +350,7 @@ export default {
 
         },
 
         },
 
         onDeleteKeyword(index) {
 
         onDeleteKeyword(index) {
 
             console.log("111")
 
             console.log("111")
 
-            this.formData.keyword.splice(index,1)
 
+            this.formData.keyword.splice(index, 1)
 
         },
 
         },
 
         addKeyword() {
 
         addKeyword() {
 
             this.formData.keyword.push('')
 
             this.formData.keyword.push('')

+ 2 - 0
src/main/vue/src/pages/ThingInfo.vue
查看文件 

@@ -165,6 +165,8 @@ export default {
 
 
 
           if (res.data.keyword) {
 
           if (res.data.keyword) {
 
             res.data.keyword = res.data.keyword.split(',')
 
             res.data.keyword = res.data.keyword.split(',')
 
+          } else {
 
+            res.data.keyword = [];
 
           }
 
           }

+ 1 - 1
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.5d039826b09cb5e6341ea6e253010ee7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.e3f6a3301ff4699f7322.js></script><script type=text/javascript src=/static/js/vendor.a890d64a84833c600d65.js></script><script type=text/javascript src=/static/js/admin.0a629e19351151d7d9a4.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.5d039826b09cb5e6341ea6e253010ee7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f16dcf9dad3a97fbbd86.js></script><script type=text/javascript src=/static/js/vendor.a890d64a84833c600d65.js></script><script type=text/javascript src=/static/js/admin.3a3603f01a2da0dab85d.js></script></body></html>

+ 1 - 1
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.a1de29a9f9c1d5b671b1965892c17dd1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.e3f6a3301ff4699f7322.js></script><script type=text/javascript src=/static/js/vendor.a890d64a84833c600d65.js></script><script type=text/javascript src=/static/js/loginAdmin.4bb29c046d494a4f6440.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.a1de29a9f9c1d5b671b1965892c17dd1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f16dcf9dad3a97fbbd86.js></script><script type=text/javascript src=/static/js/vendor.a890d64a84833c600d65.js></script><script type=text/javascript src=/static/js/loginAdmin.4bb29c046d494a4f6440.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/10.47629c4fb8f6cf3ed828.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/10.ff44fe128541e9949bbc.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/18.938fc3cdb3b4fe02e44e.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/19.a2e7dbb41f13213baab7.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/20.a424176b6c0d38e7a6f8.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/21.4d1d72e93020c394abf9.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/22.7da53de2e213be07f214.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/23.8d187990f448d6f48a4c.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/24.2438e0b4ccc5568715b8.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/25.5fb700b08a0877440593.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/26.b5fe423b3c16ed41cf27.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/27.5b55df645a7d0d7f60af.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/28.38f546a173a7d6ef39f1.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/29.22a97493903971d34666.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/30.19e0a8bdc2dc078523a2.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/31.c7a94cb986ef379e2d86.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/32.0de4439ced6b3f96a65d.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/32.f57b5cef0697be93e0d8.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/7.7821f3c33ed550b89c5c.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/8.67e5e11f434a3d6c2b0d.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/8.a64df34c5c2e6ce82daf.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/9.b0d4549fd81806f348d7.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/admin.3a3603f01a2da0dab85d.js


File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/static/js/manifest.f16dcf9dad3a97fbbd86.js


Some files were not shown because too many files changed in this diff