Explorar el Código

调整富文本编辑器bug

liaoyitao hace 3 meses
padre
commit
fdeee7d43b

+ 3 - 3
src/views/info/areaInfo/index.vue

@@ -80,7 +80,7 @@
80 80
           <el-input v-model="form.areaName" placeholder="请输入名字" />
81 81
         </el-form-item>
82 82
         <el-form-item label="备注" prop="memo">
83
-          <wang-editor v-model="form.memo" :min-height="140" />
83
+            <wang-editor v-if="open" v-model="form.memo" :min-height="140" />
84 84
         </el-form-item>
85 85
         <el-form-item label="颜色">
86 86
           <el-color-picker v-model="form.colour"></el-color-picker>
@@ -89,7 +89,7 @@
89 89
           <el-input-number v-model="form.acreage" controls-position="right" :min="0" placeholder="请输入面积" />
90 90
         </el-form-item>
91 91
 
92
-        <el-form-item label="坐标" prop="location">
92
+        <el-form-item label="坐标">
93 93
           <el-input @focus="openditu" v-model="form.location">
94 94
             {{ form.location }}
95 95
           </el-input>
@@ -357,7 +357,7 @@ export default {
357 357
       this.reset();
358 358
       this.open = true;
359 359
       this.title = "添加区域对象";
360
-      // this.clearmian();
360
+      if (this.map) this.clearmian();
361 361
     },
362 362
     /** 修改按钮操作 */
363 363
     handleUpdate(row) {

+ 3 - 1
src/views/info/buildingInfo/index.vue

@@ -154,7 +154,9 @@
154 154
           <el-input v-model="form.lngLat" placeholder="请输入二维坐标" />
155 155
         </el-form-item>
156 156
         <el-form-item label="招商简介" prop="memo">
157
-          <wang-editor v-model="form.memo" :min-height="140" />
157
+          <div v-if="open">
158
+            <wang-editor v-model="form.memo" :min-height="140" />
159
+          </div>
158 160
         </el-form-item>
159 161
         <el-form-item label="三维坐标" prop="rasterLngLat">
160 162
           <el-input v-model="form.rasterLngLat" @focus="openditu">

+ 18 - 2
src/views/info/elevatorInfo/index.vue

@@ -118,6 +118,11 @@
118 118
           <dict-tag :options="dict.type.elevator_info_status" :value="scope.row.status"/>
119 119
         </template>
120 120
       </el-table-column>
121
+      <el-table-column label="连接状态" align="center" prop="connectStatus">
122
+        <template slot-scope="scope">
123
+          <dict-tag :options="dict.type.connection_status" :value="scope.row.connectStatus"/>
124
+        </template>
125
+      </el-table-column>
121 126
       <el-table-column label="电梯类型" align="center" prop="type">
122 127
         <template slot-scope="scope">
123 128
           <dict-tag :options="dict.type.elevator_type" :value="scope.row.type"/>
@@ -191,6 +196,16 @@
191 196
             ></el-option>
192 197
           </el-select>
193 198
         </el-form-item>
199
+        <el-form-item label="电梯连接状态" prop="status">
200
+          <el-select v-model="form.connectStatus" placeholder="请选择">
201
+            <el-option
202
+              v-for="dict in dict.type.connection_status"
203
+              :key="dict.value"
204
+              :label="dict.label"
205
+              :value="parseInt(dict.value)"
206
+            ></el-option>
207
+          </el-select>
208
+        </el-form-item>
194 209
         <el-form-item label="电梯名字" prop="elevatorName">
195 210
           <el-input v-model="form.elevatorName" placeholder="请输入电梯名字" />
196 211
         </el-form-item>
@@ -218,7 +233,7 @@ import { listElevatorInfo, getElevatorInfo, delElevatorInfo, addElevatorInfo, up
218 233
 import { listBuildingInfo, getBuildingInfo } from "@/api/info/buildingInfo";
219 234
 export default {
220 235
   name: "ElevatorInfo",
221
-  dicts: ['elevator_info_status', 'elevator_type'],
236
+  dicts: ['elevator_info_status', 'elevator_type', 'connection_status'],
222 237
   data() {
223 238
     return {
224 239
       buildingList: [],
@@ -308,7 +323,8 @@ export default {
308 323
         upkeepNum: null,
309 324
         type: null,
310 325
         runFloor: null,
311
-        runTime: null
326
+        runTime: null,
327
+        connectStatus: null
312 328
       };
313 329
       this.resetForm("form");
314 330
     },

+ 1 - 1
src/views/info/organizationInfo/index.vue

@@ -535,7 +535,7 @@ export default {
535 535
         this.handler = new T.MarkTool(this.map);
536 536
         console.log('handler 初始化完成:', this.handler);
537 537
         console.log('kanknak1', this.form.rasterLngLat);
538
-        let points = [];
538
+        let points = new T.LngLat();
539 539
         if (this.form.rasterLngLat) {
540 540
           const coordinates = this.form.rasterLngLat.split(',');
541 541
           points =  new T.LngLat(coordinates[1], coordinates[0]);

+ 8 - 8
src/views/view/synthesisAnalyze/index.vue

@@ -57,8 +57,8 @@
57 57
     <el-table v-loading="loading" :data="synthesisAnalyzeList" @selection-change="handleSelectionChange">
58 58
       <el-table-column type="selection" width="55" align="center" />
59 59
       <el-table-column label="id" align="center" prop="id" />
60
-      <el-table-column label="发展定位" align="center" prop="orientation" />
61
-      <el-table-column label="红利政策" align="center" prop="bonusPolicy" />
60
+<!--      <el-table-column label="发展定位" align="center" prop="orientation" />-->
61
+<!--      <el-table-column label="红利政策" align="center" prop="bonusPolicy" />-->
62 62
       <el-table-column label="规划蓝图" align="center" prop="planningLayout">
63 63
         <template slot-scope="scope">
64 64
           <img :src="BASE_URL + scope.row.planningLayout" style="width: 50px; height: 50px;">
@@ -96,12 +96,12 @@
96 96
     <!-- 添加或修改综合分析对话框 -->
97 97
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
98 98
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
99
-        <el-form-item label="发展定位">
100
-          <wang-editor v-model="form.orientation" :min-height="140"/>
101
-        </el-form-item>
102
-        <el-form-item label="红利政策">
103
-          <wang-editor v-model="form.bonusPolicy" :min-height="140"/>
104
-        </el-form-item>
99
+<!--        <el-form-item label="发展定位">-->
100
+<!--          <wang-editor v-model="form.orientation" :min-height="140"/>-->
101
+<!--        </el-form-item>-->
102
+<!--        <el-form-item label="红利政策">-->
103
+<!--          <wang-editor v-model="form.bonusPolicy" :min-height="140"/>-->
104
+<!--        </el-form-item>-->
105 105
         <el-form-item label="规划蓝图">
106 106
           <imageUpload v-model="form.planningLayout"/>
107 107
         </el-form-item>