禪道問題修改

ruoyi-ui/src/views/system/management/estate/entry-and-exit/index.vue

@@ -20,7 +20,7 @@
       <el-form-item label="数据分组" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择数据分组" clearable>
           <el-option
-            v-for="dict in dict.type.tour_type"
+            v-for="dict in dict.type.in_out"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"

ruoyi-ui/src/views/system/management/estate/meteorological-monitoring/index.vue

@@ -27,6 +27,8 @@
             :value="dict.regionId"
           />
         </el-select>
+      </el-form-item>
+      <el-form-item prop="cityCode">
         <el-select v-model="queryParams.cityCode" placeholder="请选择" @change="getCountry($event)">
           <el-option
             v-for="dict in cityOptions"
@@ -35,7 +37,9 @@
             :value="dict.regionId"
           />
         </el-select>
-        <el-select v-model="queryParams.municipalCode" placeholder="请选择">
+        </el-form-item>
+        <el-form-item prop="countyCode">
+        <el-select v-model="queryParams.countyCode" placeholder="请选择">
           <el-option
             v-for="dict in countryOptions"
             :key="dict.regionId"
@@ -214,10 +218,17 @@
     <!-- 添加或修改气象监测数据 对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="统计时间" prop="statisticalTime">
-          <el-date-picker v-model="form.statisticalTime"
+        <el-form-item label="统计时间" prop="startTime">
+          <el-date-picker v-model="form.startTime"
                           clearable
-                          placeholder="请选择统计时间"
+                          placeholder="请选择开始时间"
+                          type="date"
+                          value-format="yyyy-MM-dd">
+          </el-date-picker>
+          -
+          <el-date-picker v-model="form.endTime"
+                          clearable
+                          placeholder="请选择截止时间"
                           type="date"
                           value-format="yyyy-MM-dd">
           </el-date-picker>
@@ -239,7 +250,7 @@
               :value="dict.regionId"
             />
           </el-select>
-          <el-select v-model="form.municipalCode" placeholder="请选择">
+          <el-select v-model="form.countyCode" placeholder="请选择">
             <el-option
               v-for="dict in countryOptions"
               :key="dict.regionId"
