Merge remote-tracking branch 'origin/master'

naqwzsjtj/naqwzsjtj/.env

@@ -1,2 +1,10 @@
-#VUE_APP_BASE_API = /data
-#VUE_APP_IMG_URL= https://www.cqna.gov.cn/data/
+# 政务后台
+# VUE_APP_BASE_API = /data
+# VUE_APP_IMG_URL= https://www.cqna.gov.cn/data/
+
+# 小程序
+#VUE_APP_BASE_API = /mnazw
+#VUE_APP_IMG_URL= https://www.cqna.gov.cn/mnazw/
+
+VUE_APP_BASE_API = http://localhost:8082/
+VUE_APP_IMG_URL= http://localhost:8082/

naqwzsjtj/naqwzsjtj/src/utils/request.js

@@ -14,7 +14,8 @@ import router from '../router'
 
 //请求地址
 const instance = axios.create({
-    baseURL: "https://www.cqna.gov.cn/mnazw"
+    // baseURL: "https://www.cqna.gov.cn/mnazw"
+    baseURL: process.env.VUE_APP_BASE_API
 })
 //请求拦截器
 instance.interceptors.request.use((r) => {

naqwzsjtj/naqwzsjtj/src/views/canteen/CanteenManage.vue

@@ -82,16 +82,24 @@
           </el-row>
           <el-row>
             <el-col :span="22">
-              <el-form-item class="input-star" label="负责人" prop="principal">
-                <el-input v-model="postManagement.principal" @click="selectUser" maxlength="32" placeholder="请输入食堂负责人">
-                </el-input>
+              <el-form-item class="input-star" label="负责人" prop="state">
+<!--                <el-input v-model="postManagement.principal" @click="selectUser" maxlength="32" placeholder="请输入食堂负责人">-->
+<!--                </el-input>-->
+
+                <el-autocomplete
+                  v-model="state"
+                  :fetch-suggestions="querySearchAsync"
+                  placeholder="请输入食堂负责人"
+                  @select="handleSelect"
+                  @blur = "handelBlur"
+                ></el-autocomplete>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="22">
               <el-form-item class="input-star" label="投诉电话" prop="complaintPhone">
-                <el-input v-model="postManagement.complaintPhone" placeholder="请输入食堂投诉电话" maxlength="12">
+                <el-input v-model="postManagement.complaintPhone"  placeholder="请输入食堂投诉电话" maxlength="12">
                 </el-input>
               </el-form-item>
             </el-col>
@@ -119,7 +127,7 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="saveWork">提交</el-button>
-        <el-button @click="workDialog = false">返回</el-button>
+        <el-button @click="back()">返回</el-button>
       </div>
     </el-dialog>
 <!--    <el-dialog :visible.sync="userDialog" width="50%"  class="detailDialog" :close-on-click-modal="false" top="40px">-->
@@ -141,6 +149,7 @@
 
   import CONFIG from "../../../vue.config"
   import CanteenPersion from "@/views/canteen/components/CanteenPersionDialog"
+  import Repair from "@/api/repair";
 
   export default {
     name: "CanteenManage",
@@ -150,7 +159,7 @@
     comments:{CanteenPersion},
     data() {
       return {
-        imgUrl: "https://www.cqna.gov.cn/mnazw/",
+        imgUrl: process.env.VUE_APP_IMG_URL,
         tableStyle: {
           textAlign: "center",
         },
@@ -203,6 +212,7 @@
           principal: "",
           complaint_phone: "",
           takeout_phone: "",
+          workerId:""
         },
         // 分页
         sorts: {
@@ -213,13 +223,60 @@
         uploadFiles: [],
         // 文件上传绑定的list
         fileList: [],
+        restaurants: [],
+        state: '',
+        timeout:  null
       };
     },
     methods: {
+      back(){
+        this.workDialog = false;
+        this.state='';
+      },
+      loadAll() {
+
+        Repair.listUser().then((r)=>{
+          if (r.status){
+            this.restaurants = r.data.map((t)=>{
+              console.log(t);
+              return{
+                value:t.userName,
+                phone:t.phone,
+                id:t.id
+              }
+            })
+          }
+        })
 
-      selectUser(){
-        this.userDialog = true;
+      },
+      querySearchAsync(queryString, cb) {
+        var restaurants = this.restaurants;
+        var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants;
+        cb(results)
+        // clearTimeout(this.timeout);
+        // this.timeout = setTimeout(() => {
+        //   cb(results);
+        // }, 3000 * Math.random());
+      },
+      createStateFilter(queryString) {
+        return (state) => {
+          return (state.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+      },
 
+      handleSelect(item) {
+        console.log(item.phone);
+        console.log(item.id);
+        console.log(item.value);
+        this.postManagement.complaintPhone = item.phone
+        this.postManagement.workerId = item.id
+        this.postManagement.principal = item.value
+        console.log(item);
+      },
+      handelBlur(){
+        if (this.state!=this.postManagement.principal){
+          this.state="";
+        }
       },
       // 删除文件
       picRemove(file, fileList) {
@@ -395,6 +452,7 @@
                 this.postManagement.supplyTimeId =
                   this.postManagement.supplyTimeId.split(",");
               }
+              this.state = this.postManagement.principal;
               this.timeNodeChange();
               this.fileList = [];
               let params = {
@@ -478,6 +536,8 @@
       },
       // 保存
       saveWork() {
+        this.postManagement.principal = this.state
+        console.log(this.postManagement);
         if (
           !this.postManagement.canteenName ||
           this.postManagement.canteenName.length < 1
@@ -531,6 +591,7 @@
         }
         params.append("principal", this.postManagement.principal);
         params.append("complaintPhone", this.postManagement.complaintPhone);
+        params.append("workerId",this.postManagement.workerId);
         if (this.postManagement.takeoutPhone) {
           params.append("takeoutPhone", this.postManagement.takeoutPhone);
         }
@@ -643,6 +704,9 @@
         this.getData();
       },
     },
+    mounted() {
+      this.loadAll();
+    }
   };
 </script>
 

naqwzsjtj/naqwzsjtj/src/views/canteen/EvaluationManage.vue

@@ -109,7 +109,7 @@
     },
     data() {
       return {
-        imgUrl: "https://www.cqna.gov.cn/mnazw/",
+        imgUrl: process.env.VUE_APP_IMG_URL,
         tableStyle: {
           textAlign: 'center',
         },

naqwzsjtj/naqwzsjtj/src/views/canteen/Food.vue

@@ -137,7 +137,7 @@
         },
         data() {
             return {
-                imgUrl: "https://www.cqna.gov.cn/mnazw/",
+                imgUrl: process.env.VUE_APP_IMG_URL,
                 tableStyle: {
                     textAlign: 'center',
                 },

naqwzsjtj/naqwzsjtj/src/views/canteen/Menu.vue

@@ -192,7 +192,7 @@
     },
     data() {
       return {
-        imgUrl: "https://www.cqna.gov.cn/mnazw/",
+        imgUrl: process.env.VUE_APP_IMG_URL,
         tableStyle: {
           textAlign: "center"
         },

naqwzsjtj/naqwzsjtj/src/views/impressionNanan/Administration.vue

@@ -425,7 +425,7 @@ export default {
     },
     data() {
         return {
-            imgUrl: "https://www.cqna.gov.cn/mnazw/",
+            imgUrl: process.env.VUE_APP_IMG_URL,
             label: "印象南岸专辑管理",
             tableData: [],
             albumTableData: [],

naqwzsjtj/naqwzsjtj/src/views/impressionNanan/ImpressionNanan.vue

@@ -597,7 +597,7 @@ export default {
     },
     data() {
         return {
-            imgUrl: "https://www.cqna.gov.cn/mnazw/",
+            imgUrl: process.env.VUE_APP_IMG_URL,
             orderBy: '',
             fileList: [],
             dialogImageUrl: '',

naqwzsjtj/naqwzsjtj/src/views/rectification/RectificationIndex.vue

@@ -318,7 +318,7 @@
           visible: false
         },
         picList: [],
-        imgUrl: "https://www.cqna.gov.cn/mnazw/",
+        imgUrl: process.env.VUE_APP_IMG_URL,
         dialogImageUrl: '',
         dialogVisible: false,
         picShowList: []

naqwzsjtj/naqwzsjtj/src/views/rectification/components/RectificationEdit.vue

@@ -161,7 +161,7 @@
         // 图片
         picList: [],
         replyPicList: [],
-        imgUrl: "https://www.cqna.gov.cn/mnazw/",
+        imgUrl: process.env.VUE_APP_IMG_URL,
         dialogImageUrl: '',
         dialogVisible: false,
         show: false

naqwzsjtj/naqwzsjtj/src/views/repair/RepairWorker.vue

@@ -101,7 +101,7 @@
     },
     data() {
       return {
-        imgUrl: "https://www.cqna.gov.cn/mnazw/",
+        imgUrl: process.env.VUE_APP_IMG_URL,
         tableStyle: {
           textAlign: "center",
         },

naqwzsjtj/naqwzsjtj/src/views/repair/WorkOrder.vue

@@ -150,7 +150,7 @@
       return {
         workDialog:false,
         assignDialog:false,
-        imgUrl: "https://www.cqna.gov.cn/mnazw/",
+        imgUrl: process.env.VUE_APP_IMG_URL,
         tableStyle: {
           textAlign: 'center',
         },

nngkxxdp/src/main/java/com/example/nngkxxdp/entity/CanteenDO.java

@@ -70,5 +70,10 @@ public class CanteenDO implements Serializable {
     * 是否删除0:未删除 1:删除
     */
     private Integer isdel;
+
+    /**
+     * workerId
+     */
+    private String workerId;
     
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/entity/CanteenNeDO.java

@@ -56,5 +56,9 @@ public class CanteenNeDO implements Serializable {
      */
     private String takeoutPhone;
 
-    
+    /**
+     * workerId
+     */
+    private String workerId;
+
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/program/controller/SWorkerController.java

@@ -18,6 +18,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -117,5 +118,10 @@ public class SWorkerController {
         return ResponseEntity.ok(this.sWorkerService.deleteById(id));
     }
 
+    @GetMapping("list")
+    public ResponseEntity<List<Map<String,String>>> list() {
+        return ResponseEntity.ok(this.sWorkerService.list());
+    }
+
 }
 

nngkxxdp/src/main/java/com/example/nngkxxdp/program/dao/SWorkerDao.java

@@ -2,10 +2,12 @@ package com.example.nngkxxdp.program.dao;
 
 
 import com.example.nngkxxdp.program.entity.SWorker;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * (SWorker)表数据库访问层
@@ -87,5 +89,7 @@ public interface SWorkerDao {
     Integer checkUserRepeats(String phoneNum, Integer role);
 
     Integer getUserType(String userId);
+
+    List<Map<String, String>> queryList();
 }
 

nngkxxdp/src/main/java/com/example/nngkxxdp/program/service/Impl/SWorkerServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -131,5 +132,10 @@ public class SWorkerServiceImpl implements SWorkerService {
         return userType;
     }
 
+    @Override
+    public List<Map<String, String>> list() {
+        return sWorkerDao.queryList();
+    }
+
 
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/program/service/SWorkerService.java

@@ -9,6 +9,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -67,4 +68,6 @@ public interface SWorkerService {
     boolean checkUserRepeats(String phoneNum, Integer role);
 
     Integer getUserType(String userId);
+
+    List<Map<String,String>> list();
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/CanteenServiceImpl.java

@@ -216,6 +216,7 @@ public class CanteenServiceImpl implements CanteenService {
         old.setPrincipal(canteenDO.getPrincipal());
         old.setComplaintPhone(canteenDO.getComplaintPhone());
         old.setTakeoutPhone(canteenDO.getTakeoutPhone());
+        old.setWorkerId(canteenDO.getWorkerId());
         old.setUpdateTime(new Date());
         if (canteenDao.updateSCanteen(old) <= 0) {
             return SendUtil.send(false, ConstStr.RESULT_FAILED);

nngkxxdp/src/main/resources/mapper/CanteenDao.xml

@@ -26,6 +26,7 @@
                principal,
                complaint_phone,
                takeout_phone,
+               worker_id,
                create_time,
                update_time,
                isdel
@@ -49,7 +50,7 @@
     <select id="pageList" resultType="java.util.Map">
         SELECT
         s_canteen.id, canteen_name, canteen_photo_path, supply_time_id, u.user_name founder, s_canteen.principal,
-        complaint_phone complaintPhone, takeout_phone takeoutPhone, s_canteen.create_time, s_canteen.update_time,
+        complaint_phone complaintPhone, takeout_phone takeoutPhone, s_canteen.create_time, s_canteen.update_time,worker_id,
         s_canteen.isdel
         FROM s_canteen
         LEFT JOIN p_user u
@@ -76,9 +77,9 @@
     <!--新增所有列-->
     <insert id="addSCanteen">
         INSERT INTO s_canteen(id, canteen_name, canteen_photo_path, supply_time_id, founder, principal,
-                              complaint_phone, takeout_phone, create_time, update_time, isdel)
+                              complaint_phone, takeout_phone, create_time, update_time, isdel,worker_id)
         VALUES (#{id}, #{canteenName}, #{canteenPhotoPath}, #{supplyTimeId}, #{founder}, #{principal},
-                #{complaintPhone}, #{takeoutPhone}, #{createTime}, #{updateTime}, #{isdel})
+                #{complaintPhone}, #{takeoutPhone}, #{createTime}, #{updateTime}, #{isdel},#{workerId})
     </insert>
 
     <!--通过主键修改数据-->
@@ -106,6 +107,9 @@
             <if test="updateTime != null">
                 update_time = #{updateTime},
             </if>
+            <if test="workerId !=null and workerId !=''">
+                worker_id = #{workerId},
+            </if>
             <if test="isdel != null">
                 isdel = #{isdel},
             </if>
@@ -142,17 +146,19 @@
 
     <select id="getAllCanteen" resultType="com.example.nngkxxdp.entity.CanteenNeDO">
         SELECT canteen_name,
-               id,
-               supply_time_id,
-               founder,
-               principal,
-               complaint_phone,
-               takeout_phone,
-               canteen_photo_path
-        FROM s_canteen
-        WHERE isdel = 0
+        sc.id,
+        sc.supply_time_id,
+        sc.founder,
+        sc.principal,
+        sc.complaint_phone,
+        sc.takeout_phone,
+        sc.canteen_photo_path,
+        sc.worker_id
+        FROM s_canteen sc
+        left join s_worker sw on sc.worker_id = sw.id
+        WHERE sc.isdel = 0
         <if test="userId != null and userId != ''">
-            AND principal = #{userId}
+            AND sw.wx_user_id = #{userId}
         </if>
     </select>
     <select id="getAllDeliciousByDishesId" resultType="java.util.Map">

nngkxxdp/src/main/resources/mapper/SWorkerDao.xml

@@ -130,5 +130,9 @@
         select role from s_worker where wx_user_id = #{userId} limit 1
     </select>
 
+    <select id="queryList" resultType="map">
+        select name as userName,phone_num as phone,id from s_worker where is_del = 0 and role = 1
+    </select>
+
 </mapper>
 

nngkxxdp/src/main/resources/static/natj/dataCenter/index.html

@@ -87,7 +87,7 @@
                     <select id="year">
                         <option value="2021">2021年</option>
                         <option value="2022">2022年</option>
-                        <option value="2023">2023年</option>
+                        <option value="2023">2023年一季度</option>
                     </select>
                     <img src="images/arrow.png" alt="" style="position: absolute;right: 10px;">
                 </div>
@@ -165,7 +165,7 @@
                         <li><span>结案率</span><span>（%）</span></li>
                     </ul>
                     <ul class="number">
-                        <li style="width: 200px;">2023</li>
+                        <li style="width: 200px;">2023年一季度</li>
                         <li>1495</li>
                         <li>1495</li>
                         <li>1153</li>

nngkxxdp/src/main/resources/static/natj/enter_showStatis.html

@@ -340,7 +340,7 @@
 							<li lay-id="scalemain" style="width: 130px;">规模以上工业增加值</li>
 							<li lay-id="constructionmain" style="width: 100px;">建筑业总产值</li>
 							<li lay-id="fixedAssetsmain" style="width: 120px;">固定资产投资总额</li>
-							<li lay-id="realtyMarketmain" style="width: 120px;">商品房建设与销售</li>
+							<li lay-id="realtyMarketmain" style="width: 120px;">商品房销售面积</li>
 							<li lay-id="inlandTrademain" style="width: 120px;">社会消费品零售总额</li>
 							<li lay-id="publicIncomemain" style="width: 100px;">地方财政收支</li>
 							<!-- <li lay-id="bankmain" style="width: 100px;">金融机构存贷款</li> -->

nngkxxdp/src/main/resources/static/natj/js/enterStatisMain.js

@@ -46,7 +46,7 @@ layui.use(['element', 'form', 'tree', 'util', 'laydate'], function () {
 
 			},
 			{
-				title: '商品房建设与销售',
+				title: '商品房销售面积',
 				id: 4,
 				color1: '#34D3EB',
 

nngkxxdp/src/main/resources/static/natj/progress/dataDetail.html

@@ -24,16 +24,16 @@
 </head>
 
 <body>
-    <div style="width: 1100px;margin: 10px auto">
-        <div class="title">工业</div>
-        <div id="industry"></div>
-        <div class="title">固定资产投资</div>
-        <div id="fixedAssets"></div>
-        <div class="title">房地产市场</div>
-        <div id="realEstate"></div>
-        <div class="title">财政收支</div>
-        <div id="finance"></div>
-    </div>
+<div style="width: 1100px;margin: 10px auto">
+    <div class="title">工业</div>
+    <div id="industry"></div>
+    <div class="title">固定资产投资</div>
+    <div id="fixedAssets"></div>
+    <div class="title">房地产市场</div>
+    <div id="realEstate"></div>
+    <div class="title">财政收支</div>
+    <div id="finance"></div>
+</div>
 </body>
 <script src="js/echarts.min.js"></script>
 <script>
@@ -55,7 +55,7 @@
         },
         xAxis: {
             type: 'category',
-            data: ['2021第一季度', '2021.1月-4月', '2021.1月-5月', '2021上半年', '2021.1月-7月', '2021.1月-8月', '2021年前三季度', '2021.1月-10月', '2021.1月-11月', '2021年全年', '2022.1月-2月', '2022第一季度', '2022.1月-4月', '2022.1月-5月', '2022上半年', '2022.1月-7月', '2022.1月-8月','2022年前三季度','2022.1月-10月'],
+            data: ['2021第一季度', '2021.1月-4月', '2021.1月-5月', '2021上半年', '2021.1月-7月', '2021.1月-8月', '2021年前三季度', '2021.1月-10月', '2021.1月-11月', '2021年全年', '2022.1月-2月', '2022第一季度', '2022.1月-4月', '2022.1月-5月', '2022上半年', '2022.1月-7月', '2022.1月-8月', '2022年前三季度', '2022.1月-10月', '2022.1月-11月', '2022年全年', '2023.1月-2月'],
             axisPointer: {
                 type: 'shadow'
             },
@@ -93,7 +93,7 @@
                     }
                 },
                 data: [
-                    40.1, 28.8, 20.3, 14.2, 13.8, 13.1, 11.3, 10.9, 9.5, 7.4, 2.0, 4.6, 4.6, 5.6, 3.2, 1.0, -1.0, 0.5, 0.9
+                    40.1, 28.8, 20.3, 14.2, 13.8, 13.1, 11.3, 10.9, 9.5, 7.4, 2.0, 4.6, 4.6, 5.6, 3.2, 1.0, -1.0, 0.5, 0.9, -0.7, -0.4, 8.3
                 ]
             }
         ]
@@ -121,7 +121,7 @@
         xAxis: [
             {
                 type: 'category',
-                data: ['2021第一季度', '2021.1月-4月', '2021.1月-5月', '2021上半年', '2021.1月-7月', '2021.1月-8月', '2021年前三季度', '2021.1月-10月', '2021.1月-11月', '2021年全年', '2022.1月-2月', '2022第一季度', '2022.1月-4月', '2022.1月-5月', '2022上半年', '2022.1月-7月', '2022.1月-8月','2022年前三季度','2022.1月-10月'],
+                data: ['2021第一季度', '2021.1月-4月', '2021.1月-5月', '2021上半年', '2021.1月-7月', '2021.1月-8月', '2021年前三季度', '2021.1月-10月', '2021.1月-11月', '2021年全年', '2022.1月-2月', '2022第一季度', '2022.1月-4月', '2022.1月-5月', '2022上半年', '2022.1月-7月', '2022.1月-8月', '2022年前三季度', '2022.1月-10月', '2022.1月-11月', '2022年全年', '2023.1月-2月'],
                 axisPointer: {
                     type: 'shadow'
                 },
@@ -162,7 +162,7 @@
                     }
                 },
                 data: [
-                    12.3, 20.6, 7.0, 11.1, 16.4, 15.2, 13.4, 8.0, 5.9, 0.1, 2.5, 9.6, -0.7, -6.9, 4.8, -3.1, -0.3, 2.0, 1.0
+                    12.3, 20.6, 7.0, 11.1, 16.4, 15.2, 13.4, 8.0, 5.9, 0.1, 2.5, 9.6, -0.7, -6.9, 4.8, -3.1, -0.3, 2.0, 1.0, -5.9, -3.8, 11.5
                 ]
             }
         ]
@@ -191,7 +191,7 @@
         xAxis: [
             {
                 type: 'category',
-                data: ['2021第一季度', '2021.1月-4月', '2021.1月-5月', '2021上半年', '2021.1月-7月', '2021.1月-8月', '2021年前三季度', '2021.1月-10月', '2021.1月-11月', '2021年全年', '2022.1月-2月', '2022第一季度', '2022.1月-4月', '2022.1月-5月', '2022上半年', '2022.1月-7月', '2022.1月-8月','2022年前三季度','2022.1月-10月'],
+                data: ['2021第一季度', '2021.1月-4月', '2021.1月-5月', '2021上半年', '2021.1月-7月', '2021.1月-8月', '2021年前三季度', '2021.1月-10月', '2021.1月-11月', '2021年全年', '2022.1月-2月', '2022第一季度', '2022.1月-4月', '2022.1月-5月', '2022上半年', '2022.1月-7月', '2022.1月-8月', '2022年前三季度', '2022.1月-10月', '2022.1月-11月', '2022年全年', '2023.1月-2月'],
                 axisPointer: {
                     type: 'shadow'
                 },
@@ -251,7 +251,7 @@
                         return value + ' 万平方米';
                     }
                 },
-                data: [39.6, 56.08, 79.73, 112.4, 123.82, 134.79, 153.2, 183.92, 204.78, 234.1, 14.1, 37.8, 61.5, 82.4, 101.3, 109.3, 112.2,121.3,133.6]
+                data: [39.6, 56.08, 79.73, 112.4, 123.82, 134.79, 153.2, 183.92, 204.78, 234.1, 14.1, 37.8, 61.5, 82.4, 101.3, 109.3, 112.2, 121.3, 133.6, 134.8, 149.45, 12.4]
             },
             {
                 name: '同比增减（%）',
@@ -263,7 +263,7 @@
                     }
                 },
                 data: [
-                    41.9, 39.4, 23.9, 21.2, 10.6, 5.1, -9.4, -3.5, -2.0, -11.3, 25.9, -4.5, 9.7, 3.1, -9.9, -11.7, -16.7,-20.8,-27.3
+                    41.9, 39.4, 23.9, 21.2, 10.6, 5.1, -9.4, -3.5, -2.0, -11.3, 25.9, -4.5, 9.7, 3.1, -9.9, -11.7, -16.7, -20.8, -27.3, -34.2, -36.1, -12.9
                 ]
             }
         ]
@@ -292,7 +292,10 @@
         ['2022.1月-7月', 31.9, -17.5, 25.8, -18.7],
         ['2022.1月-8月', 34.8, -16.3, 27.4, -19.8],
         ['2022年前三季度', 38.85, -13.7, 29.85, -13.7],
-        ['2022.1月-10月', 38.8, -13.7, 29.8, -13.7]
+        ['2022.1月-10月', 38.8, -13.7, 29.8, -13.7],
+        ['2022.1月-11月', 53, -22, 37.8, 14.7],
+        ['2022年全年', 56.8, 0.7, 39.5, -13.5],
+        ['2023.1月-2月', 8.83, -8.1, 6.89, -15.7]
     ]
     var chartDom = document.getElementById('finance');
     var myChart = echarts.init(chartDom);
@@ -344,24 +347,24 @@
                 show: true
             }
         },
-        {
-            type: 'value',
-            min: -20,
-            max: 60,
-            interval: 10,
-            axisLabel: {
-                formatter: '{value} %'
-            },
-            axisTick: {
-                show: true  //坐标轴刻度线
-            },
-            axisLine: { //轴线
-                show: true
-            },
-            splitLine: { //网格线
-                show: true
-            }
-        }],
+            {
+                type: 'value',
+                min: -20,
+                max: 60,
+                interval: 10,
+                axisLabel: {
+                    formatter: '{value} %'
+                },
+                axisTick: {
+                    show: true  //坐标轴刻度线
+                },
+                axisLine: { //轴线
+                    show: true
+                },
+                splitLine: { //网格线
+                    show: true
+                }
+            }],
         series: [{
             type: 'bar',
             itemStyle: {
@@ -373,41 +376,41 @@
                 }
             }
         },
-        {
-            yAxisIndex: 1,
-            type: 'line',
-            itemStyle: {
-                color: '#FAA639'
-            },
-            tooltip: {
-                valueFormatter: function (value) {
-                    return value + ' %';
+            {
+                yAxisIndex: 1,
+                type: 'line',
+                itemStyle: {
+                    color: '#FAA639'
+                },
+                tooltip: {
+                    valueFormatter: function (value) {
+                        return value + ' %';
+                    }
                 }
-            }
-        },
-        {
-            type: 'bar',
-            itemStyle: {
-                color: '#8EC051'
             },
-            tooltip: {
-                valueFormatter: function (value) {
-                    return value + ' 亿元';
+            {
+                type: 'bar',
+                itemStyle: {
+                    color: '#8EC051'
+                },
+                tooltip: {
+                    valueFormatter: function (value) {
+                        return value + ' 亿元';
+                    }
                 }
-            }
-        },
-        {
-            type: 'line',
-            yAxisIndex: 1,
-            itemStyle: {
-                color: '#27C2C1'
             },
-            tooltip: {
-                valueFormatter: function (value) {
-                    return value + ' %';
+            {
+                type: 'line',
+                yAxisIndex: 1,
+                itemStyle: {
+                    color: '#27C2C1'
+                },
+                tooltip: {
+                    valueFormatter: function (value) {
+                        return value + ' %';
+                    }
                 }
-            }
-        },
+            },
         ]
     };
     option && myChart.setOption(option);

nngkxxdp/src/main/resources/static/yxnaht/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Vue App</title><link href="js/chunk-2d230fe7.d83a3841.js" rel="prefetch"><link href="css/app.42103a00.css" rel="preload" as="style"><link href="css/chunk-vendors.f0f40be2.css" rel="preload" as="style"><link href="js/app.48cf2f7a.js" rel="preload" as="script"><link href="js/chunk-vendors.efa824fd.js" rel="preload" as="script"><link href="css/chunk-vendors.f0f40be2.css" rel="stylesheet"><link href="css/app.42103a00.css" rel="stylesheet"></head><body><div id="app"></div><script src="js/chunk-vendors.efa824fd.js"></script><script src="js/app.48cf2f7a.js"></script></body></html>
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Vue App</title><link href="js/chunk-2d230fe7.d83a3841.js" rel="prefetch"><link href="css/app.d4e33fc8.css" rel="preload" as="style"><link href="css/chunk-vendors.f0f40be2.css" rel="preload" as="style"><link href="js/app.5e7f359f.js" rel="preload" as="script"><link href="js/chunk-vendors.efa824fd.js" rel="preload" as="script"><link href="css/chunk-vendors.f0f40be2.css" rel="stylesheet"><link href="css/app.d4e33fc8.css" rel="stylesheet"></head><body><div id="app"></div><script src="js/chunk-vendors.efa824fd.js"></script><script src="js/app.5e7f359f.js"></script></body></html>

nngkxxdp/src/main/resources/static/zdjc/sy.html

@@ -14,6 +14,8 @@
     <script src="./layui/layui.js" type="text/javascript" charset="utf-8"></script>
     <script src="./js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
     <style type="text/css">
+		body::-webkit-scrollbar {width: 0 !important}
+		body{overflow:-moz-scrollbars-none;}
         .quesTanchu {
             background-color: #FFF;
             width: 620px;
@@ -429,7 +431,7 @@
                             + '</p>'
                             + '<div class="data-contanier">'
                             + '<a href="javascript:void(0);" title="' + deptName + '">' + deptName + '</a>'
-                            + '<span style="display: none;">' + time + '</span>'
+                            + '<span style="display: block;">' + time + '</span>'
                             + '</div>'
                             + '</div>';
                         dataMap[data[i]['_source'].id] = datas.highlightArr[i];
@@ -504,8 +506,13 @@
 
     function openWindow(data) {
         //console.log(dataMap[data])
-        sessionStorage.ELK_ARTICLE = JSON.stringify(dataMap[data]);
+		if (dataMap[data].content) {
+			 sessionStorage.ELK_ARTICLE = JSON.stringify(dataMap[data]);
         window.location = 'xq.html';
+		} else {
+			window.open(dataMap[data].url, '_blank');
+		}
+       
     }
 
     function escape2Html(str) {
@@ -621,9 +628,14 @@
     // };
 
     function openWindow(data) {
-        console.log(dataMap[data])
-        sessionStorage.ELK_ARTICLE = JSON.stringify(dataMap[data]);
+       // console.log(dataMap[data])
+	   if (dataMap[data].content) {
+			 sessionStorage.ELK_ARTICLE = JSON.stringify(dataMap[data]);
         window.location = 'xq.html';
+		} else {
+			window.open(dataMap[data].url, '_blank');
+		}
+      
     }
 
     function openWindow2(data) {