20181225AR模板

src/main/java/com/izouma/awesomeadmin/dao/ThingInfoMapper.xml

@@ -27,6 +27,7 @@
         <result column="map_x" property="mapX" jdbcType="VARCHAR"/>
         <result column="map_y" property="mapY" jdbcType="VARCHAR"/>
         <result column="map_index" property="mapIndex" jdbcType="VARCHAR"/>
+        <result column="orientation" property="orientation" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -80,6 +81,8 @@
 
             map_index,
 
+            orientation,
+
         </trim>
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -171,6 +174,9 @@
             <if test="mapIndex!= null">
                 map_index,
             </if>
+            <if test="orientation!= null">
+                orientation,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -248,6 +254,9 @@
             <if test="mapIndex != null">
                 #{mapIndex,jdbcType=VARCHAR},
             </if>
+            <if test="orientation != null">
+                #{orientation,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ThingInfo">
@@ -328,6 +337,9 @@
             <if test="mapIndex != null">
                 map_index= #{mapIndex,jdbcType=VARCHAR},
             </if>
+            <if test="orientation != null">
+                orientation= #{orientation,jdbcType=VARCHAR},
+            </if>
         </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">

src/main/java/com/izouma/awesomeadmin/model/ThingInfo.java

@@ -35,6 +35,11 @@ public class ThingInfo {
     private String mapY;
     private String mapIndex;
 
+    /**
+     * 朝向
+     */
+    private String orientation;
+
     private String idStr;
 
     private String searchKey;
@@ -290,5 +295,13 @@ public class ThingInfo {
     public void setAimGroupInfo(AimGroupInfo aimGroupInfo) {
         this.aimGroupInfo = aimGroupInfo;
     }
+
+    public String getOrientation() {
+        return orientation;
+    }
+
+    public void setOrientation(String orientation) {
+        this.orientation = orientation;
+    }
 }
 

src/main/vue/src/pages/AimGroupInfos.vue

@@ -56,7 +56,7 @@
 
             <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100">
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+            <el-table-column label="操作" align="center" fixed="right" min-width="220">
                 <template slot-scope="scope">
                     <el-button @click="$router.push({path:'/aimPlaceInfos',query:{column:scope.row.areaId+',areaId'+';'+scope.row.cityId+',cityId'
                      +';'+scope.row.landmarkId+',ownedLandMarkId'+';'+scope.row.id+',aimGroupId'+';'+(scope.row.thingId?(scope.row.thingId+',thingId'):'')

src/main/vue/src/pages/AimPlaceInfos.vue

@@ -162,7 +162,7 @@
 
             <el-table-column v-if="isColumnShow('templateAimId')" prop="templateAimId" label="模板点标ID" min-width="100">
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+            <el-table-column label="操作" align="center" fixed="right" min-width="230">
                 <template slot-scope="scope">
                     <el-button @click="$router.push({path:'/ArContents',query:{column:scope.row.id+',aimPlaceId'}})" type="primary" size="small" plain>ar内容
                     </el-button>

src/main/vue/src/pages/LandMarks.vue

@@ -103,7 +103,7 @@
 
             <el-table-column v-if="isColumnShow('frontLevelId')" prop="frontLevelId" label="上级地标ID" min-width="100">
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="220">
+            <el-table-column label="操作" align="center" fixed="right" min-width="290">
                 <template slot-scope="scope">
                     <!-- <el-button @click="$router.push({path:'/VuforiaImageInfos',query:{column:scope.row.id+',landMarkId'}})" type="primary" size="small" plain>识别图
             </el-button>

src/main/vue/src/pages/ThingInfo.vue

@@ -91,6 +91,9 @@
           <el-form-item prop="mapY" label="Y">
             <el-input v-model="formData.mapY" disabled></el-input>
           </el-form-item>
+          <el-form-item prop="orientation" label="方向">
+            <el-input v-model="formData.orientation"></el-input>
+          </el-form-item>
           <el-form-item prop="mapIndex" label="index">
             <el-input v-model="formData.mapIndex" disabled></el-input>
           </el-form-item>

src/main/vue/src/pages/ThingInfos.vue

@@ -91,7 +91,7 @@
 
             <el-table-column v-if="isColumnShow('mapIndex')" prop="mapIndex" label="index" min-width="100">
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+            <el-table-column label="操作" align="center" fixed="right" min-width="230">
                 <template slot-scope="scope">
                     <el-button @click="$router.push({path:'/aimGroupInfos',query:{column:scope.row.areaId+',areaId'+';'+scope.row.cityId+',cityId'+';'+scope.row.landmarkId+',landmarkId'+';'+scope.row.id+',thingId'}})" type="primary" size="small" plain>点标组
                     </el-button>

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.0b9d13a062d228ea33d0acc195f931c9.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.e1f572d0e7a46d29cf02.js></script><script type=text/javascript src=/static/js/vendor.631c08d5fc0f22d7ee46.js></script><script type=text/javascript src=/static/js/admin.f9eb40f27cfbf4d14103.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.0b9d13a062d228ea33d0acc195f931c9.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2e6d43f598227d4e519d.js></script><script type=text/javascript src=/static/js/vendor.631c08d5fc0f22d7ee46.js></script><script type=text/javascript src=/static/js/admin.f1968463b09e086e4be0.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.a1de29a9f9c1d5b671b1965892c17dd1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.e1f572d0e7a46d29cf02.js></script><script type=text/javascript src=/static/js/vendor.631c08d5fc0f22d7ee46.js></script><script type=text/javascript src=/static/js/loginAdmin.c9cb308e894a7cd72b31.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.2e6d43f598227d4e519d.js></script><script type=text/javascript src=/static/js/vendor.631c08d5fc0f22d7ee46.js></script><script type=text/javascript src=/static/js/loginAdmin.c9cb308e894a7cd72b31.js></script></body></html>

src/main/webapp/static/js/80.3bdedfaa542338e8c9ea.js → src/main/webapp/static/js/81.92e247d936678e569149.js

@@ -1 +1 @@
-webpackJsonp([80],{"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}});