浏览代码

新增 交通卡明细,交通卡管理,认证配置,退款管理,交通卡配置模块(接口已完成)

hzj18279462576@163.com 8 月之前
父节点
当前提交
eb8140e65a

文件差异内容过多而无法显示
+ 788 - 41
package-lock.json


+ 1 - 0
package.json

@@ -22,6 +22,7 @@
     "sass": "^1.58.0",
     "sass-loader": "^13.2.0",
     "terser": "^5.16.5",
+    "v-viewer": "^3.0.11",
     "vue": "^3.2.45",
     "vue-router": "^4.0.10",
     "vuex": "^4.0.2",

二进制
src/assets/authentication.png


二进制
src/assets/authenticationA.png


二进制
src/assets/busDetail.png


二进制
src/assets/busDetailA.png


二进制
src/assets/busManagement.png


二进制
src/assets/busManagementA.png


二进制
src/assets/busSet.png


二进制
src/assets/busSetA.png


二进制
src/assets/refund.png


二进制
src/assets/refundA.png


+ 65 - 1
src/layout/sidebar/SidevarItem.vue

@@ -34,6 +34,41 @@
         <img v-else src="@/assets/statement.png " alt="" />
         <span>报表统计</span>
       </el-menu-item>
+      <el-menu-item :index="50">
+        <img  v-if="activeIndex == 50" src="@/assets/busDetailA.png" alt="" />
+        <img  v-else src="@/assets/busDetail.png " alt="" />
+        <span>交通卡明细</span>
+      </el-menu-item>
+      <el-menu-item :index="51">
+        <img
+          v-if="activeIndex == 51"
+          src="@/assets/busManagementA.png"
+          alt=""
+          style="width: 20px; height: 18px"
+        />
+        <img style="width: 20px; height: 18px" v-else src="@/assets/busManagement.png " alt="" />
+        <span>交通卡管理</span>
+      </el-menu-item>
+      <el-menu-item :index="52">
+        <img
+          v-if="activeIndex == 52"
+          src="@/assets/authenticationA.png"
+          alt=""
+        />
+        <img v-else src="@/assets/authentication.png " alt="" />
+        <span>认证配置</span>
+      </el-menu-item>
+      <el-menu-item :index="53">
+        <img v-if="activeIndex == 53" src="@/assets/refundA.png" />
+        <img v-else src="@/assets/refund.png " />
+        <span>退款管理</span>
+      </el-menu-item>
+      <el-menu-item :index="54">
+        <img v-if="activeIndex == 54" src="@/assets/busSetA.png" alt="" />
+        <img v-else src="@/assets/busSet.png " alt="" />
+        <span>交通卡配置</span>
+      </el-menu-item>
+
       <el-menu-item :index="2">
         <img v-if="activeIndex == 2" src="@/assets/staffA.png" alt="" />
         <img v-else src="@/assets/staff.png" alt="" />
@@ -238,6 +273,35 @@ const handleSelect = (key) => {
       path: `/schoolBus/report`,
     });
   }
