提交

src/router/index.js

@@ -199,13 +199,13 @@ export const allRoutes = [
                     name: "xsxjk_bbgl_bbxq",
                     hidden: true,
                     component: MainDefaultLayout,
-                    meta: { title: "报表详情",back: true, },
+                    meta: { title: "报表详情", },
                     children: [
                         {
                             path: "bbxq/:id",
                             name: "xsxjk_bbgl_bbxq",
                             component: () => import("@/views/xsxjk/bbgl/bbxq/index.vue"),
-                            meta: { title: "报表详情" },
+                            meta: { title: "报表详情",back: true, },
                             props: true,
                         },
                         {
@@ -567,7 +567,7 @@ export const allRoutes = [
                 {
                     path: "ckxq/:xtj_xsxh",
                     hidden: true,
-                    meta: { title: "查看详情"},
+                    meta: { title: "查看详情",back: true,},
                     name: "xstzjk_xslb_ckxq",
                     component: () => import("@/views/xstzjk/xslb/ckxq/index.vue"),
                     props: true,

src/views/bjzzpb/bjpb/index.vue

@@ -35,7 +35,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="">
-          <el-select   placeholder="请选择优胜班级" v-model="xdbs_ysbj" clearable @change="getListData">
+          <el-select
+            placeholder="请选择优胜班级"
+            v-model="xdbs_ysbj"
+            clearable
+            @change="getListData"
+          >
             <el-option
               v-for="item in ysbjList"
               :label="item.v"
@@ -432,4 +437,14 @@ export default {
   border-radius: 4px;
   padding: 0 15px;
 }
+::v-deep .el-input {
+  width: 160px;
+}
+::v-deep .el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 300px;
+}
+::v-deep .el-date-editor .el-range-separator {
+  width: 8%;
+}
 </style>

src/views/bjzzpb/cggl/index.vue

@@ -733,4 +733,14 @@ export default {
     background-color: #f5f7fe;
   }
 }
+::v-deep .el-input {
+  width: 160px;
+}
+::v-deep .el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 300px;
+}
+::v-deep .el-date-editor .el-range-separator {
+  width: 8%;
+}
 </style>>

src/views/bjzzpb/wsgl/index.vue

@@ -726,4 +726,14 @@ export default {
     background-color: #f5f7fe;
   }
 }
+::v-deep .el-input {
+  width: 160px;
+}
+::v-deep .el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 300px;
+}
+::v-deep .el-date-editor .el-range-separator {
+  width: 8%;
+}
 </style>

src/views/cjxt/tjdj/bjck/index.vue

@@ -580,6 +580,9 @@ export default {
 }
 ::v-deep .el-date-editor.el-input,
 .el-date-editor.el-input__inner {
-  width: 250px;
+  width: 300px;
+}
+::v-deep .el-date-editor .el-range-separator {
+  width: 8%;
 }
 </style>

src/views/cjxt/tjdj/index.vue

@@ -380,4 +380,14 @@ export default {
 </script>
 
 <style scoped>
+::v-deep .el-input {
+  width: 160px;
+}
+::v-deep .el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 300px;
+}
+::v-deep .el-date-editor .el-range-separator {
+  width: 8%;
+}
 </style>

src/views/cjxt/tjdj/njck/index.vue

@@ -277,4 +277,14 @@ export default {
 </script>
 
 <style scoped>
+::v-deep .el-input {
+  width: 160px;
+}
+::v-deep .el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 300px;
+}
+::v-deep .el-date-editor .el-range-separator {
+  width: 8%;
+}
 </style>

src/views/cjxt/ycxs/index.vue

@@ -383,6 +383,9 @@ export default {
 }
 ::v-deep .el-date-editor.el-input,
 .el-date-editor.el-input__inner {
-  width: 250px;
+  width: 300px;
+}
+::v-deep .el-date-editor .el-range-separator {
+  width: 8%;
 }
 </style>

src/views/xsxjk/bbgl/bbxq/index.vue

@@ -44,7 +44,11 @@
           </h3>
         </template>
       </el-table-column>
-      <el-table-column label="日期范围" prop="xdxb_qdzdysj"> </el-table-column>
+      <el-table-column label="日期范围" prop="xdxb_qdzdysj">
+        <template slot-scope="scope">
+          {{ scope.row.xdxb_qdzdysj.replace(",", " - ") }}
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" prop="xdxb_cjsj"> </el-table-column>
       <el-table-column label="操作" width="300">
         <template slot-scope="scope">
@@ -141,7 +145,7 @@
             @change="handleDateChange"
             type="daterange"
             value-format="yyyy-MM-dd"
-            range-separator="-"
+            range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
           >
@@ -385,7 +389,7 @@ export default {
 
           let data = {
             xdxb_title: this.dialogForm.bbm,
-            xdxb_qdzdysj: this.dialogForm.sj[0] + "-" + this.dialogForm.sj[1],
+            xdxb_qdzdysj: this.dialogForm.sj,
             xdxb_blx: this.id,
             xdxb_custom_json: JSON.stringify([
               {
@@ -448,7 +452,7 @@ export default {
     exportOne(xdxb_id) {
       let link =
         window.globalVariables.api +
-        "/xddy/dygl_xsxjk/index?api=xls&page=1&limit=1&token=" +
+        "/xddy/dygl_xsxjk/index?api=xls&page=1&limit=10000&token=" +
         token +
         "&xdxb_id=" +
         xdxb_id;
@@ -489,4 +493,7 @@ export default {
 </script>
 
 <style scoped>
+::v-deep .el-date-editor .el-range-separator {
+  width: 8%;
+}
 </style>

src/views/xsxjk/bbgl/bbxq/xqlb/api.js

@@ -30,6 +30,7 @@ export const hmc_list = (data = {}) =>
             xdx_xx: data.xdx_xx,
          team_name: data.team_name,
             team_id: data.team_id,
+            xdxb_id:data.xdxb_id
         }
     })
 

src/views/xsxjk/bbgl/bbxq/xqlb/index.vue

@@ -707,6 +707,7 @@ export default {
         xdx_xsxh: this.xdx_xsxh,
         xdx_lxfs: this.xdx_lxfs,
         class_name: this.class_name,
+        xdxb_id: this.xdxb_id,
       };
 
       hmc_list(data).then((res) => {
@@ -769,6 +770,7 @@ export default {
         szzb: "",
         szdxz: "",
         xdx_hjry: "",
+        xdxb_id: "",
       };
       this.isEdit = false;
       this.dialogFormVisible = true;
@@ -1013,6 +1015,7 @@ export default {
     },
   },
   mounted() {
+    this.xdxb_id = this.$route.params.id;
     this.getListData();
     this.teamListData();
     this.getClassData();