Merge branch 'onemap_zmg' of http://47.103.92.60:3003/skyversation/qp_onemap_ui into MicroFunction

# Conflicts:
#	src/views/skmh/index.vue

src/components/yygl/editManage.vue

@@ -5,7 +5,7 @@
       v-model="isDialogShow"
       width="650px"
       top="7%"
-      title="内容编辑"
+      title="申请账号"
       :close-on-click-modal="false"
       :before-close="dialogBeforeClose"
       style="overflow: auto; height: 700px"
@@ -51,22 +51,22 @@
             >
           </template>
 
-          <!--文本内容-->
+          <!--文本内容  formItem.describe-->
           <el-input
             v-if="['varchar', 'content', 'text'].indexOf(formItem.frontType) > -1"
             v-model="dataForm[formItem.name]"
             :type="formItem.name == 'password' ? 'password' : 'text'"
-            :placeholder="formItem.describe"
+            :placeholder="`请输入${formItem.alias}`"
             :disabled="isView"
           />
-          <!--日期时间-->
+          <!--日期时间  formItem.describe-->
           <span v-else-if="['date_time'].indexOf(formItem.frontType) > -1">
             <el-date-picker
               v-if="!isView"
               type="datetime"
               v-model="dataForm[formItem.name]"
               value-format="x"
-              :placeholder="formItem.describe"
+              :placeholder="`请输入${formItem.alias}`"
             />
             <span v-else>{{
               dataForm[formItem.name] == "" ||
@@ -77,25 +77,25 @@
             }}</span>
           </span>
 
-          <!--整数类型-->
+          <!--整数类型  formItem.describe-->
           <el-input-number
             v-if="['int_num'].indexOf(formItem.frontType) > -1"
             style="width: 80%"
             v-model="dataForm[formItem.name]"
-            :placeholder="formItem.describe"
+            :placeholder="`请输入${formItem.alias}`"
             :disabled="isView"
           />
-          <!--浮点类型-->
+          <!--浮点类型  formItem.describe-->
           <el-input-number
             v-if="['float_num'].indexOf(formItem.frontType) > -1"
             :min="formItem.min"
             :max="formItem.max"
             style="width: 80%"
             v-model="dataForm[formItem.name]"
-            :placeholder="formItem.describe"
+            :placeholder="`请输入${formItem.alias}`"
             :disabled="isView"
           />
-          <!--布尔类型-->
+          <!--布尔类型  formItem.describe-->
           <span v-if="['boolean'].indexOf(formItem.frontType) > -1">
             <el-switch
               :active-text="'true'"
@@ -111,7 +111,7 @@
                 margin-left: 8px;
               "
             >
-              [{{ formItem.describe }}]
+              [{{ formItem.alias }}]
             </span>
           </span>
 
@@ -143,12 +143,12 @@
               {{ item.name }}
             </el-checkbox>
           </el-checkbox-group>
-          <!--类别-->
+          <!--类别 formItem.describe-->
           <el-select
             clearable
             v-if="['select'].indexOf(formItem.frontType) > -1"
             v-model="dataForm[formItem.name]"
-            :placeholder="formItem.describe"
+            :placeholder="`请输入${formItem.alias}`"
             :disabled="isView"
           >
             <el-option
@@ -224,7 +224,7 @@
             </template>
           </el-cascader>
 
