From 48741e82bb773afe7b73d63ee3c8e18889a4d0d6 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 6 Aug 2024 19:30:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BA=91=E5=9B=BE=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=A1=B9=E7=9B=AE=E5=BA=93=E9=A1=B9=E7=9B=AE=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=AE=8C=E5=96=84=E3=80=81=E5=88=87=E6=8D=A2=E6=8C=89?=
 =?UTF-8?q?=E5=AD=A3=E5=BA=A6=E6=9B=B4=E6=8D=A2=E6=98=BE=E7=A4=BA=E3=80=81?=
 =?UTF-8?q?=E6=99=BA=E8=83=BD=E6=8F=90=E9=86=92=E9=99=A4=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E8=B0=81=E5=8F=91=E7=9A=84=E6=8F=90=E9=86=92=E8=B0=81?=
 =?UTF-8?q?=E6=9C=89=E6=9D=83=E5=88=A9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 src/api/jin_ji_hu/project/index.js            |   2 +-
 src/assets/styles/public.scss                 |  14 ++-
 .../dataCloudMap/components/echartData.vue    |  22 ++--
 .../components/headquarterEnterprise.vue      |  18 ++-
 src/views/intelligentReminder/index.vue       |   3 +-
 src/views/project/index.vue                   | 104 ++++++++++--------
 src/views/workbench/index.vue                 |   3 +-
 8 files changed, 101 insertions(+), 67 deletions(-)

