Selaa lähdekoodia

20190114地图

suochencheng 7 vuotta sitten
vanhempi
commit
40ff2a465f

+ 12 - 0
src/main/java/com/izouma/awesomeadmin/dao/VuforiaImageInfoMapper.xml

@@ -23,6 +23,7 @@
         <result column="remark3" property="remark3" jdbcType="VARCHAR"/>
         <result column="vuforia_image" property="vuforiaImage" jdbcType="VARCHAR"/>
         <result column="target_id" property="targetId" jdbcType="VARCHAR"/>
+        <result column="map_index" property="mapIndex" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -68,6 +69,8 @@
 
             target_id,
 
+            map_index,
+
         </trim>
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -147,6 +150,9 @@
             <if test="targetId!= null">
                 target_id,
             </if>
+            <if test="mapIndex!= null">
+                map_index,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -212,6 +218,9 @@
             <if test="targetId != null">
                 #{targetId,jdbcType=VARCHAR},
             </if>
+            <if test="mapIndex != null">
+                #{mapIndex,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.VuforiaImageInfo">
@@ -280,6 +289,9 @@
             <if test="targetId != null">
                 target_id= #{targetId,jdbcType=VARCHAR},
             </if>
+            <if test="mapIndex != null">
+                map_index= #{mapIndex,jdbcType=VARCHAR},
+            </if>
         </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">

+ 10 - 0
src/main/java/com/izouma/awesomeadmin/model/VuforiaImageInfo.java

@@ -37,6 +37,8 @@ public class VuforiaImageInfo {
 
     private String searchKey;
 
+    private String mapIndex;
+
     /**
      * and,test_name,like,value;or,remark,=,123
      */
@@ -246,5 +248,13 @@ public class VuforiaImageInfo {
     public void setTargetId(String targetId) {
         this.targetId = targetId;
     }
+
+    public String getMapIndex() {
+        return mapIndex;
+    }
+
+    public void setMapIndex(String mapIndex) {
+        this.mapIndex = mapIndex;
+    }
 }
 

+ 8 - 4
src/main/vue/src/components/VuforiaImageInfo.vue

@@ -1,5 +1,5 @@
 <template>
-    <div  v-loading="loading">
+    <div v-loading="loading">
         <el-form :model="formData" :rules="rules" ref="form" label-width="100px" label-position="right" size="small" style="max-width: 500px;">
             <div style="height:50vh;overflow:auto;padding:0 10px">
                 <el-form-item prop="vuforiaImageGroupId" label="所属图集ID">
@@ -68,6 +68,10 @@
                     <el-input v-model="formData.targetId"></el-input>
                 </el-form-item>
 
+                <el-form-item prop="mapIndex" label="idnex">
+                    <el-input v-model="formData.mapIndex"></el-input>
+                </el-form-item>
+
             </div>
             <el-form-item style="margin-top:10px;">
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
@@ -188,7 +192,7 @@ export default {
             landMarkIdOptions: [],
             subColumn: '',
             subValue: '',
-            loading:false
+            loading: false
         }
     },
     methods: {
@@ -221,13 +225,13 @@ export default {
         },
         onDelete() {
             this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
-                this.loading=true
+                this.loading = true
                 return this.$http.post({
                     url: '/vuforiaImageInfo/del',
                     data: { id: this.formData.id }
                 })
             }).then(res => {
-                this.loading=false
+                this.loading = false
                 if (res.success) {
                     this.$message.success('删除成功');
                     this.$emit('hide')

+ 6 - 3
src/main/vue/src/pages/VuforiaImageInfo.vue

@@ -66,6 +66,9 @@
             <el-form-item prop="targetId" label="targetId">
                 <el-input v-model="formData.targetId"></el-input>
             </el-form-item>
+            <el-form-item prop="mapIndex" label="index">
+                <el-input v-model="formData.mapIndex"></el-input>
+            </el-form-item>
 
             <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
@@ -118,7 +121,7 @@ export default {
 
                 if (res.data.length > 0) {
                     res.data.forEach(item => {
-                        this.vuforiaImageGroupIdOptions.push({ label: item.vuforiaName, value: item.id });
+                        this.vuforiaImageGroupIdOptions.push({ label: item.vuforiaName, value: String(item.id) });
                     })
                 }
             }
@@ -133,7 +136,7 @@ export default {
 
                 if (res.data.length > 0) {
                     res.data.forEach(item => {
-                        this.vuforiaImageTypeIdOptions.push({ label: item.typeName, value: item.id });
+                        this.vuforiaImageTypeIdOptions.push({ label: item.typeName, value: String(item.id) });
                     })
                 }
             }
@@ -148,7 +151,7 @@ export default {
 
                 if (res.data.length > 0) {
                     res.data.forEach(item => {
-                        this.landMarkIdOptions.push({ label: item.mapName, value: item.id });
+                        this.landMarkIdOptions.push({ label: item.mapName, value: String(item.id) });
                     })
                 }
             }