Merge branch 'refs/heads/master' into sso

# Conflicts:
#	zhsq_qk-admin/src/main/resources/application-druid.yml
#	zhsq_qk-ui/vue.config.js

zhsq_qk-admin/src/main/java/zhsq_qk/web/controller/system/QkEnterpriseActivityController.java

@@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
- * 企业开展活动Controller
+ * 服务企业次数Controller
  *
  * @author ruoyi
  * @date 2024-07-10
@@ -28,7 +28,7 @@ public class QkEnterpriseActivityController extends BaseController {
     private IQkEnterpriseActivityService qkEnterpriseActivityService;
 
     /**
-     * 查询企业开展活动列表
+     * 查询服务企业次数列表
      */
     @GetMapping("/list")
     public TableDataInfo list(QkEnterpriseActivity qkEnterpriseActivity) {
@@ -38,18 +38,18 @@ public class QkEnterpriseActivityController extends BaseController {
     }
 
     /**
-     * 导出企业开展活动列表
+     * 导出服务企业次数列表
      */
-    @Log(title = "企业开展活动", businessType = BusinessType.EXPORT)
+    @Log(title = "服务企业次数", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, QkEnterpriseActivity qkEnterpriseActivity) {
         List<QkEnterpriseActivity> list = qkEnterpriseActivityService.selectQkEnterpriseActivityList(qkEnterpriseActivity);
         ExcelUtil<QkEnterpriseActivity> util = new ExcelUtil<QkEnterpriseActivity>(QkEnterpriseActivity.class);
-        util.exportExcel(response, list, "企业开展活动数据");
+        util.exportExcel(response, list, "服务企业次数数据");
     }
 
     /**
-     * 获取企业开展活动详细信息
+     * 获取服务企业次数详细信息
      */
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
@@ -57,34 +57,34 @@ public class QkEnterpriseActivityController extends BaseController {
     }
 
     /**
-     * 新增企业开展活动
+     * 新增服务企业次数
      */
-    @Log(title = "企业开展活动", businessType = BusinessType.INSERT)
+    @Log(title = "服务企业次数", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody QkEnterpriseActivity qkEnterpriseActivity) {
         return toAjax(qkEnterpriseActivityService.insertQkEnterpriseActivity(qkEnterpriseActivity));
     }
 
     /**
-     * 修改企业开展活动
+     * 修改服务企业次数
      */
-    @Log(title = "企业开展活动", businessType = BusinessType.UPDATE)
+    @Log(title = "服务企业次数", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody QkEnterpriseActivity qkEnterpriseActivity) {
         return toAjax(qkEnterpriseActivityService.updateQkEnterpriseActivity(qkEnterpriseActivity));
     }
 
     /**
-     * 删除企业开展活动
+     * 删除服务企业次数
      */
-    @Log(title = "企业开展活动", businessType = BusinessType.DELETE)
+    @Log(title = "服务企业次数", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(qkEnterpriseActivityService.deleteQkEnterpriseActivityByIds(ids));
     }
 
     /**
-     * 查询企业开展活动可视化
+     * 查询服务企业次数可视化
      */
     @GetMapping("/visualizationActivityList")
     public AjaxResult visualizationList() {

zhsq_qk-admin/src/main/resources/application-druid.yml

@@ -4,17 +4,17 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
     druid:
-      # 主库数据源
+      # 主库数据源生产
       master:
 #        url: jdbc:mysql://localhost:3306/zhsq_qk_2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #        username: root
-#        password: root
-#        url: jdbc:mysql://192.168.10.15:63306/zhsq_qk_2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#        username: root
-#        password: sooka1a2b3c4d%...
-        url: jdbc:mysql://192.168.1.13:63306/zhsq_qk_2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        password: 1a2b3c!
+        url: jdbc:mysql://192.168.10.15:63306/zhsq_qk_2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: sooka1a2b3c4d%...
+#        url: jdbc:mysql://192.168.1.13:63306/zhsq_qk_2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        username: root
+#        password: sooka1a2b3c4d%...
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

zhsq_qk-system/src/main/resources/mapper/system/QkEnterpriseActivityMapper.xml

@@ -124,5 +124,7 @@
             qk_enterprise_activity
         GROUP BY
             enterprise_name
+        ORDER BY
+            activity_number DESC,id asc
     </select>
 </mapper>

zhsq_qk-ui/src/views/fusion/bjzshz.vue

@@ -124,7 +124,7 @@
           <div id="qkq_bj1"></div>
         </div>
         <div class="con_div">
-          <div class="qkq_tit txt_t">公安数据统计</div>
+          <div class="qkq_tit txt_t">公安政务服务数据统计</div>
           <div id="qkq_bj3"></div>
         </div>
         <div class="con_div">

zhsq_qk-ui/src/views/fusion/fwyq.vue

@@ -151,7 +151,7 @@
       </div>
       <div class="con_left_b">
         <div class="con_div">
-          <div class="qkq_tit ">政策法规</div>
+          <div class="qkq_tit txt_t">政策法规</div>
           <div class="qkq_zcfg">
             <p>严格防范外债风险和地方债务风险<span>2024-07-08</span></p>
             <p>进一步加强城市轨道交通规划建设<span>2024-07-06</span></p>
@@ -167,7 +167,7 @@
           <div id="qkq_zxt"></div>
         </div>
         <div class="con_div" style="margin-top: 56px;">
-          <div class="qkq_tit ">万人助万企</div>
+          <div class="qkq_tit txt_t">万人助万企</div>
           <div class="qkq_wrzwq qkq_wr clearfix">
             <div class="qkq_si_div">
               <p><b>728</b><span>次</span></p>
@@ -190,7 +190,7 @@
       </div>
       <div class="con_left_c">
         <div class="con_div">
-          <div class="qkq_tit ">招商指标/实施数量</div>
+          <div class="qkq_tit txt_t">招商指标/实施数量</div>
           <div class="clearfix">
             <div id="qkq_zszb1"></div>
             <div id="qkq_zszb2"></div>
@@ -204,7 +204,7 @@
           <div id="qkq_btzb"></div>
         </div>
         <div class="con_div">
-          <div class="qkq_tit ">服务企业台账</div>
+          <div class="qkq_tit txt_t">服务企业台账</div>
           <div class="qkq_wrzwq qkq_tz clearfix">
             <div class="qkq_si_div">
               <p><b>177</b><span>次</span></p>

zhsq_qk-ui/src/views/fusion/jjyx.vue

@@ -32,21 +32,21 @@
       <!--左侧开始-->
       <div class="con_left_e">
         <div class="con_div">
-          <div class="qkq_tit ">规模以上工业增加值</div>
+          <div class="qkq_tit txt_t">规模以上工业增加值</div>
           <div class="qkq_jjyx_div">
             <div id="qkq_zjz1_1"></div>
             <div id="qkq_zjz2_1"></div>
           </div>
         </div>
         <div class="con_div">
-          <div class="qkq_tit ">固定资产投资额</div>
+          <div class="qkq_tit txt_t">固定资产投资额</div>
           <div class="qkq_jjyx_div">
             <div id="qkq_zjz1_2"></div>
             <div id="qkq_zjz2_2"></div>
           </div>
         </div>
         <div class="con_div">
-          <div class="qkq_tit ">民间投资额</div>
+          <div class="qkq_tit txt_t">民间投资额</div>
           <div class="qkq_jjyx_div">
             <div id="qkq_zjz1_3"></div>
             <div id="qkq_zjz2_3"></div>
@@ -86,31 +86,31 @@
           </div>
         </div>
         <div class="con_div">
-          <div class="qkq_tit ">本年度主要经济指标增长额</div>
+          <div class="qkq_tit txt_t">本年度主要经济指标增长额</div>
           <div id="qkq_jdt"></div>
         </div>
         <div class="con_div">
-          <div class="qkq_tit ">全省进出口总值对比</div>
+          <div class="qkq_tit txt_t">全省进出口总值对比</div>
           <div id="qkq_kxt"></div>
         </div>
       </div>
       <div class="con_left_g">
         <div class="con_div">
-          <div class="qkq_tit ">限额以上社会消费品零售总额</div>
+          <div class="qkq_tit txt_t">限额以上社会消费品零售总额</div>
           <div class="qkq_jjyx_div">
             <div id="qkq_zjz1_4"></div>
             <div id="qkq_zjz2_4"></div>
           </div>
         </div>
         <div class="con_div">
-          <div class="qkq_tit ">进出口总值</div>
+          <div class="qkq_tit txt_t">进出口总值</div>
           <div class="qkq_jjyx_div">
             <div id="qkq_zjz1_5"></div>
             <div id="qkq_zjz2_5"></div>
           </div>
         </div>
         <div class="con_div">
-          <div class="qkq_tit ">一般公共预算收入</div>
+          <div class="qkq_tit txt_t">一般公共预算收入</div>
           <div class="qkq_jjyx_div">
             <div id="qkq_zjz1_6"></div>
             <div id="qkq_zjz2_6"></div>

zhsq_qk-ui/src/views/fusion/yshj_new.vue

@@ -57,7 +57,7 @@
           </div>
         </div>
         <div class="con_div">
-          <div class="qkq_tit txt_t">惠民惠企建设</div>
+          <div class="qkq_tit txt_t">惠民惠企政策</div>
           <div class="qkq_yshj_txt qkq_yshj_txtbg1 clearfix">
             <div class="qkq_yshjnew">
               <p><b>{{ enterprise.platformLaunch }}</b><i>个</i></p>
@@ -816,7 +816,7 @@ export default {
       });
       var option = {
         title: {
-          text: '优化营商环境宣传活动(次数/每月)',
+          text: '优化营商环境宣传情况(次数/每月)',
           x: 'center',
           y: 0,
           textStyle: {
@@ -1088,7 +1088,7 @@ export default {
       let labelData = val.labelData;
       var option = {
         title: {
-          text: '企业开展活动',
+          text: '服务企业次数',
           x: 'center',
           y: 0,
           textStyle: {

zhsq_qk-ui/src/views/system/activity/index.vue

@@ -94,7 +94,7 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改企业开展活动对话框 -->
+    <!-- 添加或修改服务企业次数对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="企业名称" prop="enterpriseName">
@@ -131,7 +131,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 企业开展活动表格数据
+      // 服务企业次数表格数据
       activityList: [],
       // 弹出层标题
       title: "",
@@ -158,7 +158,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询企业开展活动列表 */
+    /** 查询服务企业次数列表 */
     getList() {
       this.loading = true;
       listActivity(this.queryParams).then(response => {
@@ -206,7 +206,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加企业开展活动";
+      this.title = "添加服务企业次数";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -215,7 +215,7 @@ export default {
       getActivity(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改企业开展活动";
+        this.title = "修改服务企业次数";
       });
     },
     /** 提交按钮 */
@@ -241,7 +241,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除企业开展活动为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除服务企业次数为"' + ids + '"的数据项？').then(function () {
         return delActivity(ids);
       }).then(() => {
         this.getList();

zhsq_qk-ui/src/views/system/enterprise/index.vue

@@ -100,7 +100,7 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改惠民惠企建设对话框 -->
+    <!-- 添加或修改惠民惠企政策对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="平台上线政策" prop="platformLaunch">
@@ -143,7 +143,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 惠民惠企建设表格数据
+      // 惠民惠企政策表格数据
       enterpriseList: [],
       // 弹出层标题
       title: "",
@@ -173,7 +173,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询惠民惠企建设列表 */
+    /** 查询惠民惠企政策列表 */
     getList() {
       this.loading = true;
       listEnterprise(this.queryParams).then(response => {
@@ -223,7 +223,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加惠民惠企建设";
+      this.title = "添加惠民惠企政策";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -232,7 +232,7 @@ export default {
       getEnterprise(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改惠民惠企建设";
+        this.title = "修改惠民惠企政策";
       });
     },
     /** 提交按钮 */
@@ -258,7 +258,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除惠民惠企建设为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除惠民惠企政策为"' + ids + '"的数据项？').then(function () {
         return delEnterprise(ids);
       }).then(() => {
         this.getList();

zhsq_qk-ui/src/views/system/publicize/index.vue

@@ -119,7 +119,7 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改优化营商环境宣传活动(次数/每月)对话框 -->
+    <!-- 添加或修改优化营商环境宣传情况(次数/每月)对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="国家级" prop="nationalLevel">
@@ -162,7 +162,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 优化营商环境宣传活动(次数/每月)表格数据
+      // 优化营商环境宣传情况(次数/每月)表格数据
       publicizeList: [],
       // 弹出层标题
       title: "",
@@ -193,7 +193,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询优化营商环境宣传活动(次数/每月)列表 */
+    /** 查询优化营商环境宣传情况(次数/每月)列表 */
     getList() {
       this.loading = true;
       listPublicize(this.queryParams).then(response => {
@@ -243,7 +243,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加优化营商环境宣传活动(次数/每月)";
+      this.title = "添加优化营商环境宣传情况(次数/每月)";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -252,7 +252,7 @@ export default {
       getPublicize(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改优化营商环境宣传活动(次数/每月)";
+        this.title = "修改优化营商环境宣传情况(次数/每月)";
       });
     },
     /** 提交按钮 */
@@ -278,7 +278,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除优化营商环境宣传活动为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除优化营商环境宣传情况为"' + ids + '"的数据项？').then(function () {
         return delPublicize(ids);
       }).then(() => {
         this.getList();

zhsq_qk-ui/vue.config.js

@@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 
 const name = process.env.VUE_APP_TITLE || '汽开区城市运行一网统管平台' // 网页标题
 
-const port = process.env.port || process.env.npm_config_port || 18001 // 端口
+const port = process.env.port || process.env.npm_config_port || 11001 // 端口
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions