Merge branch 'prod' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into prod

src/assets/scss/modules/visual/distributionAnalyze.scss

@@ -28,7 +28,7 @@
     display: block;
     display: flex;
     align-items: center;
-    margin-top: 20px;
+
     .second-title-label {
       position: relative;
       padding-left: 40px;
@@ -117,11 +117,11 @@
   flex-direction: row;
   // flex-wrap: wrap;
   justify-content: space-between;
-  height: calc(100vh - 230px);
+  height: calc(100vh - 190px);
 
   .g-l {
     width: 40%;
-    height: calc(100vh - 240px);
+    height: calc(100vh - 200px);
 
     .echart-line {
       margin-left: 30px;
@@ -135,16 +135,25 @@
         width: 100%;
         height: 90%;
       }
+
+      > img {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        margin: auto;
+      }
     }
   }
 
   .g-r {
     width: 55%;
-    height: calc(100vh - 250px);
+    height: calc(100vh - 210px);
 
     .r-map {
       position: relative;
-      height: calc(100vh - 250px - 50px);
+      height: calc(100vh - 210px - 50px);
       width: 100%;
 
       .map {

src/views/modules/communityParty/regionalParty/activitys.vue

@@ -148,6 +148,16 @@
                          label="活动时间"
                          width="230">
         </el-table-column>
+        <el-table-column prop="activityTime"
+                         header-align="center"
+                         align="center"
+                         label="来源"
+                         width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.actId">小程序</span>
+            <span v-else>管理平台</span>
+          </template>
+        </el-table-column>
 
         <el-table-column label="操作"
                          fixed="right"
@@ -161,7 +171,8 @@
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+            <el-button v-if="!scope.row.actId"
+                       type="text"
                        style="color:#00A7A9;text-decoration: underline;"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
@@ -199,6 +210,7 @@
                       @dialogCancle="addFormCancle"
                       @dialogOk="addFormOk"></activitys-form>
     </el-dialog>
+
     <el-dialog :visible.sync="detailShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"

src/views/modules/communityParty/regionalParty/activitysForm.vue

@@ -244,6 +244,8 @@ export default {
       }
       this.endLoading()
 
+
+
     },
 
     //加载组织
@@ -258,7 +260,16 @@ export default {
 
       if (code === 0) {
         this.formData = data
-        map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+        console.log(this.formData.content)
+        let style_img = "style='width:50px;height:40px;' "
+
+        if (this.formData.content) {
+          this.formData.content = this.formData.content.replace(/<img/g, "<img style='width:200px;height:120px;'")
+          // let array=this.formData.content.split('<img')
+
+        }
+        console.log(this.formData.content)
+        map.setCenter(new TMap.LatLng(parseFloat(this.formData.latitude), parseFloat(this.formData.longitude)))
         this.setMarker(this.formData.latitude, this.formData.longitude)
       } else {
         this.$message.error(msg)

src/views/modules/visual/communityGovern/distributionAnalyze.vue

@@ -4,31 +4,32 @@
       <div class="card-title">
         <img src="@/assets/img/shuju/title-tip.png" />
         <span>项目分布分析</span>
-      </div>
-      <div class="second-title">
-        <div class="second-title-label">不同事件类别在不同时间段的变化和分布</div>
-        <div class="second-select cascader">
-
-          <el-cascader class="customer_cascader"
-                       ref="myCascader"
-                       v-model="agencyIdArray"
-                       :key="iscascaderShow"
-                       :options="casOptions"
-                       :props="optionProps"
-                       :show-all-levels="false"
-                       @change="handleChangeAgency"></el-cascader>
-        </div>
-        <div class="second-select">
-          <el-date-picker v-model="timeRange"
-                          type="daterange"
-                          range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
-                          prefix-icon="el-icon-caret-bottom"
-                          value-format="yyyy-MM-dd"
-                          @change="handleSelectChange">
-          </el-date-picker>
 
+        <div class="second-title">
+
+          <div class="second-select cascader">
+
+            <el-cascader class="customer_cascader"
+                         ref="myCascader"
+                         v-model="agencyIdArray"
+                         :key="iscascaderShow"
+                         :options="casOptions"
+                         :props="optionProps"
+                         :show-all-levels="false"
+                         @change="handleChangeAgency"></el-cascader>
+          </div>
+          <div class="second-select">
+            <el-date-picker v-model="timeRange"
+                            type="daterange"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                            prefix-icon="el-icon-caret-bottom"
+                            value-format="yyyy-MM-dd"
+                            @change="handleSelectChange">
+            </el-date-picker>
+
+          </div>
         </div>
       </div>
 
@@ -36,19 +37,21 @@
 
     <div class="g-cpt-resi">
       <div class="g-l">
-        <screen-echarts-frame class="echart-line"
+        <screen-echarts-frame v-if="!showNoData"
+                              class="echart-line"
                               @myChartMethod="lineInitOk"
                               ref="lineChart"></screen-echarts-frame>
+        <div v-else
+             class="echart-line">
+          <img src="../../../../assets/img/modules/visual/noData.png" />
+        </div>
         <!-- <div class="table-status"
              v-if="loading">
           <screen-loading>加载中</screen-loading>
         </div>
         <div class="table-status"
              v-if="lineList.length == 0 && !loading">
-          <div class="no-data">
+          
-            <img src="../../../../assets/img/modules/visual/noData.png"
-                 class="no-data-img" />
-          </div>
         </div> -->
 
       </div>
@@ -208,6 +211,7 @@ export default {
     await this.getAgencylist()//获取组织级别
     await nextTick(500)
     await this.loadOrgData()
+
     await this.getApiData();
 
   },
@@ -237,6 +241,15 @@ export default {
       if (month2 < 10) {
         month2 = '0' + month2;
       }
+      if (month < 10) {
+        month = '0' + month;
+      }
+      if (day < 10) {
+        day = '0' + day;
+      }
+      if (day2 < 10) {
+        day2 = '0' + day2;
+      }
       var t2 = year2 + '-' + month2 + '-' + day2;
       var t1 = year + '-' + month + '-' + day;
       // let t3 = formate(t2, style);
@@ -250,9 +263,19 @@ export default {
     },
 
     async getApiData () {
-
+      await this.getLineChart()
-      await this.getLine()
       await this.loadMapData();
+
+      this.assignData()
+    },
+
+    assignData () {
+      if (!this.showNoData) {
+        this.getLine()
+      }
+
+      this.loadMap()
+      this.isfirstInit = false
     },
 
     // 获取当前登录人员信息及组织信息
@@ -351,17 +374,17 @@ export default {
       if (code === 0) {
 
         this.legendArray = []
-        if (data.under) {
+        if (data.under === 0 || data.under) {
           this.under = data.under
           this.legendArray.push(
             {
               color: this.colorArray[0],
-              name: data.under + '以下'
+              name: data.under + '及以下'
             }
           )
         }
 
-        if (data.above) {
+        if (data.above === 0 || data.above) {
           this.above = data.above
           this.legendArray.push(
             {
@@ -372,7 +395,7 @@ export default {
           this.legendArray.push(
             {
               color: this.colorArray[2],
-              name: data.above + '以上'
+              name: data.above + '及以上'
             }
           )
         }
@@ -393,12 +416,12 @@ export default {
               item.latitude = agencyItem.latitude
               item.coordinates = agencyItem.coordinates
 
-              if (this.under) {
+              if (this.under === 0 || this.under) {
                 if (item.count < this.under || item.count === this.under) {
                   item.color = this.colorArray[0]
                   item.fillColor = this.colorFillArray[0]
                 } else {
-                  if (this.above) {
+                  if (this.above === 0 || this.above) {
                     if (item.count > this.under && item.count < this.above) {
                       item.color = this.colorArray[1]
                       item.fillColor = this.colorFillArray[1]
@@ -409,7 +432,6 @@ export default {
                   }
                 }
 
-
               }
               break
             }
@@ -419,8 +441,7 @@ export default {
         });
 
         console.log(this.mapList)
-        this.loadMap()
+
-        this.isfirstInit = false
 
       } else {
         this.$message.error(msg);
@@ -445,7 +466,7 @@ export default {
     },
     getLine () {
       if (this.lineInitState) {
-        this.getLineChart()
+        this.assignLineChart()
       } else {
         setTimeout(() => {
           this.getLine()
@@ -454,9 +475,13 @@ export default {
     },
     // 获取折线图
     async getLineChart () {
-      this.$refs.lineChart.clear()
+      if (!this.showNoData) {
+        this.$refs.lineChart.clear()
+        this.$refs.lineChart.showLoading()
+      }
+
       const _that = this
-      this.$refs.lineChart.showLoading()
+
       const url = "/gov/project/project/projectdistributionanalysisleft";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/projectdistributionanalysisleft";
       let params = {
@@ -466,28 +491,20 @@ export default {
       };
 
       const { data, code, msg } = await requestPost(url, params);
-      this.$refs.lineChart.hideLoading()
+      if (!this.showNoData) {
+        this.$refs.lineChart.hideLoading()
+      }
       if (code === 0) {
-        // 获取pieChart配置
-        this.lineOption = lineOption()
 
         if (data && data.length > 0) {
           this.lineList = data
-          this.loadCategoryData()
+          this.showNoData = false
-
-
-
-          this.$refs.lineChart.setOption(this.lineOption, true)
-          this.$refs.lineChart.setOption({
-            xAxis: { data: this.xaxis },
-            legend: { data: this.legend },
-            series: this.series
-          }, true)
         } else {
           this.lineList = []
+          this.showNoData = true
         }
 
-
+        this.loadCategoryData()
 
       } else {
         this.$message.error(msg);
@@ -495,60 +512,75 @@ export default {
 
     },
 
+    assignLineChart () {
+      // 获取pieChart配置
+      this.lineOption = lineOption()
+
+      this.$refs.lineChart.setOption(this.lineOption, true)
+      this.$refs.lineChart.setOption({
+        xAxis: { data: this.xaxis },
+        legend: { data: this.legend },
+        series: this.series
+      }, true)
+    },
+
     //解析折线图数据
     loadCategoryData () {
 
       this.xaxis = []
       this.series = []
       this.legend = []
-      let num = this.lineList[0].categoryList.length
+      if (this.lineList.length > 0) {
-
-      let dataArray = new Array(num)
-      //遍历每个分类
-      this.lineList[0].categoryList.forEach((categoryItem, index) => {
-        this.legend.push(categoryItem.categoryName)
-        dataArray[index] = []
 
-      });
 
+        let num = this.lineList[0].categoryList.length
 
-      //遍历每个时间
+        let dataArray = new Array(num)
-      this.lineList.forEach(item => {
-        this.xaxis.push(item.time)
-
         //遍历每个分类
-        item.categoryList.forEach((categoryItem, index) => {
+        this.lineList[0].categoryList.forEach((categoryItem, index) => {
-          dataArray[index].push(categoryItem.count)
+          this.legend.push(categoryItem.categoryName)
+          dataArray[index] = []
+
         });
 
-      });
-
-      //遍历第一组的分类
-      this.lineList[0].categoryList.forEach((categoryItem, index) => {
-
-        let object = {
-          name: categoryItem.categoryName,
-          type: 'line',
-          smooth: true,
-          barWidth: 15,
-          areaStyle: {},
-          itemStyle: {
-            color: new echarts.graphic.LinearGradient(
-              0, 1, 0, 0,
-              [
-                { offset: 0, color: 'rgba(121, 55, 255, 0)' },
-                { offset: 1, color: categoryItem.color }
-              ]
-            )
-          },
-          data: dataArray[index]
-        }
 
-        this.series.push(object)
+        //遍历每个时间
+        this.lineList.forEach(item => {
+          this.xaxis.push(item.time)
+
+          //遍历每个分类
+          item.categoryList.forEach((categoryItem, index) => {
+            dataArray[index].push(categoryItem.count)
+          });
+
+        });
+
+        //遍历第一组的分类
+        this.lineList[0].categoryList.forEach((categoryItem, index) => {
+
+          let object = {
+            name: categoryItem.categoryName,
+            type: 'line',
+            smooth: true,
+            barWidth: 15,
+            areaStyle: {},
+            itemStyle: {
+              color: new echarts.graphic.LinearGradient(
+                0, 1, 0, 0,
+                [
+                  { offset: 0, color: 'rgba(121, 55, 255, 0)' },
+                  { offset: 1, color: categoryItem.color }
+                ]
+              )
+            },
+            data: dataArray[index]
+          }
 
+          this.series.push(object)
 
-      });
 
+        });
+      }
     },
 
     handleChangeAgency (value) {