+  // 交通卡交易明细
+  if (activeIndex.value == 50) {
+    router.push({
+      path: `/schoolBus/busDetail`,
+    });
+  } // 交通卡管理
+  if (activeIndex.value == 51) {
+    router.push({
+      path: `/schoolBus/busManagement`,
+    });
+  }
+  // 认证管理
+  if (activeIndex.value == 52) {
+    router.push({
+      path: `/schoolBus/authentication`,
+    });
+  }
+  // 退款管理
+  if (activeIndex.value == 53) {
+    router.push({
+      path: `/schoolBus/refund`,
+    });
+  }
+  // 交通卡设置
+  if (activeIndex.value == 54) {
+    router.push({
+      path: `/schoolBus/busSet`,
+    });
+  }
 
   if (activeIndex.value == 17) {
     router.push({
@@ -362,7 +426,7 @@ onBeforeMount(() => {
   }
 }
 .el-menu--collapse {
-  width:72px;
+  width: 72px;
   img {
     width: 18px;
     height: 18px;

+ 22 - 1
src/main.js

@@ -10,7 +10,8 @@ import App from './App.vue'
 import router from "@/router";
 import store from '@/store'
 
-
+import Viewer from "v-viewer";
+import "viewerjs/dist/viewer.css";
 
 const app = createApp(App)
 for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
@@ -20,6 +21,26 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 app.use(ElementPlus, {
     locale: zhCn,
 })
+
+app.use(Viewer, {
+  Options: {
+    inline: true,
+    button: true, //右上角按钮
+    navbar: true, //底部缩略图
+    title: true, //当前图片标题
+    toolbar: true, //底部工具栏
+    tooltip: true, //显示缩放百分比
+    movable: true, //是否可以移动
+    zoomable: true, //是否可以缩放
+    rotatable: true, //是否可旋转
+    scalable: true, //是否可翻转
+    transition: true, //使用 CSS3 过度
+    fullscreen: true, //播放时是否全屏
+    keyboard: true, //是否支持键盘
+    url: "data-source",
+  },
+});
+
 app.use(router)
 app.use(store)
 

+ 32 - 0
src/router/index.js

@@ -25,6 +25,38 @@ const router = createRouter({
           component: () => import("@/views/news/news.vue"),
           meta: { title: "Dashboard", icon: "dashboard" },
         },
+
+        // 交通卡交易明细
+        {
+          path: "busDetail",
+          component: () => import("@/views/busDetail/busDetail.vue"),
+          meta: { title: "Dashboard", icon: "dashboard" },
+        },
+        // 交通卡管理
+        {
+          path: "busManagement",
+          component: () => import("@/views/busManagement/busManagement.vue"),
+          meta: { title: "Dashboard", icon: "dashboard" },
+        },
+        // 认证管理
+        {
+          path: "authentication",
+          component: () => import("@/views/authentication/authentication.vue"),
+          meta: { title: "Dashboard", icon: "dashboard" },
+        },
+        // 退款管理
+        {
+          path: "refund",
+          component: () => import("@/views/refund/refund.vue"),
+          meta: { title: "Dashboard", icon: "dashboard" },
+        },
+         // 交通卡设置
+        {
+          path: "busSet",
+          component: () => import("@/views/busSet/busSet.vue"),
+          meta: { title: "Dashboard", icon: "dashboard" },
+        },
+
         {
           path: "statement",
           component: () => import("@/views/statement/statement.vue"),

文件差异内容过多而无法显示
+ 1344 - 0
src/views/authentication/authentication.vue


文件差异内容过多而无法显示
+ 1090 - 0
src/views/busDetail/busDetail.vue


文件差异内容过多而无法显示
+ 1088 - 0
src/views/busManagement/busManagement.vue


文件差异内容过多而无法显示
+ 1030 - 0
src/views/busSet/busSet.vue


+ 1 - 1
src/views/busnumber/busnumber.vue

@@ -376,7 +376,7 @@ const getList = async () => {
     data: data,
   });
   console.log(res);
-  if (res.data.code == 200) {
+  if (res.status == 200) {
     // ElMessage({
     //   type: "success",
     //   showClose: true,

文件差异内容过多而无法显示
+ 1057 - 0
src/views/refund/refund.vue


+ 1 - 0
src/views/statement/statement.vue

@@ -1041,6 +1041,7 @@ const refund = (row) => {
     confirmButtonText: "确认",
     cancelButtonText: "取消",
     type: "warning",
+    
   })
     .then(async () => {
       let data = new FormData();

+ 23 - 4
src/views/waiting/waiting.vue

@@ -353,6 +353,13 @@ const ruleForm = reactive({
     a2: { fee: 0, start: 0, end: 0 },
     a3: { fee: 0, end: 0 },
   }, // 退改设置
+
+  toPay: "", // 支付满多少金额
+  toRelease: "", // 补贴释放多少金额
+  teacherPrice: "", // 教师支付金额
+  commonPrice: "", // 正常金额
+  poorReduce: "", // 贫困户减免金额
+
   id: "",
 });
 // 开始时间段配置
@@ -401,7 +408,13 @@ const getlist = async (message) => {
     sessionStorage.setItem("sm_end", res.data.data.sm_end);
 
     ruleForm.refundRule = res.data.data.refundRule;
-    
+
+    ruleForm.toPay = res.data.data.toPay; // 支付满多少金额
+    ruleForm.toRelease = res.data.data.toRelease; // 补贴释放多少金额
+    ruleForm.teacherPrice = res.data.data.teacherPrice; // 教师支付金额
+    ruleForm.commonPrice = res.data.data.commonPrice; // 正常金额
+    ruleForm.poorReduce = res.data.data.poorReduce; // 贫困户减免金额
+
     if (message) {
       ElMessage({
         type: "success",
@@ -514,12 +527,18 @@ const timeUpdata = async () => {
     bb_before: ruleForm.bb_before,
     id: ruleForm.id,
 
-    workTime:ruleForm.workTime.join("-"),
-    workMobile:ruleForm.workMobile,
+    workTime: ruleForm.workTime.join("-"),
+    workMobile: ruleForm.workMobile,
     refundRule: JSON.stringify(ruleForm.refundRule),
+
+    toPay: ruleForm.endTime, // 支付满多少金额
+    toRelease: ruleForm.toRelease, // 补贴释放多少金额
+    teacherPrice: ruleForm.teacherPrice, // 教师支付金额
+    commonPrice: ruleForm.commonPrice, // 正常金额
+    poorReduce: ruleForm.poorReduce, // 贫困户减免金额
   };
   console.log(data);
-  
+
   let res = await axios({
     method: "post",
     url: api.value + "/carBook/cnupdate.action",