-          <!-- 经纬度、点、线、面选择-->
+          <!-- 经纬度、点、线、面选择 formItem.describe-->
           <span
             v-if="
               [
@@ -259,11 +259,11 @@
                 margin-left: 5px;
               "
             >
-              {{ formItem.describe }}
+              {{ formItem.alias }}
             </span>
           </span>
 
-          <!--文件/图片/音频/视频-->
+          <!--文件/图片/音频/视频 formItem.describe-->
           <span
             v-if="['files', 'picture', 'video', 'audio'].indexOf(formItem.frontType) > -1"
           >
@@ -321,13 +321,13 @@
                   class="el-upload__tip"
                   style="display: inline-block; margin-left: 10px"
                 >
-                  {{ formItem.describe }}
+                  {{ formItem.alias }}
                 </span>
               </template>
             </el-upload>
           </span>
 
-          <!--带地理位置的图片、音频、视频-->
+          <!--带地理位置的图片、音频、视频 formItem.describe-->
           <span
             v-if="
               ['picture_location', 'audio_location', 'video_location'].indexOf(
@@ -384,7 +384,7 @@
                   class="el-upload__tip"
                   style="display: inline-block; margin-left: 10px"
                 >
-                  {{ formItem.describe }}
+                  {{ formItem.alias }}
                 </span>
               </template>
             </el-upload>
@@ -594,6 +594,7 @@ export default {
       } else if (["select", "multiple_select"].indexOf(obj.frontType) > -1) {
         this.getCheckItems(obj, 2);
       }
+      console.log("=========="+obj);
       this.modelFieldList.push(obj);
     }
     // 有序

src/views/rwgl/Index.vue

@@ -165,7 +165,7 @@
                 >
                   下载结果
                 </el-button>
-                <el-button type="primary" @click="preView(scope.row.main_c_file)">
+                <el-button type="primary" v-if="scope.row.main_c_file.includes('.json') || scope.row.main_c_file.includes('.geojson') || scope.row.main_c_file.includes('.xlsx') || scope.row.main_c_file.includes('.xls')" @click="preView(scope.row.main_c_file)">
                   预览结果
                 </el-button>
               </template>

src/views/skmh/index.vue

@@ -32,17 +32,17 @@
     <div class="server_list_box">
       <div class="server_list_box_table">
         <div
-          v-for="(item, index) in dataList[0].data"
+          v-for="item in dataList"
           :key="item.index"
           class="server_list_box_table_item"
           :id="item.index + 'list'"
         >
           <div class="server_list_box_table_item_content">
             <div class="server_list_box_table_item_content_title">{{ item.title }}</div>
-            <div class="server_list_box_table_item_content_text">{{ item.text }}</div>
+            <div class="server_list_box_table_item_content_text">{{ item.content }}</div>
             <div class="server_list_box_table_item_content_button_box">
               <div
-                v-if="index < 4"
+                v-if="item.c_url"
                 class="server_list_box_table_item_content_button_box_item"
                 @click.stop="handleOpenPage(item)"
               >
@@ -56,7 +56,7 @@
           <div class="server_list_box_table_item_image">
             <el-image
               style="width: 690px; height: 410px"
-              :src="item.picture"
+              :src="curUrl + item.c_picture"
               fit="cover"
             />
           </div>
@@ -236,9 +236,11 @@ export default {
       dataVolumeChart: null,
       comparisonChart: null,
       centerDialogVisible: false,
+      curUrl: systemConfig.dmsDataProxy,
       videoUrl: "",
       imageUrl: "static/images/wgn_title.png",
-      dataList: systemConfig.examplelist,
+      // dataList:systemConfig.examplelist,
+      dataList: [],
       countData: {
         total: {
           service: 0,
@@ -292,7 +294,7 @@ export default {
     },
   },
   mounted() {
-    // this.initData()
+    this.initData();
     // window.addEventListener('resize', this.handleResize)
   },
   beforeUnmount() {
@@ -301,9 +303,10 @@ export default {
   },
   methods: {
     initData() {
-      this.getTimeRange();
-      this.getCountUserDataByAutoTime();
-      this.getDmsDataList();
+      // this.getTimeRange();
+      // this.getCountUserDataByAutoTime();
+      // this.getDmsDataList();
+      this.getDmsAppDataList();
     },
     getTimeRange() {
       this.getTotalCountGroupByTime();
@@ -311,7 +314,7 @@ export default {
       this.getCoutService();
     },
     openVideo(param) {
-      console.log(param);
+      // console.log(param)
       this.videoUrl = param.url;
       this.centerDialogVisible = true;
     },
@@ -320,8 +323,8 @@ export default {
       this.centerDialogVisible = false;
     },
     handleOpenPage(item) {
-      if (item.url) {
-        window.open(item.url, "_blank");
+      if (item.c_url) {
+        window.open(item.c_url, "_blank");
       } else {
         ElNotification.success({
           title: "提示",
@@ -330,6 +333,34 @@ export default {
         });
       }
     },
+    // 应用中心数据
+    getDmsAppDataList() {
+      let that = this;
+      let requestParams = {
+        columnId: systemConfig.columnIds[1], // 应用中心栏目id
+        states: 0,
+        orderBy: JSON.stringify([{ field: "frame_time", orderByType: 2 }]),
+        pageSize: 9999,
+        page: 0,
+      };
+      let rest = [];
+      appCenter.getDmsDataList(requestParams).then((res) => {
+        if (res.code === 200) {
+          let arr = res.content.data.map((item) => ({
+            ...item,
+            createTime: moment(item.create_time).format("YYYY-MM-DD HH:mm:ss"),
+          }));
+          arr.forEach((item) => {
+            if (item.apptags.includes("2")) {
+              rest.push(item);
+            }
+          });
+          that.dataList = rest.sort((a, b) => a.create_time - b.create_time);
+          console.log(that.dataList);
+        }
+      });
+    },
+
     getDmsDataList() {
       let requestParams = {
         columnId: systemConfig.columnIds[2], // 应用中心栏目id（示范应用）