Forráskód Böngészése

根据需求调整页面和修改bug(系统首页,工单管理,员工管理,评价管理)

hzj18279462576@163.com 1 éve
szülő
commit
f58dc17949

+ 2 - 2
src/router/index.js

@@ -8,8 +8,8 @@ import NProgress from "nprogress";
 import "nprogress/nprogress.css";
 import "nprogress/nprogress.css";
 import Layout from "@/layout/index.vue";
 import Layout from "@/layout/index.vue";
 const router = createRouter({
 const router = createRouter({
-  history: createWebHashHistory("/campusMaintenance/repairManage"), // 线上地址
-  // history: createWebHashHistory("/testingServer/repairManage"), // 测试环境发布地址
+  // history: createWebHashHistory("/campusMaintenance/repairManage"), // 线上地址
+  history: createWebHashHistory("/testingServer/repairManage"), // 测试环境发布地址
   routes: [
   routes: [
     {
     {
       path: "/login",
       path: "/login",

+ 2 - 2
src/store/modules/user.js

@@ -9,8 +9,8 @@ const state = {
   username: "",
   username: "",
   password: "",
   password: "",
   // api: "/campusMaintenance/repair-api/repair/api", // 线上
   // api: "/campusMaintenance/repair-api/repair/api", // 线上
-  // api: "/testingServer/repairTest/repair/api", // 测试
-  api: "/repair/api/", // wxl 测试
+  api: "/testingServer/repairTest/repair/api", // 测试
+  // api: "/repair/api/", // wxl 测试
   newsNum: "",
   newsNum: "",
   schoolId: "", // 管理员等级
   schoolId: "", // 管理员等级
 };
 };

+ 6 - 4
src/views/consumable/consumable.vue

@@ -21,8 +21,8 @@
           </div>
           </div>
           <div class="condition">
           <div class="condition">
             <span>校区 : </span>
             <span>校区 : </span>
-            <el-select v-model="searchInput.schoolId" class="m-2" placeholder="请选择校区" @change="selSchool">
-              <el-option label="全部校区" :value="0" />
+            <el-select :clearable="true" v-model="searchInput.schoolId" class="m-2" placeholder="请选择校区" @change="searchBtn">
+              <!-- <el-option label="全部校区" :value="0" /> -->
               <el-option label="黄家湖校区" :value="1" />
               <el-option label="黄家湖校区" :value="1" />
               <el-option label="墨轩湖校区" :value="2" />
               <el-option label="墨轩湖校区" :value="2" />
             </el-select>
             </el-select>
@@ -212,8 +212,8 @@
           </div>
           </div>
           <div class="condition">
           <div class="condition">
             <span>校区 : </span>
             <span>校区 : </span>
-            <el-select v-model="searchInput2.schoolId" class="m-2" placeholder="请选择校区" @change="selSchool">
-              <el-option label="全部校区" :value="0" />
+            <el-select :clearable="true" v-model="searchInput2.schoolId" class="m-2" placeholder="请选择校区" @change="searchBtn">
+              <!-- <el-option label="全部校区" :value="0" /> -->
               <el-option label="黄家湖校区" :value="1" />
               <el-option label="黄家湖校区" :value="1" />
               <el-option label="墨轩湖校区" :value="2" />
               <el-option label="墨轩湖校区" :value="2" />
             </el-select>
             </el-select>
@@ -380,6 +380,7 @@ const getList = async (flag) => {
       currentPage: currentPage.value,
       currentPage: currentPage.value,
       pageCount: pageSize.value,
       pageCount: pageSize.value,
       name: searchInput.name,
       name: searchInput.name,
+      schoolId:searchInput.schoolId
     };
     };
     if (searchInput.createTime) {
     if (searchInput.createTime) {
       data.startTime = searchInput.createTime[0];
       data.startTime = searchInput.createTime[0];
@@ -425,6 +426,7 @@ const getList = async (flag) => {
       currentPage: currentPage2.value,
       currentPage: currentPage2.value,
       pageCount: pageSize2.value,
       pageCount: pageSize2.value,
       keyWord: searchInput2.name,
       keyWord: searchInput2.name,
+      schoolId:searchInput2.schoolId
     };
     };
     if (searchInput2.createTime) {
     if (searchInput2.createTime) {
       data.startTime = searchInput2.createTime[0];
       data.startTime = searchInput2.createTime[0];

+ 9 - 6
src/views/evaluate/evaluate.vue

@@ -20,12 +20,12 @@
         </div>
         </div>
         <div class="condition">
         <div class="condition">
           <span>评价 : </span>
           <span>评价 : </span>
-          <el-select clearable v-model="searchInput.schoolId" class="m-2" placeholder="请选择评价星级" @change="selSchool">
-            <el-option label="1星" :value="0" />
-            <el-option label="2星" :value="1" />
-            <el-option label="3星" :value="2" />
-            <el-option label="4星" :value="3" />
-            <el-option label="5星" :value="4" />
+          <el-select clearable v-model="searchInput.star" class="m-2" placeholder="请选择评价星级" @change="selSchool">
+            <el-option label="1星" :value="1" />
+            <el-option label="2星" :value="2" />
+            <el-option label="3星" :value="3" />
+            <el-option label="4星" :value="4" />
+            <el-option label="5星" :value="5" />
           </el-select>
           </el-select>
         </div>
         </div>
 
 
@@ -232,6 +232,7 @@ const bgImgurl = ref() // 点击查看图片地址
 const searchInput = reactive({
 const searchInput = reactive({
   keyWord: "",
   keyWord: "",
   createTime: "",
   createTime: "",
+  star:""
 }); // 搜索按钮数据
 }); // 搜索按钮数据
 5;
 5;
 
 
@@ -258,12 +259,14 @@ const getList = async (message) => {
       keyWord: searchInput.keyWord, // 关键字
       keyWord: searchInput.keyWord, // 关键字
       startTime: searchInput.createTime[0],
       startTime: searchInput.createTime[0],
       endTime: searchInput.createTime[1],
       endTime: searchInput.createTime[1],
+      star:searchInput.star
     };
     };
   } else {
   } else {
     data = {
     data = {
       currentPage: currentPage.value, // 当前页
       currentPage: currentPage.value, // 当前页
       pageCount: pageSize.value, // 一页数据条数
       pageCount: pageSize.value, // 一页数据条数
       keyWord: searchInput.keyWord, // 关键字
       keyWord: searchInput.keyWord, // 关键字
+      star:searchInput.star
     };
     };
   }
   }
 
 

+ 7 - 1
src/views/workOrder/workOrder.vue

@@ -613,7 +613,7 @@
           </div>
           </div>
           <div class="consumables">
           <div class="consumables">
             <div
             <div
-              style="border-bottom: 1px solid #ccc"
+              style="border-bottom: 1px solid #ccc;margin-top: 8px"
               class=""
               class=""
               v-for="i in consumables"
               v-for="i in consumables"
             >
             >
@@ -633,6 +633,10 @@
                 <div class="titles">耗材费用:</div>
                 <div class="titles">耗材费用:</div>
                 <span>{{ i.totalPrice }} 元</span>
                 <span>{{ i.totalPrice }} 元</span>
               </div>
               </div>
+              <div class="workNum">
+                <div class="titles">支付时间:</div>
+                <span>{{ orderInfoData.payTime }}</span>
+              </div>
             </div>
             </div>
           </div>
           </div>
           <!-- 工单详情 报修进度 -->
           <!-- 工单详情 报修进度 -->
@@ -1696,6 +1700,7 @@ const orderInfoData = ref({
   time: "", // 维修耗时
   time: "", // 维修耗时
   tracks: [],
   tracks: [],
   price: "", // 费用
   price: "", // 费用
+  payTime: "", // 支付时间
 });
 });
 const consumables = ref(); // 耗材详情
 const consumables = ref(); // 耗材详情
 const mapUrl = ref(); // 音频地址
 const mapUrl = ref(); // 音频地址
@@ -2360,6 +2365,7 @@ const orderInfo = async (row) => {
     orderInfoData.value.time = res.data.data.time;
     orderInfoData.value.time = res.data.data.time;
     orderInfoData.value.tracks = res.data.data.tracks;
     orderInfoData.value.tracks = res.data.data.tracks;
     orderInfoData.value.price = res.data.data.price;
     orderInfoData.value.price = res.data.data.price;
+    orderInfoData.value.payTime = res.data.data.payTime;
     consumables.value = res.data.data.consumables;
     consumables.value = res.data.data.consumables;
   } else {
   } else {
     ElMessage({
     ElMessage({

+ 18 - 18
vite.config.js

@@ -23,15 +23,15 @@ export default defineConfig({
     // 是否开启 https
     // 是否开启 https
     // https: false,
     // https: false,
     // 测试地址
     // 测试地址
-    // proxy: {
-    //   "/testingServer/repairTest/repair/api": {
-    //     target:
-    //       "https://chtech.ncjti.edu.cn/testingServer/repairTest/repair/api",
-    //     changeOrigin: true,
-    //     rewrite: (path) =>
-    //       path.replace(/^\/testingServer\/repairTest\/repair\/api/, ""),
-    //   },
-    // },
+    proxy: {
+      "/testingServer/repairTest/repair/api": {
+        target:
+          "https://chtech.ncjti.edu.cn/testingServer/repairTest/repair/api",
+        changeOrigin: true,
+        rewrite: (path) =>
+          path.replace(/^\/testingServer\/repairTest\/repair\/api/, ""),
+      },
+    },
 
 
     // 在线地址
     // 在线地址
     // proxy: {
     // proxy: {
@@ -44,15 +44,15 @@ export default defineConfig({
     //   },
     //   },
     // },
     // },
     // wxl 服务器
     // wxl 服务器
-    proxy: {
-      "/repair/api/": {
-        target:
-          "http://192.168.161.225:8080/repair/api/",
-        changeOrigin: true,
-        rewrite: (path) =>
-          path.replace(/^\/repair\/api/, ""),
-      },
-    },
+    // proxy: {
+    //   "/repair/api/": {
+    //     target:
+    //       "http://192.168.161.225:8080/repair/api/",
+    //     changeOrigin: true,
+    //     rewrite: (path) =>
+    //       path.replace(/^\/repair\/api/, ""),
+    //   },
+    // },
     
     
   },
   },
   publicDir: "public",
   publicDir: "public",