@@ -442,6 +453,7 @@ export default {
         statisticalTime: null,
         provinceCode: null,
         cityCode: null,
+        countyCode:null,
         municipalCode: null,
         weather: null,
         maximumTemperature: null,
@@ -482,7 +494,7 @@ export default {
         cityCode: [
           {required: true, message: "区域市编码不能为空", trigger: "blur"}
         ],
-        municipalCode: [
+        countyCode: [
           {required: true, message: "区域县编码不能为空", trigger: "blur"}
         ],
       }
@@ -527,7 +539,7 @@ export default {
         statisticalTime: null,
         provinceCode: null,
         cityCode: null,
-        municipalCode: null,
+        countyCode: null,
         weather: null,
         maximumTemperature: null,
         minimumTemperature: null,

ruoyi-ui/src/views/system/management/estate/tourism-project/index.vue

@@ -28,6 +28,8 @@
             :value="dict.regionId"
           />
         </el-select>
+      </el-form-item>
+      <el-form-item prop="cityCode">
         <el-select v-model="queryParams.cityCode" placeholder="请选择" @change="getCountry($event)">
           <el-option
             v-for="dict in cityOptions"
@@ -36,7 +38,9 @@
             :value="dict.regionId"
           />
         </el-select>
-        <el-select v-model="queryParams.countyCode" placeholder="请选择">
+      </el-form-item>
+      <el-form-item prop="countyCode">
+      <el-select v-model="queryParams.countyCode" placeholder="请选择">
           <el-option
             v-for="dict in countryOptions"
             :key="dict.regionId"

ruoyi-ui/src/views/system/management/estate/traffic-conditions/index.vue

@@ -99,18 +99,18 @@
         >新增
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['estate:traffic:edit']"
-        >修改
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['estate:traffic:edit']"-->
+<!--        >修改-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"

ruoyi-ui/src/views/system/management/operational-data/environmentData/environmentData/index.vue

@@ -177,7 +177,7 @@
         <el-form-item v-if="!isEdit" label="统计日期" prop="startData">
           <el-date-picker v-model="form.startData"
                           clearable
-                          placeholder="请选开始择时间"
+                          placeholder="请选择开始时间"
                           type="date"
                           value-format="yyyy-MM-dd">
           </el-date-picker>
@@ -203,7 +203,7 @@
             <el-option
               v-for="dict in deviceList"
               :key="dict.value"
-              :label="dict.label"
+              :label="dict.name"
               :value="dict.value"
             />
           </el-select>
@@ -214,7 +214,7 @@
           </el-input>
         </el-form-item>
         <el-form-item label="天气" prop="weather">
-          <el-select v-model="form.weather" clearable placeholder="">
+          <el-select v-model="form.weather" clearable placeholder="请选择天气">
             <el-option
               v-for="dict in dict.type.weather_type"
               :key="dict.value"
@@ -594,7 +594,6 @@ export default {
     handleAdd() {
       this.reset();
       this.isEdit = false
-      this.form.deviceCode = '241',
         this.open = true;
       this.title = "添加环境监测数据 ";
     },

ruoyi-ui/src/views/system/management/tourism-resources/basicResources/tourBasic/index.vue

@@ -597,13 +597,13 @@
               </el-select>
             </el-form-item>
             <el-form-item label="详细地址" prop="address">
-              <el-input v-model="form.geographyInfo.address" placeholder="请输入详细地址"/>
+              <el-input @input="onInput()" v-model="form.geographyInfo.address" placeholder="请输入详细地址"/>
             </el-form-item>
             <el-form-item label="地图坐标" prop="lon">
-              <el-input v-model="form.geographyInfo.lon" placeholder="">
+              <el-input @input="onInput()" v-model="form.geographyInfo.lon" placeholder="">
                 <template slot="prepend">经度</template>
               </el-input>
-              <el-input v-model="form.geographyInfo.lat" placeholder="">
+              <el-input @input="onInput()" v-model="form.geographyInfo.lat" placeholder="">
                 <template slot="prepend">维度</template>
               </el-input>
               <!--              <r-location :isLine="false" :lat.sync="form.geographyInfo.lat" :lng.sync="form.geographyInfo.lon"-->
@@ -633,7 +633,7 @@
               <file-upload v-model="form.graphicInfo.videoUrl" :file-type="['mp4']"></file-upload>
             </el-form-item>
             <el-form-item label="资源简介" prop="introduction">
-              <el-input v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
+              <el-input @input="onInput()" v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
             </el-form-item>
             <el-form-item label="资源描述" prop="resourceDescribe">
               <edit v-model="form.graphicInfo.describe"></edit>
@@ -928,6 +928,8 @@ export default {
           introduction: response.data.introduction,
           describe: response.data.describe
         }
+        this.getCity(response.data.province)
+        this.getCountry(response.data.city)
         this.open = true;
         this.title = "修改旅游场所基础信息";
       });
@@ -969,6 +971,11 @@ export default {
         ...this.queryParams
       }, `tourBasic_${new Date().getTime()}.xlsx`)
     },
+
+    onInput() {
+      this.$forceUpdate();
+    },
+
   }
 };
 </script>

ruoyi-ui/src/views/system/management/tourism-resources/emergencyInfo/emergency/index.vue

@@ -301,13 +301,13 @@
               </el-select>
             </el-form-item>
             <el-form-item label="详细地址" prop="address">
-              <el-input v-model="form.geographyInfo.address" placeholder="请输入详细地址"/>
+              <el-input @input="onInput()" v-model="form.geographyInfo.address" placeholder="请输入详细地址"/>
             </el-form-item>
             <el-form-item label="地图坐标" prop="lon">
-              <el-input v-model="form.geographyInfo.lon" placeholder="">
+              <el-input @input="onInput()" v-model="form.geographyInfo.lon" placeholder="">
                 <template slot="prepend">经度</template>
               </el-input>
-              <el-input v-model="form.geographyInfo.lat" placeholder="">
+              <el-input @input="onInput()" v-model="form.geographyInfo.lat" placeholder="">
                 <template slot="prepend">维度</template>
               </el-input>
 <!--              <r-location :isLine="false" :lat.sync="form.geographyInfo.lat" :lng.sync="form.geographyInfo.lon"-->
@@ -323,7 +323,7 @@
               <image-upload v-model="form.graphicInfo.coverImg"></image-upload>
             </el-form-item>
             <el-form-item label="资源简介" prop="introduction">
-              <el-input v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
+              <el-input @input="onInput()" v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
             </el-form-item>
             <el-form-item label="资源描述" prop="resourceDescribe">
               <edit v-model="form.graphicInfo.resourceDescribe"></edit>
@@ -542,6 +542,8 @@ export default {
           introduction: response.data.introduction,
           resourceDescribe: response.data.resourceDescribe
         }
+        this.getCity(response.data.province)
+        this.getCountry(response.data.city)
         this.open = true;
         this.title = "修改应急场所基础信息 ";
       });

ruoyi-ui/src/views/system/management/tourism-resources/guideInfo/guide/index.vue

