地图组件需要调整

ruoyi-ui/src/components/CommonComponents/PublicCoponents/transfer/Transfers.vue

@@ -251,8 +251,8 @@ export default {
         this.addPublicArr.forEach(item => {
           this.selectedData.push(item)
           this.userList.push(item.userId)
-          this.noSelectData.splice(item, 1)
         })
+        this.noSelectData = this.noSelectData.filter(v=>!this.addPublicArr.includes(v))
         if (this.groupType == 4) {
           this.$nextTick(() => {
             let params = {
@@ -290,8 +290,9 @@ export default {
         this.removePublicArr.forEach(item => {
           this.noSelectData.push(item)
           this.ids.push(item.id)
-          this.selectedData.splice(item, 1)
         })
+        this.selectedData = this.selectedData.filter(v=>!this.removePublicArr.includes(v))
+
         if (this.groupType == 4) {
           this.$nextTick(() => {
             let ids = this.ids.join(',')

ruoyi-ui/src/components/ImageUpload/index.vue

@@ -98,6 +98,7 @@ export default {
     value: {
       handler(val) {
         // debugger
+        console.log(this.baseUrl)
         if (val!=='' && val!==undefined && val!==null) {
           // 首先将值转为数组
           const list = Array.isArray(val) ? val : this.value.split(',');
@@ -112,6 +113,7 @@ export default {
             }
             return item;
           });
+          console.log(this.baseUrl,this.fileList,'00---000')
         } else {
           this.fileList = [];
           return [];

ruoyi-ui/src/views/system/management/attraction/index.vue

@@ -469,7 +469,6 @@ export default {
     },
     /** 根据资源类型查询相应数据*/
     getResourceListByResourceType(type){
-      debugger
       getResourceListByResourceType(type).then(res =>{
          this.resourceList = res.data
       })

ruoyi-ui/src/views/system/management/electronic-patrol/patrol-task/index.vue

@@ -116,7 +116,7 @@
           >{{ scope.row.taskState == 1 ? '开始任务' : scope.row.taskState == 3 ? '开始任务' : '停止任务' }}
           </el-button>
           <el-button
-            v-if="scope.row.taskState==2"
+            v-if="scope.row.taskState==2&&scope.row.patrolType==2"
             v-hasPermi="['patrol:patrolTask:edit']"
             size="mini"
             type="text"

ruoyi-ui/src/views/system/management/emergency-command/info/index.vue

@@ -85,7 +85,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="警源类型" prop="alarmSource">
-              <el-select v-model="queryParams.alarmSource" placeholder="请选择警情分类">
+              <el-select v-model="queryParams.alarmSource" placeholder="请选择警源类型">
                 <el-option
                   v-for="item in alarmSourceOptions"
                   :key="item.classificationCode"
@@ -180,7 +180,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="警源类型" prop="alarmSource">
-              <el-select v-model="queryParams.alarmSource" placeholder="请选择警情分类">
+              <el-select v-model="queryParams.alarmSource" placeholder="请选择警源类型">
                 <el-option
                   v-for="item in alarmSourceOptions"
                   :key="item.classificationCode"

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

@@ -70,7 +70,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="数据来源" prop="dataSource">
-        <el-select v-model="queryParams.dataSource" clearable placeholder="舒适度">
+        <el-select v-model="queryParams.dataSource" clearable placeholder="请选择数据来源">
           <el-option
             v-for="dict in dict.type.data_sources"
             :key="dict.value"

ruoyi-ui/src/views/system/management/marketing-data/exhibits-browse/index.vue

@@ -225,8 +225,8 @@
                             clearable
                             disabled=""
                             placeholder=""
-                            type="date"
+                            type="datetime"
-                            value-format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd HH:mm:ss"
             >
             </el-date-picker>
           </el-form-item>

ruoyi-ui/src/views/system/management/marketing-data/info/index.vue

@@ -179,8 +179,8 @@
                           clearable
                           disabled=""
                           placeholder="请选择"
-                          type="datetime"
+                          type="date"
-                          value-format="yyyy-MM-dd HH:mm:ss"
+                          value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>

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

@@ -401,7 +401,7 @@ export default {
       // 表单参数
       form: {
         graphicInfo: {
-          imageUrl: null,
+          coverImg: null,
           introduction: null,
           resourceDescribe: null
         }
@@ -534,7 +534,7 @@ export default {
       getIot(id,type).then(response => {
         this.form = response.data;
         this.form.graphicInfo = {
-          imageUrl: response.data.coverImg,
+          coverImg: response.data.coverImg,
           introduction: response.data.introduction,
           resourceDescribe: response.data.resourceDescribe
         }

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

@@ -389,7 +389,8 @@
               <image-upload :file-size="5" v-model="form.geographyInfo.mapIcon"></image-upload>
             </el-form-item>
             <el-form-item :label="idType=='F02'||idType=='F03'||idType=='F04'||idType=='F10'||idType=='F11'||idType=='F12'?'封面图片':'图片'" >
-              <image-upload :file-size="5" v-model="form.graphicInfo.imageUrl"></image-upload>
+              <image-upload v-if="idType=='F02'||idType=='F03'||idType=='F04'||idType=='F10'||idType=='F11'||idType=='F12'" :file-size="5" v-model="form.graphicInfo.coverImg"></image-upload>
+              <image-upload v-else :file-size="5" v-model="form.graphicInfo.imageUrl"></image-upload>
             </el-form-item>
 
             <el-form-item v-if="idType == 'F01'||idType == 'F14'||idType == 'F15'||idType == 'F16'" label="语音讲解"
@@ -499,6 +500,7 @@ export default {
           mapIcon: null
         },
         graphicInfo: {
+          coverImg:null,
           imageUrl: null,
           mp3Url: null,
           videoUrl: null,
@@ -699,6 +701,7 @@ export default {
         }
         this.form.graphicInfo = {
           imageUrl: response.data.imageUrl,
+          coverImg: response.data.coverImg,
           mp3Url: response.data.mp3Url,
           videoUrl: response.data.videoUrl,
           introduction: response.data.introduction,

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

@@ -31,7 +31,7 @@
                          class="m-tree-select"
                          placeholder="请选择"/>
           </el-form-item>
-          <el-form-item label="内部区域" prop="insideArea">
+          <el-form-item class="zi-ding-yi-select" label="内部区域" prop="insideArea">
             <!--            <el-popover-->
             <!--              placement="bottom"-->
             <!--              trigger="click"-->
@@ -865,4 +865,8 @@ export default {
   color: #ff4949;
   margin-right: 4px;
 }
+
+.zi-ding-yi-select ::v-deep .vue-treeselect__control{
+  width: unset!important;
+}
 </style>