Browse Source

提交修改

chuwu 5 years ago
parent
commit
217bb34c2f

+ 1 - 0
src/components/config_point/step3_point/3_identify.vue

@@ -116,6 +116,7 @@
                 if (this.renderData.length < this.activeName) {
                     return false
                 }
+                this.fillData = ""
                 let headers = {
                     "modbus-tcp": [{
                             InfoPointName: "*slave_id",

+ 4 - 2
src/views/data_admin/buildGraphy/graphyCanvas.vue

@@ -1,7 +1,9 @@
 <template>
   <div ref="graphyMain" class="canvasGraphy">
-    <i v-if="type == 2" class="iconwushuju iconfont"></i>
-    <div class="center" v-if="type != 3">{{type == 1 ? '请选择楼层' : '当前楼层尚无平面图,请去空间管理根据模型生成'}}</div>
+    <div v-if="type != 3" class="center">
+        <i class="iconwushuju iconfont"></i>
+        <p>{{type == 1 ? '请选择楼层' : '当前楼层尚无平面图,请去空间管理根据模型生成'}}</p>
+    </div>
     <div style="width:100%;" v-else>
       <canvas id="canvas" :width="canvasW" :height="canvasH"></canvas>
     </div>

+ 1 - 1
src/views/data_admin/buildGraphy/graphyTabs.vue

@@ -16,7 +16,7 @@ getLocation 定位
                     </div>
                 </div>
                 <div v-if="!pointData.length" class="center">
-                    <i v-if="pointParam.FloorId" class="iconwushuju iconfont"></i>
+                    <i class="iconwushuju iconfont"></i>
                     {{pointParam.FloorId ? "数据为空" : "←请选择楼层"}}
                 </div>
       </el-tab-pane>

+ 3 - 3
src/views/point/config_point/steps/step3.vue

@@ -11,9 +11,9 @@
         <div v-else class="center">
             <i class="iconwushuju iconfont"></i> 暂无数据
         </div>
-        <div class="right">
-                <pagination :page="pages" @change="changePage"></pagination>
-            </div>
+        <div v-if="pages.total" class="right">
+            <pagination :page="pages" @change="changePage"></pagination>
+        </div>
         <own-dialog :width="'1000px'" :title=" isDataform ? '根据关键内容批量对应数据字典' : '根据关键内容批量标准化设备标识' " :dialogVisible="isDialogShow" @cancel="close">
             <dialog-main v-if="!isDataform"></dialog-main>
             <steps-main v-if="isDataform"></steps-main>