@@ -289,7 +289,7 @@
           <image-upload v-model="form.graphicInfo.coverImg"></image-upload>
         </el-form-item>
         <el-form-item label="资源简介" prop="introduction">
-          <el-input v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
+          <el-input @input="onInput()" v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
         </el-form-item>
         <el-form-item label="资源描述" prop="resourceDescribe">
           <edit v-model="form.graphicInfo.resourceDescribe"></edit>

ruoyi-ui/src/views/system/management/tourism-resources/iotInfo/iot/index.vue

@@ -261,7 +261,7 @@
               </el-select>
               <el-select v-if="idType == 'D04'" v-model="form.label" placeholder="请选择">
                 <el-option
-                  v-for="dict in dict.type.video_type"
+                  v-for="dict in dict.type.led_type"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
@@ -279,16 +279,6 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="资源标签" prop="label">
-              <el-select v-model="form.label" clearable placeholder="请选择">
-                <el-option
-                  v-for="dict in dict.type.broadcast_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
             <el-form-item label="规格型号" prop="devModel">
               <el-select v-model="form.devModel" clearable placeholder="请选择">
                 <el-option
@@ -311,10 +301,10 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="地图坐标" prop="lon">
-              <el-input v-model="form.lon" placeholder="">
+              <el-input @input="onInput()" v-model="form.lon" placeholder="">
                 <template slot="prepend">经度</template>
               </el-input>
-              <el-input v-model="form.lat" placeholder="">
+              <el-input @input="onInput()" v-model="form.lat" placeholder="">
                 <template slot="prepend">维度</template>
               </el-input>
 <!--              <r-location :isLine="false" :lat.sync="form.lat" :lng.sync="form.lon"-->
@@ -330,7 +320,7 @@
               <image-upload v-model="form.graphicInfo.imageUrl"></image-upload>
             </el-form-item>
             <el-form-item label="资源简介" prop="introduction">
-              <el-input v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
+              <el-input @input="onInput()" v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
             </el-form-item>
             <el-form-item label="资源描述" prop="resourceDescribe">
               <edit v-model="form.graphicInfo.resourceDescribe"></edit>
@@ -517,6 +507,7 @@ export default {
           introduction: response.data.introduction,
           resourceDescribe: response.data.resourceDescribe
         }
+
         this.open = true;
         this.title = "修改物联设备基础信息 ";
       });

ruoyi-ui/src/views/system/management/tourism-resources/publicserviceInfo/publicservice/index.vue

@@ -395,13 +395,13 @@
               </el-select>
             </el-form-item>
             <el-form-item label="详细地址" prop="address">
-              <el-input v-model="form.geographyInfo.address" placeholder="请输入详细地址"/>
+              <el-input @input="onInput()" v-model="form.geographyInfo.address" placeholder="请输入详细地址"/>
             </el-form-item>
             <el-form-item label="地图坐标" prop="lon">
-              <el-input v-model="form.geographyInfo.lon" placeholder="">
+              <el-input @input="onInput()" v-model="form.geographyInfo.lon" placeholder="">
                 <template slot="prepend">经度</template>
               </el-input>
-              <el-input v-model="form.geographyInfo.lat" placeholder="">
+              <el-input @input="onInput()" v-model="form.geographyInfo.lat" placeholder="">
                 <template slot="prepend">维度</template>
               </el-input>
               <!--              <r-location :isLine="false" :lat.sync="form.geographyInfo.lat" :lng.sync="form.geographyInfo.lon"-->
@@ -422,7 +422,7 @@
               <image-upload v-model="form.graphicInfo.planImg"></image-upload>
             </el-form-item>
             <el-form-item label="资源简介" prop="introduction">
-              <el-input v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
+              <el-input @input="onInput()" v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
             </el-form-item>
             <el-form-item label="资源描述" prop="resourceDescribe">
               <edit v-model="form.graphicInfo.resourceDescribe"></edit>
@@ -676,6 +676,8 @@ export default {
           introduction: response.data.introduction,
           resourceDescribe: response.data.resourceDescribe
         }
+        this.getCity(response.data.province)
+        this.getCountry(response.data.city)
         this.open = true;
         this.title = "修改公共服务基础信息 ";
       });

ruoyi-ui/src/views/system/management/tourism-resources/touristInfo/tourist/index.vue

@@ -380,13 +380,13 @@
               </el-select>
             </el-form-item>
             <el-form-item label="详细地址" prop="address">
