按钮统一，健康档案指标图添加

src/stores/user.js

@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-// import local from './local/wyj'
+// import local from './local/lhl'
 // localStorage.setItem(
 //   "userInfo",
 //   JSON.stringify(local)

src/views/jkdagl/bbtj/bbxq/index.vue

@@ -1,47 +1,119 @@
 <template>
-  <div>
-    <header>
-      <p><span class="blank">学校</span>{{ detailMsg.jkda_xs	
- }}</p>
-      <p><span class="blank">年级编号</span> {{ detailMsg.jkda_njbh }}</p>
-      <p><span class="blank">班级编号</span> {{ detailMsg.jkda_bjbh }}</p>
-      <p><span class="blank">班级名称</span> {{ detailMsg.jkda_bjmc }}</p>
-      <p><span class="blank">学籍号</span> {{ detailMsg.jkda_xjh }}</p>
-      <p><span class="blank">民族</span> {{ detailMsg.jkda_mz }}</p>
-      <p><span class="blank">姓名</span> {{ detailMsg.jkda_xm }}</p>
-      <p><span class="blank">性别</span> {{ detailMsg.jkda_xb }}</p>
-      <p><span class="blank">出生日期</span>{{ detailMsg.jkda_csrq }}</p>
-      <p><span class="blank">身高</span> {{ detailMsg.jkda_sg }}</p>
-      <p><span class="blank">体重</span> {{ detailMsg.jkda_tz }}</p>
-      <p><span class="blank">体重评分</span> {{ detailMsg.jkda_tz_pf }}</p>
-      <p><span class="blank">体重等级</span> {{ detailMsg.jkda_tz_dj }}</p>
-      <p><span class="blank">肺活量</span> {{ detailMsg.jkda_fhl }}</p>
-      <p><span class="blank">肺活量评分</span> {{ detailMsg.jkda_fhl_pf }}</p>
-      <p><span class="blank">肺活量等级</span> {{ detailMsg.jkda_fhl_dj }}</p>
-      <p><span class="blank">50米跑</span>{{ detailMsg.jkda_50m }}</p>
-      <p><span class="blank">50米跑评分</span> {{ detailMsg.jkda_50m_pf }}</p>
-      <p><span class="blank">50米跑等级</span> {{ detailMsg.jkda_50m_dj }}</p>
-      <p><span class="blank">坐位体前屈</span> {{ detailMsg.jkda_zltqq }}</p>
-      <p><span class="blank">坐位体前屈评分</span> {{ detailMsg.jkda_zltqq_pf }}</p>
-      <p><span class="blank">坐位体前屈等级</span> {{ detailMsg.jkda_zltqq_dj }}</p>
-      <p><span class="blank">一分钟仰卧起坐</span> {{ detailMsg.jkda_1minywqz }}</p>
-      <p><span class="blank">一分钟仰卧起坐评分</span> {{ detailMsg.jkda_1minywqz_pf }}</p>
-      <p><span class="blank">一分钟仰卧起坐等级</span> {{ detailMsg.jkda_1minywqz_dj }}</p>
-      <p><span class="blank">一分钟跳绳</span> {{ detailMsg.jkda_1mints }}</p>
-      <p><span class="blank">一分钟跳绳评分</span> {{ detailMsg.jkda_1mints_pf }}</p>
-      <p><span class="blank">一分钟跳绳等级</span> {{ detailMsg.jkda_1mints_dj }}</p>
-      <p><span class="blank">50米×8往返跑</span> {{ detailMsg.jkda_50mx8 }}</p>
-      <p><span class="blank">50米×8往返跑评分</span> {{ detailMsg.jkda_50mx8_pf }}</p>
-      <p><span class="blank">50米×8往返跑等级</span> {{ detailMsg.jkda_50mx8_dj }}</p>
-      <p><span class="blank">标准分</span> {{ detailMsg.jkda_bzf }}</p>
-      <p><span class="blank">附加分</span> {{ detailMsg.jkda_fjf }}</p>
-      <p><span class="blank">总分</span> {{ detailMsg.jkda_zf }}</p>
-      <p><span class="blank">总分等级</span> {{ detailMsg.jkda_zfdj }}</p>
-    </header>
+  <div class="topPart w-full">
+    <table class="Tb mx-auto" width="100%" cellspacing="0" cellpadding="0">
+      <tr>
+        <td class="titleOpt">学校</td>
+        <td>{{ detailMsg.jkda_xs }}</td>
+        <td class="titleOpt">年级编号</td>
+        <td>{{ detailMsg.jkda_njbh }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">班级编号</td>
+        <td>{{ detailMsg.jkda_bjbh }}</td>
+        <td class="titleOpt">班级名称</td>
+        <td>{{ detailMsg.jkda_bjmc }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">学籍号</td>
+        <td>{{ detailMsg.jkda_xjh }}</td>
+        <td class="titleOpt">民族</td>
+        <td>{{ detailMsg.jkda_mz }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">姓名</td>
+        <td>{{ detailMsg.jkda_xm }}</td>
+        <td class="titleOpt">性别</td>
+        <td>{{ detailMsg.jkda_xb }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">出生日期</td>
+        <td>{{ detailMsg.jkda_csrq }}</td>
+        <td class="titleOpt">身高</td>
+        <td>{{ detailMsg.jkda_sg }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">体重</td>
+        <td>{{ detailMsg.jkda_tz }}</td>
+        <td class="titleOpt">体重评分</td>
+        <td>{{ detailMsg.jkda_tz_pf }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">体重等级</td>
+        <td>{{ detailMsg.jkda_tz_dj }}</td>
+        <td class="titleOpt">肺活量</td>
+        <td>{{ detailMsg.jkda_fhl }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">肺活量评分</td>
+        <td>{{ detailMsg.jkda_fhl_pf }}</td>
+        <td class="titleOpt">肺活量等级</td>
+        <td>{{ detailMsg.jkda_fhl_dj }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">50米跑</td>
+        <td>{{ detailMsg.jkda_50m }}</td>
+        <td class="titleOpt">50米跑评分</td>
+        <td>{{ detailMsg.jkda_50m_pf }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">50米跑等级</td>
+        <td>{{ detailMsg.jkda_50m_dj }}</td>
+        <td class="titleOpt">坐位体前屈</td>
+        <td>{{ detailMsg.jkda_zltqq }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">坐位体前屈评分</td>
+        <td>{{ detailMsg.jkda_zltqq_pf }}</td>
+        <td class="titleOpt">坐位体前屈等级</td>
+        <td>{{ detailMsg.jkda_zltqq_dj }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">一分钟仰卧起坐</td>
+        <td>{{ detailMsg.jkda_1minywqz }}</td>
+        <td class="titleOpt">一分钟仰卧起坐评分</td>
+        <td>{{ detailMsg.jkda_1minywqz_pf }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">一分钟仰卧起坐等级</td>
+        <td>{{ detailMsg.jkda_1minywqz_pf }}</td>
+        <td class="titleOpt">一分钟跳绳</td>
+        <td>{{ detailMsg.jkda_1mints }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">一分钟跳绳评分</td>
+        <td>{{ detailMsg.jkda_1mints_pf }}</td>
+        <td class="titleOpt">一分钟跳绳等级</td>
+        <td>{{ detailMsg.jkda_1mints_dj }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">50米×8往返跑</td>
+        <td>{{ detailMsg.jkda_50mx8 }}</td>
+        <td class="titleOpt">50米×8往返跑评分</td>
+        <td>{{ detailMsg.jkda_50mx8_pf }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">50米×8往返跑等级</td>
+        <td>{{ detailMsg.jkda_50mx8_dj }}</td>
+        <td class="titleOpt">标准分</td>
+        <td>{{ detailMsg.jkda_bzf }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">附加分</td>
+        <td>{{ detailMsg.jkda_fjf }}</td>
+        <td class="titleOpt">总分</td>
+        <td>{{ detailMsg.jkda_zf }}</td>
+      </tr>
+      <tr>
+        <td class="titleOpt">总分等级</td>
+        <td>{{ detailMsg.jkda_zfdj }}</td>
+        <td class="titleOpt"></td>
+        <td></td>
+      </tr>
+    </table>
   </div>
 </template>
 <script>
-import { jkda_detail } from "./api"
+import { jkda_detail } from "./api";
 export default {
   data() {
     return {
@@ -51,8 +123,8 @@ export default {
   methods: {
     getDetailData() {
       let data = {
-        jkda_id: this.jkda_id
-      }
+        jkda_id: this.jkda_id,
+      };
       jkda_detail(data).then((res) => {
         this.loading = false;
         this.detailMsg = res.data.one_info;
@@ -64,40 +136,36 @@ export default {
       this.jkda_id = this.$route.params.id;
       this.getDetailData();
     }
-
-  }
+  },
 };
 </script>
 <style lang="scss" scoped>
-.flex {
-  display: flex;
-}
-header {
-  padding: 15px 20px;
-  font-family: PingFangSC-Regular;
-  box-sizing: border-box;
-  color: #969696;
+.topPart {
+  min-height: 900px;
   font-size: 14px;
-  .title {
-    justify-content: space-between;
-    h3 {
-      color: #000;
-      font-size: 16px;
-    }
-  }
+  border-radius: 10px;
+}
+.Tb{
+  max-width:70%;
+  min-width:60% 
 }
-.blank {
-  display: inline-block;
-  color: #000;
-  width: 140px;
-  padding-bottom: 10px;
+.Tb tr {
+  line-height: 50px;
 }
-.imgs {
-  img {
-    width: 160px;
-    height: 90px;
-    background: rgba(0, 0, 0, 0);
-    margin-right: 23px;
+.Tb td {
+   height: 30px;
+  border: #cccccc 1px solid;
+  box-sizing: border-box;
+  padding-left: 1%;
+  &:nth-child(odd){
+    width: 20%;
   }
+   &:nth-child(even){
+    width: 30%;
+  }
+}
+
+.titleOpt {
+  min-width: 120px;
 }
 </style>

src/views/jkdagl/bbtj/detail.vue

@@ -1,23 +1,40 @@
 <template>
-  <div>
+  <div class="">
     <div class="d-flex flex-between">
       <div>
-        <p><span class="blank">{{jkbb_bbmc}}</span></p>
+        <p>
+          <span class="blank">{{ jkbb_bbmc }}</span>
+        </p>
       </div>
-      <el-form label-width="100px" :inline="true">
 
-        <el-button type="primary" class="mr15" @click="exportAll">导出</el-button>
+      <el-form label-width="100px" :inline="true">
+        <el-button type="primary" class="mr15" @click="exportAll"
+          >导出</el-button
+        >
       </el-form>
     </div>
-    <el-table :data="tableData" tooltip-effect="dark" @selection-change="handleSelectionChange" v-loading="loading" ref="multipleTable" style="width: 100%">
+    <div class="flex justify-center h-250px bg-hex-fff pt-20px pr-30px -ml-10px " style="width: calc( 100% + 40px );border-top: 10px solid #F2F6FC;border-bottom: 10px solid #F2F6FC;border-radius: 4px"  >
+      <div
+        :id="'pieChart' + index"
+        class="min-w-1/6 h-full"
+        v-for="(item, index) in healthIndicatorData"
+        :key="index"
+      ></div>
+    </div>
+    <el-table
+      :data="tableData"
+      tooltip-effect="dark"
+      @selection-change="handleSelectionChange"
+      v-loading="loading"
+      ref="multipleTable"
+      style="width: 100%"
+    >
       <el-table-column type="selection" align="center" width="55">
       </el-table-column>
       <el-table-column label="序号" align="center" type="index" width="50">
       </el-table-column>
       <el-table-column label="年级编号" width="auto" prop="jkda_njbh">
-        <template>
-
-        </template>
+        <template> </template>
       </el-table-column>
       <el-table-column label="班级编号" prop="jkda_bjbh" width="auto">
       </el-table-column>
@@ -35,20 +52,33 @@
       </el-table-column>
       <el-table-column label="操作" width="100">
         <template slot-scope="scope">
-          <el-button type="text" @click="toDetail(scope.row.jkda_id)">详情 </el-button>
+          <el-button type="text" @click="toDetail(scope.row.jkda_id)"
+            >详情
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    <footer class="flex-item-none" style="display: flex; justify-content: flex-end; margin-top: 30px">
-      <el-pagination background layout="total,prev, pager, next" :page-size="limit" :total="total" :current-page.sync="cur_page" @current-change="handleCurrentChange"></el-pagination>
+    <footer
+      class="flex-item-none"
+      style="display: flex; justify-content: flex-end; margin-top: 30px"
+    >
+      <el-pagination
+        background
+        layout="total,prev, pager, next"
+        :page-size="limit"
+        :total="total"
+        :current-page.sync="cur_page"
+        @current-change="handleCurrentChange"
+      ></el-pagination>
     </footer>
   </div>
 </template>
 
 <script>
+import * as echarts from "echarts";
 import { useUserStore } from "@/stores/user";
 const { real_name, token } = useUserStore();
-import { jkda_list, } from "./api";
+import { jkda_list } from "./api";
 export default {
   name: "index",
   data() {
@@ -63,11 +93,93 @@ export default {
       id: "",
       loading: false,
       isEdit: false,
-      jkbb_bbmc: ""
+      jkbb_bbmc: "",
+      healthIndicatorData: [
+        {
+          title: "体重等级",
+          data: [
+            { value: 12.0, name: "体重" },
+            { value: 70, name: "体重评分" },
+          ],
+        },
+        {
+          title: "肺活量等级",
+          data: [
+            { value: 12.0, name: "肺活量" },
+            { value: 70, name: "肺活量评分" },
+          ],
+        },
+        {
+          title: "50米跑等级",
+          data: [
+            { value: 12.0, name: "50米跑" },
+            { value: 70, name: "50米跑评分" },
+          ],
+        },
+        {
+          title: "坐位体前屈等级",
+          data: [
+            { value: 12.0, name: "坐位体前屈" },
+            { value: 70, name: "坐位体前屈评分" },
+          ],
+        },
+        {
+          title: "一分钟跳绳等级",
+          data: [
+            { value: 12.0, name: "一分钟跳绳" },
+            { value: 70, name: "一分钟跳绳评分" },
+          ],
+        },
+        {
+          title: "总分等级",
+          data: [
+            { value: 12.0, name: "总分" },
+            { value: 70, name: "总分评分" },
+          ],
+        },
+      ],
     };
   },
 
   methods: {
+    pieChart() {
+      for (let i = 0; i < this.healthIndicatorData.length; i++) {
+        let item = this.healthIndicatorData[i];
+        var chartDom = document.getElementById("pieChart" + i);
+        var myChart = echarts.init(chartDom);
+        var option;
+        option = {
+          title: {
+            text: item.title,
+            left: "center",
+          },
+          tooltip: {
+            trigger: "item",
+          },
+          series: [
+            {
+              //name: 'Access From',
+              type: "pie",
+              radius: "50%",
+              // label: {
+              //   formatter: "{b} {d}%",
+              // },
+              data: item.data,
+              emphasis: {
+                itemStyle: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: "rgba(0, 0, 0, 0.5)",
+                },
+              },
+            },
+          ],
+        };
+
+        option && myChart.setOption(option);
+      }
+    },
+
     getListData() {
       this.loading = true;
       let data = {
@@ -92,7 +204,6 @@ export default {
       for (let i in val) {
         this.multipleSelection.push(val[i].jkda_id);
       }
-
     },
     exportAll() {
       let ids = this.multipleSelection.join(",");
@@ -100,7 +211,8 @@ export default {
         window.globalVariables.api +
         "/jdbg/jkda/index?api=xls&page=1&limit=10000&token=" +
         token +
-        "&jkda_id=" + ids +
+        "&jkda_id=" +
+        ids +
         "&jkbb_xq=" +
         this.$route.params.jkbb_xq +
         "&jkbb_bbmc=" +
@@ -123,18 +235,22 @@ export default {
           id: id,
         },
       });
-    }
+    },
   },
   mounted() {
-    if (this.$route.params.jkbb_xq != "" & this.$route.params.jkbb_bbmc != "") {
+    if (
+      (this.$route.params.jkbb_xq != "") &
+      (this.$route.params.jkbb_bbmc != "")
+    ) {
       this.jkbb_xq = this.$route.params.jkbb_xq;
       this.jkbb_bbmc = this.$route.params.jkbb_bbmc;
       this.getListData();
+      this.pieChart();
     }
-
-  }
+  },
 };
 </script>
 
 <style scoped>
+
 </style>

src/views/jkdagl/bbtj/index.vue

@@ -2,8 +2,8 @@
   <div>
     <div class="d-flex flex-between">
       <div>
-        <el-button type="success" size="medium" @click="addData">
-          <span class="d-in-block v-mid el-icon-plus font-size-16"></span>
+        <el-button type="primary" size="medium" @click="addData">
+          <span class="d-in-block v-mid font-size-16"></span>
           <span class="d-in-block v-mid font-size-14">新建报表</span>
         </el-button>
         <el-button type="primary" size="medium" @click="exportAll" :disabled="multipleSelection.length == 0">

src/views/jkdagl/sjgl/index.vue

@@ -1,12 +1,37 @@
 <template>
-  <div class="content ">
-    <div class="flex-1 box" style="width:100%;height:390px">
+  <div class="content">
+    <div class="flex-1 box" style="width: 100%; height: 390px">
       <h3 class="title ph15">学生健康数据异常分析</h3>
-      <div id="barChart" style="width:60%;height:85%;box-sizing: border-box;display:inline-block;margin-right:30px"></div>
-      <div id="pieChart" style="width:35%;height:85%;box-sizing: border-box;display:inline-block"></div>
+      <div
+        id="barChart"
+        style="
+          width: 60%;
+          height: 85%;
+          box-sizing: border-box;
+          display: inline-block;
+          margin-right: 30px;
+        "
+      ></div>
+      <div
+        id="pieChart"
+        style="
+          width: 35%;
+          height: 85%;
+          box-sizing: border-box;
+          display: inline-block;
+        "
+      ></div>
     </div>
-    <div style="width:100%;">
-      <div class="box mt10" style="width:49.7%;display:inline-block;margin-right:0.6%">
+    <div style="width: 100%">
+      <div
+        class="box mt10"
+        style="
+          width: 49.7%;
+          display: inline-block;
+          margin-right: 0.6%;
+          min-height: 320px;
+        "
+      >
         <h3 class="title ph15">学校健康异常数据报警</h3>
         <div class="ph15 pv20">
           <table class="data-table">
@@ -16,15 +41,19 @@
               <th width="30%">异常人数</th>
             </tr>
             <tr v-for="item in totalData.school_alert">
-              <td>{{item.xxmc}}</td>
-              <td class="center">{{item.zrs}}</td>
-              <td class="center"><span class="text-red">{{item.ycrs}}</span></td>
+              <td>{{ item.xxmc }}</td>
+              <td class="center">{{ item.zrs }}</td>
+              <td class="center">
+                <span class="text-red">{{ item.ycrs }}</span>
+              </td>
             </tr>
-
           </table>
         </div>
       </div>
-      <div class="box" style="width:49.7%;display:inline-block;">
+      <div
+        class="box"
+        style="width: 49.7%; display: inline-block; min-height: 320px"
+      >
         <div class="title ph15 d-flex flex-between">
           <span>全市/县/学校学生体质健康达标率动态变化</span>
           <el-dropdown class="mr25 hand">
@@ -32,7 +61,12 @@
               {{ currentYear }}<i class="el-icon-arrow-down el-icon--right"></i>
             </span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item v-for="(item,index) in yearData" :key="index" @click="yearSelectHandle(item)">{{ item }}</el-dropdown-item>
+              <el-dropdown-item
+                v-for="(item, index) in yearData"
+                :key="index"
+                @click="yearSelectHandle(item)"
+                >{{ item }}</el-dropdown-item
+              >
             </el-dropdown-menu>
           </el-dropdown>
         </div>
@@ -45,22 +79,24 @@
               <th width="30%" class="left">变化</th>
             </tr>
             <tr v-for="item in totalData.phase_alert">
-              <td>{{item.xd}}</td>
-              <td>{{item.sj}}</td>
-              <td class="center"><span class="text-red">{{item.bjgl}}</span></td>
-              <td><span class="text-red">{{item.bh}}</span></td>
+              <td>{{ item.xd }}</td>
+              <td>{{ item.sj }}</td>
+              <td class="center">
+                <span class="text-red">{{ item.bjgl }}</span>
+              </td>
+              <td>
+                <span class="text-red">{{ item.bh }}</span>
+              </td>
             </tr>
           </table>
         </div>
       </div>
     </div>
-
   </div>
-
 </template>
 
 <script>
-import * as echarts from 'echarts';
+import * as echarts from "echarts";
 import { sjgl } from "./api";
 export default {
   name: "index",
@@ -73,21 +109,21 @@ export default {
       pieData: [],
       yearData: [],
       year: [],
-      currentYear: "2022"
-    }
+      currentYear: "2022",
+    };
   },
   methods: {
     // 处理年份选择数据请求
     yearSelectHandle(param) {
-      this.currentYear = param
+      this.currentYear = param;
       //请求后端数据axios
-      this.getTotalData(param)
+      this.getTotalData(param);
     },
     getTotalData(year) {
       let data = {
-        year: ""
-      }
-      sjgl({ data }).then(res => {
+        year: "",
+      };
+      sjgl({ data }).then((res) => {
         if (res.code == 1) {
           this.yearData = res.data.year;
           this.totalData = res.data.charts;
@@ -98,133 +134,132 @@ export default {
           //   this.year.push(item[1])
           // })
 
-          this.middleData.forEach(item => {
-            this.barData_male.push(item[1])
-            this.barData_famale.push(item[2])
-            this.bar_xAxisData.push(item[0])
-          })
+          this.middleData.forEach((item) => {
+            this.barData_male.push(item[1]);
+            this.barData_famale.push(item[2]);
+            this.bar_xAxisData.push(item[0]);
+          });
 
-          this.totalData.pie.forEach(item => {
+          this.totalData.pie.forEach((item) => {
             this.pieData.push({
               name: item[0],
-              value: item[1]
-            })
-          })
+              value: item[1],
+            });
+          });
           this.$nextTick(() => {
             this.barChart();
             this.pieChart();
-          })
+          });
         }
-      })
+      });
     },
     barChart() {
-      var chartDom = document.getElementById('barChart');
+      var chartDom = document.getElementById("barChart");
       var myChart = echarts.init(chartDom);
       var option;
 
       option = {
         title: {
-          subtext: '总人数：' + this.totalData.bar.total,
-          left: '2%'
+          subtext: "总人数：" + this.totalData.bar.total,
+          left: "2%",
         },
         legend: {
-          data: ['男', '女'],
-          top: '5%',
-          right: '5%'
+          data: ["男", "女"],
+          top: "5%",
+          right: "5%",
         },
         tooltip: {
-          trigger: 'axis',
+          trigger: "axis",
           axisPointer: {
-            type: 'shadow'
-          }
+            type: "shadow",
+          },
         },
         grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true
+          left: "3%",
+          right: "4%",
+          bottom: "3%",
+          containLabel: true,
         },
         xAxis: [
           {
-            type: 'category',
+            type: "category",
             data: this.bar_xAxisData,
             axisLabel: {
-              interval: 0
+              interval: 0,
             },
             axisTick: {
-              alignWithLabel: true
-            }
-          }
+              alignWithLabel: true,
+            },
+          },
         ],
         yAxis: [
           {
-            type: 'value',
+            type: "value",
             axisLine: {
-              show: 'true'
-            }
-          }
+              show: "true",
+            },
+          },
         ],
         series: [
           {
-            name: '男',
-            type: 'bar',
-            barWidth: '30px',
+            name: "男",
+            type: "bar",
+            barWidth: "30px",
             itemStyle: {
-              color: '#265CD4'
+              color: "#265CD4",
             },
-            data: this.barData_male
+            data: this.barData_male,
           },
           {
-            name: '女',
-            type: 'bar',
-            barWidth: '30px',
+            name: "女",
+            type: "bar",
+            barWidth: "30px",
             itemStyle: {
-              color: '#FD5555'
+              color: "#FD5555",
             },
-            data: this.barData_famale
-          }
-        ]
+            data: this.barData_famale,
+          },
+        ],
       };
 
       option && myChart.setOption(option);
     },
     pieChart() {
-      var chartDom = document.getElementById('pieChart');
+      var chartDom = document.getElementById("pieChart");
       var myChart = echarts.init(chartDom);
       var option;
 
       option = {
         tooltip: {
-          trigger: 'item'
+          trigger: "item",
         },
         series: [
           {
             //name: 'Access From',
-            type: 'pie',
-            radius: '50%',
+            type: "pie",
+            radius: "50%",
             label: {
-              formatter: '{b} {d}%',
+              formatter: "{b} {d}%",
             },
             data: this.pieData,
             emphasis: {
               itemStyle: {
                 shadowBlur: 10,
                 shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
+                shadowColor: "rgba(0, 0, 0, 0.5)",
+              },
+            },
+          },
+        ],
       };
 
       option && myChart.setOption(option);
-
-    }
+    },
   },
   mounted() {
     this.getTotalData("2022");
-  }
-}
+  },
+};
 </script>
 
 <style scoped lang="scss">

src/views/jkdagl/xstzjkda/detail/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="topPart">
-    <table class="Tb" width="100%" cellspacing="0" cellpadding="0">
+    <table class="Tb mx-auto" width="100%" cellspacing="0" cellpadding="0">
       <tr>
         <td class="titleOpt">学校</td>
         <td>{{ detailMsg.jkda_xs }}</td>
@@ -145,17 +145,26 @@ export default {
   font-size: 14px;
   border-radius: 10px;
 }
+.Tb {
+  max-width: 70%;
+  min-width: 60%;
+}
 .Tb tr {
   line-height: 50px;
 }
+
 .Tb td {
-  width: 16%;
-  height: 30px;
+   height: 30px;
   border: #cccccc 1px solid;
   box-sizing: border-box;
   padding-left: 1%;
+  &:nth-child(odd){
+    width: 20%;
+  }
+   &:nth-child(even){
+    width: 30%;
+  }
 }
-
 .titleOpt {
   min-width: 120px;
 }

src/views/xsjsgl/cjbs/detail/detail.vue

@@ -335,7 +335,7 @@ export default {
         : window.globalVariables.api + "/" + url;
     },
     fileDownLoad() {
-      let downFileUrl = this.getFullUrl("data/upload/jnmf/xsjs/xsjs_xsgl.xls");
+      let downFileUrl = this.getFullUrl("source/module/jdbg/tpl/xsjs_xsgl.xls");
       window.open(downFileUrl, "_self");
     },
     //学校

src/views/xsjsgl/cjbs/detail/ryDetail.vue

@@ -344,7 +344,7 @@ export default {
         : window.globalVariables.api + "/" + url;
     },
     fileDownLoad() {
-      let downFileUrl = this.getFullUrl("data/upload/jnmf/xsjs/xsjs_xsgl.xls");
+      let downFileUrl = this.getFullUrl("source/module/jdbg/tpl/xsjs_xsgl.xls");
       window.open(downFileUrl, "_self");
       console.log(downFileUrl,4444444444);
     },

src/views/xsjsgl/cjbs/index.vue

@@ -387,14 +387,13 @@ export default {
     },
     importData(item) {
       // this.dialogExportVisible = true;
-     
       let myDate = new Date();
       let s1 = myDate.getTime();
       let s2 = new Date(item.bs_end_bmsj.replace(/-/g, "/")).getTime();
       let sjc = (s1 - s2) / (60 * 60 * 1000);
       console.log(s1, s2, sjc, 111);
       if (sjc < 0) {
-       this.bs_id = item.bs_id;
+        this.bs_id = item.bs_id;
         this.dialogExportVisible = true;
       } else {
         this.disabled1 = true;
@@ -434,7 +433,7 @@ export default {
         : window.globalVariables.api + "/" + url;
     },
     fileDownLoad() {
-      let downFileUrl = this.getFullUrl("data/upload/jnmf/xsjs/xsjs_xsgl.xls");
+      let downFileUrl = this.getFullUrl("source/module/jdbg/tpl/xsjs_xsgl.xls");
       window.open(downFileUrl, "_self");
     },
 

src/views/xsjsgl/sjhz/index.vue

@@ -2,8 +2,8 @@
   <div>
     <div class="d-flex flex-between">
       <div>
-        <el-button type="success" size="medium" @click="addData">
-          <span class="d-in-block v-mid el-icon-plus font-size-16"></span>
+        <el-button type="primary" size="medium" @click="addData">
+          <span class="d-in-block v-mid  font-size-16"></span>
           <span class="d-in-block v-mid font-size-14">新建数据汇总</span>
         </el-button>
         <el-button type="primary" size="medium" @click="exportAll">