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

public/static/config/config.js

@@ -10,7 +10,7 @@ let systemConfig = {
     * 模型id如下
       1667（应用中心模型id）            1780 政务网  1667 互联网
       1690（用户登录模型id）            1777 政务网  1690 互联网
-      1677（微功能服务模型id）          1787 政务网  1677 互联网
+      1677（微功能服务模型id）          1783 政务网  1677 互联网
       1673（任务模型id）                1785 政务网  1673 互联网
       1780（用户反馈模型id）            2154 政务网  1780 互联网
     * 栏目id如下
@@ -28,7 +28,7 @@ let systemConfig = {
   // modelIds: [1667, 1690, 1677, 1673,1780],
   // columnIds: [1657, 1659, 1666, 1676, 1665, 1651, 1662,1736],
   // 政务网环境
-  modelIds: [1780, 1777, 1787, 1785,2154],
+  modelIds: [1780, 1777, 1783, 1785, 2154],
   columnIds: [2429, 2428, 2426, 2425, 2430, 2432, 2431, 2840],
 
   preCountDmsId: 2436,  // 政务网 2436  互联网 1652

src/App.vue

@@ -96,7 +96,7 @@ export default {
             }
           })
           .catch((err) => {
-            console.log(err);
+            // console.log(err);
             that.$message({
               type: "error",
               message: "服务器忙碌，请稍后重试！",

src/components/AppVue/UserFeek.vue

@@ -117,20 +117,22 @@ export default {
       let app = this;
       app.$refs["toUserFeekForm"].validate((valid) => {
         if (valid) {
+          let content = {
+            title: that.toUserFeek.title,
+            content: that.toUserFeek.content,
+            c_c_fkxx: that.toUserFeek,
+          };
+
           let params = {
-            content: JSON.stringify(that.toUserFeek),
+            content: JSON.stringify(content),
             columnId: that.columnId,
-            modelId: that.modelId
+            modelId: that.modelId,
           };
-           // content: {"title":"tt","content":"ttt","c_fkxx":"ttt"}
-          // columnId: 1736
-          // modelId: 1780
-
-          api.addContent(params).then((res) => {
+          api.addContent(params).then(async (res) => {
             if (res.code == 200) {
               that.$message({
                 type: "success",
-                message: "提交成功",
+                message: "成功",
               });
               that.userFeekVisible = false;
             } else {
@@ -153,7 +155,8 @@ export default {
   .user-feek-icon {
     position: fixed;
     right: 10px;
-    top: 120px;
+    // top: 120px;
+    bottom: 20px;
     width: 50px;
     height: 50px;
     line-height: 50px;

src/components/filePreview/viewPreview.vue

@@ -63,7 +63,7 @@ export default {
   mounted() {
     const queryParams = new URLSearchParams(window.location.search);
     let url = queryParams.get("url");
-    console.log(queryParams.get("url")); // 输出: value1
+    // console.log(queryParams.get("url")); // 输出: value1
     if (url) {
       let arr = url.split(".");
       let type = arr[arr.length - 1];
@@ -323,7 +323,7 @@ export default {
     // 添加点到地图中
     addPoint(coordinates, featureProperties = null, featureRefInfo = null) {
       // 1. 解析点的坐标
-      console.log("addPoint coordinates", coordinates);
+      // console.log("addPoint coordinates", coordinates);
       // 2. 创建点实体
       const pointEntity = viewer.entities.add({
         name: "point",
@@ -347,7 +347,7 @@ export default {
     // 添加线到地图中
     addLine(coordinates, featureProperties = null, featureRefInfo = null) {
       // 1. 解析线的坐标
-      console.log("addLine coordinates", coordinates);
+      // console.log("addLine coordinates", coordinates);
       // 2. 处理坐标格式：如果是二维数组则取第一个元素，否则直接使用
       const lineCoordinates =
         Array.isArray(coordinates[0]) && Array.isArray(coordinates[0][0])
@@ -405,7 +405,7 @@ export default {
         Array.isArray(coordinates[0][0]) &&
         Array.isArray(coordinates[0][0][0])
       ) {
-        console.log("MultiPolygon coordinates", coordinates);
+        // console.log("MultiPolygon coordinates", coordinates);
         // 是MultiPolygon类型，遍历每个Polygon
         coordinates.forEach((polygonCoordinates) => {
           this.renderSinglePolygon(polygonCoordinates, featureProperties, featureRefInfo);
@@ -650,7 +650,7 @@ export default {
       })
         .then((response) => response.json()) // 假设服务器返回 JSON 数据
         .then((data) => {
-          console.log("[ eee ] >");
+          // console.log("[ eee ] >");
           that.dataJson = data;
           that.closeWin();
           that.dwanMap();

src/components/yygl/editManage.vue

@@ -33,13 +33,33 @@
           </template>
 
           <!--文本内容  formItem.describe-->
-          <el-input
+
+           <el-input
+              v-if="['varchar', 'content', 'text'].indexOf(formItem.frontType) > -1"
+              v-model="dataForm[formItem.name]"
+              :type="formItem.itemType == 'password' ? 'password' : 'text'"
+              :placeholder="`请输入${formItem.alias}`"
+              :disabled="isView"
+            >
+              <!-- 后缀插槽：放置眼睛图标 -->
+              <template #suffix v-if="formItem.name == 'password'">
+                <el-icon
+                  class="cursor-pointer"
+                  @click="togglePassword(formItem)"
+                >
+                  <View v-if="showPassword" />
+                  <Hide v-else />
+                </el-icon>
+              </template>
+            </el-input>
+
+          <!-- <el-input
             v-if="['varchar', 'content', 'text'].indexOf(formItem.frontType) > -1"
             v-model="dataForm[formItem.name]"
             :type="formItem.name == 'password' ? 'password' : 'text'"
             :placeholder="`请输入${formItem.alias}`"
             :disabled="isView"
-          />
+          /> -->
           <!--日期时间  formItem.describe-->
           <span v-else-if="['date_time'].indexOf(formItem.frontType) > -1">
             <el-date-picker
@@ -482,7 +502,7 @@ export default {
       },
       modelFieldList: [],
       itemLists: {},
-
+      showPassword: false,
       map: {},
       currMapItem: {},
       isMapShow: true,
@@ -534,6 +554,7 @@ export default {
         this.getCheckItems(obj, 2);
       }
       console.log("==========" + obj);
+      obj.itemType = obj.name;
       this.modelFieldList.push(obj);
     }
     // 有序
@@ -657,6 +678,14 @@ export default {
       await navigator.clipboard.writeText(JSON.stringify(that.geoJsons));
       this.$message({ message: "复制成功", type: "success" });
     },
+    togglePassword(formItem) {
+      if(this.showPassword){
+        formItem.itemType = "password";
+      }else{
+        formItem.itemType = "text";
+      }
+      this.showPassword = !this.showPassword;
+    },
     changeValue(json) {
       let that = this;
       let Icon = L.divIcon({
@@ -1295,7 +1324,7 @@ export default {
       let that = this;
       this.$refs.dataForm.validate((valid) => {
         if (valid) {
-          console.log("[ eeeee ] >");
+          // console.log("[ eeeee ] >");
           let content = {};
           content["id"] = that.dataForm["id"];
           content["title"] = that.dataForm["title"];
@@ -1352,7 +1381,7 @@ export default {
                     that.column.modelId == systemConfig.modelIds[1]
                   ) {
                     //指定 一张图登录栏目 申请账号时使用判断
-                    message = "申请成功！请等待三个工作日后，管理员审核通过后，您才能登录系统。";
+                    message = "申请成功！请等待三个工作日内，管理员审核通过后，您才能登录系统。";
                   }
                   that.$message({ message: message, type: "success" });
                 } else {
@@ -1368,7 +1397,7 @@ export default {
     },
     getCheckItems(item, type) {
       let that = this;
-      console.log("[ eee ] >");
+      // console.log("[ eee ] >");
       if (type === 1) {
         api.getCheckDetail({ sName: item.extendId }).then((res) => {
           if (res.code == 200) {

src/views/HomePage.vue

@@ -620,6 +620,7 @@ import {
   topUnit,
   totalCount,
   totalCountGroupByTime,
+  mapServiceCount,
 } from "@/api/count";
 import * as echarts from "echarts";
 import moment from "moment";
@@ -813,6 +814,7 @@ export default {
     this.pullTopUnit();
     this.pullTopService();
     this.pullMultiTimeRangeCall();
+    this.pullMapServiceCount();
     this.pullUserCount();
     window.addEventListener("scroll", this.handleScroll, true);
   },
@@ -1252,6 +1254,14 @@ export default {
       // this.seasonCall = 6635991;
       // this.yearCall = 16596630;
     },
+
+    async pullMapServiceCount() {
+      let start = "2000-01-01 00:00:00"; // 从2000年1月1日开始
+      let end = moment(new Date()).format("YYYY-MM-DD 23:59:59"); // 到当前一天结束时间
+      let data = await mapServiceCount(start, end);
+      // console.log("======pullMapServiceCount====="+data);
+    },
+
     async pullTotalCountByDays(days) {
       const nowDate = new Date();
       nowDate.setHours(0, 0, 0, 0);

src/views/Sksjglyl.vue

@@ -54,13 +54,13 @@ export default {
   },
   methods: {
     changePanel(active) {
-      console.log("========"+active);
+      // console.log("========"+active);
       this.activeName = parseInt(active);
       this.nowFuncContent = this.funcList[this.activeName - 1];
       this.iframeSrc = this.nowFuncContent.url;
     },
     handleClick(tab) {
-      console.log("========"+tab);
+      // console.log("========"+tab);
       this.iframeSrc = this.funcList.find(item => item.label == tab.label).url;
       this.activeName = tab.type;
     },

src/views/Yxgl.vue

@@ -71,10 +71,10 @@ export default {
   mounted() {},
   methods: {
     handleOpen(key, keyPath) {
-      console.log(key, keyPath);
+      // console.log(key, keyPath);
     },
     handleClose(key, keyPath) {
-      console.log(key, keyPath);
+      // console.log(key, keyPath);
     },
     changeMenu(key, keyPath) {
       this.menuActive = key;

src/views/skmh/index.vue

@@ -356,7 +356,7 @@ export default {
             }
           });
           that.dataList = rest.sort((a, b) => a.create_time - b.create_time);
-          console.log(that.dataList);
+          // console.log(that.dataList);
         }
       });
     },
@@ -549,7 +549,7 @@ export default {
       const end = new Date();
       const start = new Date();
       start.setDate(start.getDate() - (param - 1));
-      console.log(start, end);
+      // console.log(start, end);
       this.fromTime.date = [start, end];
       this.getTimeRange();
     },

src/views/wgn/sksj/index.vue

@@ -127,7 +127,7 @@ export default {
       reader.readAsText(that.fileList[0].raw, "UTF-8");
       reader.onload = (evt) => {
         that.dataJson = JSON.parse(evt.target.result);
-        console.log(that.dataJson); // 输出解析后的JSON数据
+        // console.log(that.dataJson); // 输出解析后的JSON数据
         ElMessage({
           type: "success",
           message: `文件处理成功，请解析上图展示`,
@@ -364,14 +364,14 @@ export default {
       })
         .then((response) => response.json()) // 假设服务器返回 JSON 数据
         .then((data) => {
-          console.log("[ eee ] >");
+          // console.log("[ eee ] >");
           that.dataJson = data.result;
           that.closeWin();
           that.dwanMap();
         });
     },
     add3dtilesData(param) {
-      console.log("[ add3dtilesData ] >" + param);
+      // console.log("[ add3dtilesData ] >" + param);
       let tile1 = new SkyScenery.add3DTilesData(param.url, viewer);
       tile1.readyPromise.then(function (tileset) {
         viewer.zoomTo(tile1);
@@ -410,7 +410,7 @@ export default {
           message: `输入地址不能为空！请输入地址后进行解析`,
         });
       }
-      console.log("[ eee ] >");
+      // console.log("[ eee ] >");
       //  typeValue:'1',
       // inputAddress:'',
 

src/views/yxgl/StatisticalAnalysis.vue

@@ -458,7 +458,7 @@ export default {
     },
     // 筛选条件下拉框选中值改变时，触发的事件
     changeSelectModel() {
-      console.log(this.selectedModel);
+      // console.log(this.selectedModel);
       // 重置当前页码为第一页
       this.currentPage = 1;
       // 处理分页数据
@@ -726,35 +726,30 @@ export default {
       this.dataToOption("数据质量评分", "radar", null, null);
     },
     getColumnCount() {
-      //  this.$moment(new Date(this.nowTimes[0])).format("YYYY-MM-DD 00:00:00"),
-      //       this.$moment(new Date(this.nowTimes[1])).format("YYYY-MM-DD 23:59:59"),
       let param = {
-          start: "2000-01-01",
+          start: this.$moment(new Date(this.nowTimes[0])).format("YYYY-MM-DD"),
           end: this.$moment(new Date(this.nowTimes[1])).format("YYYY-MM-DD"),
         };
         countlmType(param.start, param.end).then((res) => {
-          console.log("========栏目统计分布=========", res);
+        //    let columnDatas = [
+        //   {count: 3, service_name: "任务"},
+        //   {count: 5, service_name: "反馈信息"},
+        //   {count: 7, service_name: "其它"},
+        // ];
+          if (res.length > 0) {
+              this.dataToOption("栏目统计分布", "pie", [...res], {
+                pieKey: { value: "count", name: "service_name" },
+                pieData: [],
+                legend: {
+                  bottom: 10,
+                },
+                radius: "60%",
+                padAngle: 0,
+                borderRadius: 0,
+                label: {},
+              });
+          }
         })
-        let columnDatas = [
-          {count: 3, service_name: "任务"},
-          {count: 5, service_name: "反馈信息"},
-          {count: 7, service_name: "其它"},
-        ];
-
-        //   console.log("========栏目统计分布=========", res.content.dataTypes);
-        if (columnDatas && columnDatas.length > 0) {
-          this.dataToOption("栏目统计分布", "pie", [...columnDatas], {
-            pieKey: { value: "count", name: "service_name" },
-            pieData: [],
-            legend: {
-              bottom: 10,
-            },
-            radius: "60%",
-            padAngle: 0,
-            borderRadius: 0,
-            label: {},
-          });
-        }
     },
     // 导出所选时间范围内的所有服务数据
     downFileAllServiceDatas() {

src/views/yygl/appCenter.vue

@@ -59,7 +59,7 @@ export default {
   },
   methods: {
     handleMenuClick(value) {
-      console.log(value);
+      // console.log(value);
       this.menuValue = value;
     },
   },

src/views/yygl/index.vue

@@ -197,7 +197,7 @@ export default {
               }
             });
           });
-          console.log(this.appCenterlications);
+          // console.log(this.appCenterlications);
         } else {
           this.appCenterlications = [];
         }

src/views/yygl/manage/index.vue

@@ -247,7 +247,7 @@ export default {
     },
     // 新增应用
     handleAddClick() {
-      console.log(this.columnModel);
+      // console.log(this.columnModel);
       this.isContentShow = true;
     },
     // 处理分页变化
@@ -285,7 +285,7 @@ export default {
         columnId: item.column_id,
         contentId: item.id,
       };
-      console.log(item);
+      // console.log(item);
       appCenter.getContentById(requestParams).then((data) => {
         if (data.code === 200) {
           that.contentItem = data.content;
@@ -458,7 +458,7 @@ export default {
             phone: this.formatPhoneNumber(item.phone),
           }));
           this.applications = this.itemApplications;
-          console.log("========"+this.itemApplications);
+          // console.log("========"+this.itemApplications);
         } else {
           this.total = 0;
           this.applications = [];

src/views/yygl/monitor/index.vue

@@ -442,55 +442,59 @@ export default {
       // });
     },
     getDmsDataList() {
-      let requestParams = {
-        columnId: systemConfig.columnIds[1], // 应用中心栏目id
-        states: 0,
-        orderBy: JSON.stringify([{ field: "create_time", orderByType: 2 }]),
-        pageSize: 9999,
-        page: 0,
-      };
-      appCenter.getDmsDataList(requestParams).then((res) => {
-        if (res.code === 200) {
-          this.itemApplications = res.content.data.map((item) => ({
-            ...item,
-            status:
-              item.status === 0
-                ? "待审核"
-                : item.status === 1
-                  ? "待发布"
-                  : item.status === 2
-                    ? "未完成"
-                    : "已完成",
-            buffName:
-              this.buffOptions.find((info) => info.label == item.appbuff.trim())?.value || "",
-            appstautName:
-              this.statusOptions.find((info) => info.label == item.appstauts.trim())?.value || "",
-            createTime: moment(item.create_time).format("YYYY-MM-DD HH:mm:ss"),
-          }));
-          this.applications = this.itemApplications;
-          // this.selectAapplications = this.applications.filter((item) => item.yylx == "0"); //yylx 0:内部 1:外部
-          this.newApplications = this.applications.slice(0, 10); // 获取前十个元素
-          // this.selectedAppRange = this.applications[0].title;
-          this.getTypeArrs();
-          this.getCountAppInfo();
-        } else {
-          this.applications = [];
-          this.selectAapplications = [];
-          this.selectedAppRange = "";
-        }
-      });
 
       let param = {
         start: "2000-01-01",
         end: moment().format("YYYY-MM-DD"),
       };
       getAppList(param.start, param.end).then((res) => {
-        console.log("=======getAppList======"+res);
+        // console.log("=======getAppList======"+res);
         this.selectAapplications = res;
-        this.selectedAppRange = this.selectAapplications[0].name;
+        this.selectAapplications.forEach((item) => {
+          if(item.name.includes("华新镇")){
+              this.selectedAppRange = item.name;
+              return;
+          }
+        });
 
+        let requestParams = {
+          columnId: systemConfig.columnIds[1], // 应用中心栏目id
+          states: 0,
+          orderBy: JSON.stringify([{ field: "create_time", orderByType: 2 }]),
+          pageSize: 9999,
+          page: 0,
+        };
+        appCenter.getDmsDataList(requestParams).then((res) => {
+          if (res.code === 200) {
+            this.itemApplications = res.content.data.map((item) => ({
+              ...item,
+              status:
+                item.status === 0
+                  ? "待审核"
+                  : item.status === 1
+                    ? "待发布"
+                    : item.status === 2
+                      ? "未完成"
+                      : "已完成",
+              buffName:
+                this.buffOptions.find((info) => info.label == item.appbuff.trim())?.value || "",
+              appstautName:
+                this.statusOptions.find((info) => info.label == item.appstauts.trim())?.value || "",
+              createTime: moment(item.create_time).format("YYYY-MM-DD HH:mm:ss"),
+            }));
+            this.applications = this.itemApplications;
+            // this.selectAapplications = this.applications.filter((item) => item.yylx == "0"); //yylx 0:内部 1:外部
+            this.newApplications = this.applications.slice(0, 10); // 获取前十个元素
+            // this.selectedAppRange = this.applications[0].title;
+            this.getTypeArrs();
+            this.getCountAppInfo();
+          } else {
+            this.applications = [];
+            this.selectAapplications = [];
+            this.selectedAppRange = "";
+          }
+        });
       });
-
     },
     getTypeArrs() {
       let that = this;

src/views/yygl/overview/index.vue

@@ -118,7 +118,7 @@ export default {
   },
   methods: {
     handleTabChange() {
-      console.log(this.activeTab);
+      // console.log(this.activeTab);
       if (this.activeTab == "all") {
         this.applications = this.itemApplications;
       } else {