-              <el-input v-model="form.geographyInfo.address" placeholder="请输入详细地址"/>
+              <el-input @input="onInput()" v-model="form.geographyInfo.address" placeholder="请输入详细地址"/>
             </el-form-item>
             <el-form-item label="地图坐标" prop="lon">
-              <el-input v-model="form.geographyInfo.lon" placeholder="">
+              <el-input @input="onInput()" v-model="form.geographyInfo.lon" placeholder="">
                 <template slot="prepend">经度</template>
               </el-input>
-              <el-input v-model="form.geographyInfo.lat" placeholder="">
+              <el-input @input="onInput()" v-model="form.geographyInfo.lat" placeholder="">
                 <template slot="prepend">维度</template>
               </el-input>
               <!--              <r-location :isLine="false" :lat.sync="form.geographyInfo.lat" :lng.sync="form.geographyInfo.lon"-->
@@ -413,7 +413,7 @@
             </el-form-item>
 
             <el-form-item label="资源简介" prop="introduction">
-              <el-input v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
+              <el-input @input="onInput()" v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
             </el-form-item>
             <el-form-item label="资源描述" prop="resourceDescribe">
               <edit v-model="form.graphicInfo.resourceDescribe"></edit>
@@ -676,6 +676,8 @@ export default {
           introduction: response.data.introduction,
           resourceDescribe: response.data.resourceDescribe
         }
+        this.getCity(response.data.province)
+        this.getCountry(response.data.city)
         this.open = true;
         this.title = "修改游客服务基础信息 ";
       });

ruoyi-ui/src/views/system/management/tourism-resources/utils/resources.js

@@ -475,7 +475,11 @@ export default {
           this.region = publicArr
         }
       })
-    }
+    },
+
+    onInput() {
+      this.$forceUpdate();
+    },
   }
 }
 

ruoyi-ui/src/views/system/management/tourism-resources/vehicleInfo/vehicle/index.vue

@@ -309,7 +309,7 @@
               <image-upload v-model="form.graphicInfo.coverImg"></image-upload>
             </el-form-item>
             <el-form-item label="资源简介" prop="introduction">
-              <el-input v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
+              <el-input @input="onInput()" v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
             </el-form-item>
             <el-form-item label="资源描述" prop="resourceDescribe">
               <edit v-model="form.graphicInfo.resourceDescribe"></edit>

ruoyi-ui/src/views/system/management/tourism-resources/venueInfo/venue/index.vue

@@ -436,13 +436,13 @@
               </el-select>
             </el-form-item>
             <el-form-item label="详细地址" prop="address">
-              <el-input v-model="form.geographyInfo.address" placeholder="请输入详细地址"/>
+              <el-input @input="onInput()" v-model="form.geographyInfo.address" placeholder="请输入详细地址"/>
             </el-form-item>
             <el-form-item label="地图坐标" prop="lon">
-              <el-input v-model="form.geographyInfo.lon" placeholder="">
+              <el-input @input="onInput()" v-model="form.geographyInfo.lon" placeholder="">
                 <template slot="prepend">经度</template>
               </el-input>
-              <el-input v-model="form.geographyInfo.lat" placeholder="">
+              <el-input @input="onInput()" v-model="form.geographyInfo.lat" placeholder="">
                 <template slot="prepend">维度</template>
               </el-input>
               <!--              <r-location :isLine="false" :lat.sync="form.geographyInfo.lat" :lng.sync="form.geographyInfo.lon"-->
@@ -471,7 +471,7 @@
               <file-upload v-model="form.graphicInfo.videoUrl" :file-type="['mp4']"></file-upload>
             </el-form-item>
             <el-form-item label="资源简介" prop="introduction">
-              <el-input v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
+              <el-input @input="onInput()" v-model="form.graphicInfo.introduction" placeholder="请输入内容" type="textarea"/>
             </el-form-item>
             <el-form-item label="资源描述" prop="resourceDescribe">
               <edit v-model="form.graphicInfo.resourceDescribe"></edit>
@@ -725,6 +725,8 @@ export default {
           introduction: response.data.introduction,
           resourceDescribe: response.data.resourceDescribe
         }
+        this.getCity(response.data.province)
+        this.getCountry(response.data.city)
         this.open = true;
         this.title = "修改文化场馆基础信息 ";
       });

ruoyi-ui/vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8080/`,//用户名:admin 密码CJYjqgk@2023!
-        target: `http://39.105.17.128:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023!
+        target: `http://localhost:8080/`,//用户名:admin 密码CJYjqgk@2023!
+        // target: `http://39.105.17.128:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023!
         // target: `http://192.168.0.229:8080/`,//用户名:admin 密码Cjy@123abc
         changeOrigin: true,
         pathRewrite: {