diff --git a/package.json b/package.json
index 52f3972..0182266 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202408061104",
+  "version": "1.0.202408061928",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
diff --git a/src/api/jin_ji_hu/project/index.js b/src/api/jin_ji_hu/project/index.js
index fc39501..5fa33bd 100644
--- a/src/api/jin_ji_hu/project/index.js
+++ b/src/api/jin_ji_hu/project/index.js
@@ -78,7 +78,7 @@ export function putJMemorandum(data) {
 // 删除备忘录
 export function delJMemorandum(id) {
   return request({
-    url: "/jjh/jMemorandum" + id,
+    url: "/jjh/jMemorandum/" + id,
     method: "post",
   })
 }
diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index f8a801a..8c47230 100644
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@@ -1428,12 +1428,15 @@
                 }
 
                 .warn-main-content {
-                  .content-title {
+                  flex: 1;
+                  .content-title,.content-title-type {
                     font-weight: bold;
                     font-size: 15px;
                     color: #333333;
                   }
-
+                  .content-title-type {
+                    margin-top: 5px;
+                  }
                   .content-middle {
                     font-weight: bold;
                     font-size: 15px;
@@ -3948,8 +3951,11 @@
 }
 
 .echarts-data-box {
-  display: grid;
-  grid-template-columns: 1fr 1fr 1fr;
+  // display: grid;
+  // grid-template-columns: 1fr 1fr 1fr;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
   margin: 15px 0 12px;
 
   .E-box-item {
diff --git a/src/views/dataCloudMap/components/echartData.vue b/src/views/dataCloudMap/components/echartData.vue
index 76f8ca7..305decd 100644
--- a/src/views/dataCloudMap/components/echartData.vue
+++ b/src/views/dataCloudMap/components/echartData.vue
@@ -8,7 +8,7 @@
             <span class="number-yuan">{{ serviceData.valueAdded }}</span>
             <span class="yuan-unit">亿元</span>
           </div>
-          <div class="box-bottom">【{{ serviceData.developYear }}】服务业增加值</div>
+          <div class="box-bottom">【{{ activeIndex == 1 ? serviceData.developYear : serviceData.developYear + quarter + "季度" }}】服务业增加值</div>
         </div>
       </div>
       <div class="E-box-item">
@@ -18,7 +18,7 @@
             <span class="number-yuan">{{ serviceData.increaseSpeed }}</span>
             <span class="yuan-unit">%</span>
           </div>
-          <div class="box-bottom">【{{ serviceData.developYear }}】服务业增速</div>
+          <div class="box-bottom">【{{ activeIndex == 1 ? serviceData.developYear : serviceData.developYear + quarter + "季度" }}】服务业增速</div>
         </div>
       </div>
       <div class="E-box-item">
@@ -28,7 +28,7 @@
             <span class="number-yuan">{{ serviceData.gdpProportion }}</span>
             <span class="yuan-unit">%</span>
           </div>
-          <div class="box-bottom">【{{ serviceData.developYear }}】服务业增加值占GDP比重</div>
+          <div class="box-bottom">【{{ activeIndex == 1 ? serviceData.developYear : serviceData.developYear + quarter + "季度" }}】服务业增加值占GDP比重</div>
         </div>
       </div>
     </div>
@@ -53,6 +53,7 @@ export default {
         quarterly: 0,
         developYear: 0,
       },
+      quarter: '',
       option: {
         grid: {
           top: "10%",
@@ -233,14 +234,17 @@ export default {
           this.option.series[0].data = []
           this.option.series[1].data = []
           this.option.xAxis.data = ["第一季度","第二季度","第三季度","第四季度"]
-          let arr = [0,0,0,0]
-          let arrTwo = [0,0,0,0]
+          // let arr = [0,0,0,0]
+          // let arrTwo = [0,0,0,0]
+          let arr = []
+          let arrTwo = []
           res.data.map((item,index)=>{
-            arr[index] = item.valueAdded
-            arrTwo[index] = item.increaseSpeed
-            this.option.series[1].data = arr
-            this.option.series[0].data = arrTwo
+            arr.push(item.valueAdded);
+            arrTwo.push(item.increaseSpeed);
           })
+          this.quarter = arr.length == 1 ? '一' : arr.length == 2 ? '二' : arr.length == 3 ? '三' : arr.length == 4 ? '四' : '';
+          this.option.series[1].data = arr
+          this.option.series[0].data = arrTwo
           const maxY1 = Math.max.apply(null, this.option.series[0].data);
           const maxY2 = Math.max.apply(null, this.option.series[1].data);
           let divisor = 5;
diff --git a/src/views/dataCloudMap/components/headquarterEnterprise.vue b/src/views/dataCloudMap/components/headquarterEnterprise.vue
index fdc10bc..d8a5739 100644
--- a/src/views/dataCloudMap/components/headquarterEnterprise.vue
+++ b/src/views/dataCloudMap/components/headquarterEnterprise.vue
@@ -63,10 +63,20 @@
               <dict-tag :options="dict.type.head_quarter_type" :value="scope.row.type"/>
             </template>
           </el-table-column>
-          <el-table-column label="税收(亿元)" prop="taxation" align="center" width="100"/>
-          <el-table-column label="产值(亿元)" prop="output" align="center" width="100"/>
-          <el-table-column label="营收(亿元)" prop="revenue" align="center" width="100" />
-          <el-table-column label="销售额(亿元)" prop="sales" align="center" width="100" />
+          <el-table-column label="税收(亿元)" prop="taxation" align="center" width="100">
+            <!-- <template slot-scope="scope">
+              <div>{{ scope.row.taxation == '-0.0' ? '-' : scope.row.taxation == '0.0' ? '-' : scope.row.taxation }}</div>
+            </template> -->
+          </el-table-column>
+          <el-table-column label="产值(亿元)" prop="output" align="center" width="100">
+
+          </el-table-column>
+          <el-table-column label="营收(亿元)" prop="revenue" align="center" width="100">
+
+          </el-table-column>
+          <el-table-column label="销售额(亿元)" prop="sales" align="center" width="100">
+
+          </el-table-column>
           <el-table-column label="操作" align="center" width="100">
             <template slot-scope="scope">
               <div class="project-trace-table-number" @click="enterpriseInfo(scope.row)">企业详情</div>
diff --git a/src/views/intelligentReminder/index.vue b/src/views/intelligentReminder/index.vue
index f6084c9..443f7f3 100644
--- a/src/views/intelligentReminder/index.vue
+++ b/src/views/intelligentReminder/index.vue
@@ -72,7 +72,7 @@
           <el-table-column label="操作" prop="userId" class-name="table-operation" width="180px">
             <template slot-scope="scope">
               <span class="look-info" @click="goInfo(scope.row)">查看详情</span>
-              <span class="edit-info" @click="editInfo(scope.row)" v-if="roles.includes('other-gov')">修改</span>
+              <span class="edit-info" @click="editInfo(scope.row)" v-if="roles.includes('other-gov') || scope.row.createBy == nickName">修改</span>
               <span class="del-info" @click="delInfo(scope.row)" v-if="scope.row.alertManner == 1 && roles.includes('other-gov')">删除</span>
             </template>
           </el-table-column>
@@ -199,6 +199,7 @@ export default {
     }
     return {
       roles: this.$store.state.user.roles,
+      nickName: this.$store.state.user.nickName,
       total:0,
       pagination: {
         current:1,
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index 8641d5b..4120ba4 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -347,20 +347,21 @@ export default {
       this.formInline.projectClassify = this.$route.params.projectId + '';
       this.pagination = { ...this.pagination,...this.formInline };
     }
-    if(this.$route.params.projectYear || (this.$route.params.projectBigType || this.$route.params.projectMiddleType || this.$route.params.projectSmallType)) {
+    if(this.$route.params.projectBigType || this.$route.params.projectMiddleType || this.$route.params.projectSmallType) {
       let arr = [];
       arr.push(this.$route.params.projectBigType + '')
       this.$route.params.projectMiddleType ? arr.push(this.$route.params.projectMiddleType + '') : null;
       this.$route.params.projectSmallType ? arr.push(this.$route.params.projectSmallType + '') : null;
       this.echoCascader(arr)
-      this.formInline.projectYear = this.$route.params.projectYear ? this.$route.params.projectYear + '' : '';
       this.formInline.projectBigType = arr[0];
       this.formInline.projectMiddleType = arr[1] ? arr[1] : null;
       this.formInline.projectSmallType = arr[2] ? arr[2] : null;
       this.pagination = { ...this.pagination,...this.formInline };
       this.formInline.projectClassify = arr;
-    } else {
-      this.getDataList();
+    }
+    if(this.$route.params.projectYear) {
+      this.formInline.projectYear = this.$route.params.projectYear ? this.$route.params.projectYear + '' : '';
+      this.pagination = { ...this.pagination,...this.formInline };
     }
     // if(this.$route.params.projectName) {
     //   this.formInline.projectName = this.$route.params.projectName;
@@ -378,6 +379,7 @@ export default {
     if(this.userType == "01") {
       this.pagination.creditCode = this.$store.state.user.name 
     }
+    this.getDataList();
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
     
@@ -390,51 +392,59 @@ export default {
     /** 回显Cascader 级联选择器数据  */
     echoCascader(arr){
       getAllList({dictType:"project_categories"}).then(res=>{
-        let obj = {};
-        let objTwo = {};
-        let objThree = {};
+        let arrOne = [];
+        let arrTwo = [];
+        let arrTree = [];
         res.data.map(item => {
-          if(arr[0] == item.dictValue) {
-            obj.value = item.dictValue;
-            obj.label = item.dictLabel;
-            obj.dict = item.remark;
-            if(!arr[1]) {
-              this.options.push(obj);
-              return;
-            } else {
-              obj.children = [];
-            }
-            getAllList({dictType:  item.remark}).then(resTwo=>{
-              resTwo.data.map((itemTwo)=>{
-                if(arr[1] == itemTwo.dictValue) {
-                  objTwo.value = itemTwo.dictValue;
-                  objTwo.label = itemTwo.dictLabel;
-                  objTwo.dict = itemTwo.remark;
-                  if(!arr[2]) {
-                    obj.children.push(objTwo)
-                    this.options.push(obj);
-                    return;
-                  } else {
-                    objTwo.children = [];
-                    obj.children.push(objTwo)
+          let obj = {};
+          obj.value = item.dictValue;
+          obj.label = item.dictLabel;
+          obj.dict = item.remark;
+          arrOne.push(obj);
+        })
+        if(!arr[1]) {
+          this.options = arrOne;
+          return;
+        } else if(arr[1]){
+          for (let index = 0; index < arrOne.length; index++) {
+            if(arr[0] == arrOne[index].value) {
+              arrOne[index].children = [];
+              getAllList({dictType:  arrOne[index].dict}).then(resTwo=>{
+                resTwo.data.map(item => {
+                  let objTwo = {};
+                  objTwo.value = item.dictValue;
+                  objTwo.label = item.dictLabel;
+                  objTwo.dict = item.remark;
+                  arrTwo.push(objTwo)
+                  arrOne[index].children.push(objTwo)
+                })
+                if(!arr[2]) {
+                  this.options = arrOne;
+                  return;
+                } else if(arr[2]) {
+                  for (let index = 0; index < arrTwo.length; index++) {
+                    if(arr[1] == arrTwo[index].value) {
+                      arrTwo[index].children = [];
+                      getAllList({dictType: arrTwo[index].dict}).then(resThree => {
+                        resThree.data.map((itemThree)=>{
+                          let objThree = {};
+                          objThree.value = itemThree.dictValue;
+                          objThree.label = itemThree.dictLabel;
+                          objThree.dict = itemThree.remark;
+                          objThree.leaf = 'leaf';
+                          arrTree.push(objThree)
+                          arrTwo[index].children.push(objThree)
+                        })
+                        this.options = arrOne;
+                      })
+                    }
                   }
-                  getAllList({dictType:  itemTwo.remark}).then(resThree => {
-                    resThree.data.map((itemThree)=>{
-                      if(arr[2] == itemThree.dictValue) {
-                        objThree.value = itemThree.dictValue;
-                        objThree.label = itemThree.dictLabel;
-                        objThree.dict = itemThree.remark;
-                        objThree.leaf = 'leaf';
-                        objTwo.children.push(objThree)
-                        this.options.push(obj);
-                      }
-                    })
-                  })
                 }
               })
-            })
+            }
           }
-        })
+        } 
+        
       })
     },
     handleItemChange(value){
@@ -445,16 +455,18 @@ export default {
       }
     },
     getDataList(){
+      let arr = []
       getAllList({dictType:"project_categories"}).then(res=>{
         res.data.map(item => {
           let obj = {};
           obj.value = item.dictValue;
           obj.label = item.dictLabel;
           obj.dict = item.remark;
-          this.options.push(obj);
-          this.optionsTwo.push(obj);
+          arr.push(obj)
         })
       })
+      this.options = arr;
+      this.optionsTwo = arr;
     },
     // 列表获取
     getList(){
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index 0fa37ce..7aaf2fa 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -82,7 +82,8 @@
                       <div class="warn-main-left" v-else-if="item.alertManner == 1 && item.qymc && item.alertRecipients == 2">
                         <div class="warn-main-img"><img src="@/assets/images/warn-orange.png" alt=""></div>
                         <div class="warn-main-content">
-                          <div class="content-title" style="display: flex;">【{{ item.qymc }}】<dict-tag :options="dict.type.project_small_type" :value="item.declarationName"/></div>
+                          <div class="content-title" style="display: flex;">【{{ item.qymc }}】</div>
+                          <div class="content-title-type"><dict-tag :options="dict.type.project_small_type" :value="item.declarationName"/></div>
                           <div class="content-middle">{{ item.alertContent }}</div>
                           <div class="content-time">{{ item.alertTime }}</div>
                         </div>