预案功能更改、新增装备模块化、维修管理及bug修复

src/icons/svg/模块.svg

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1676505193471" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3844" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M737.148 541.92h-256.85V286.073c0-17.673-14.327-32-32-32h-288.85c-17.673 0-32 14.327-32 32v576.698c0 17.673 14.327 32 32 32h577.7c17.673 0 32-14.327 32-32V573.92c0-17.673-14.327-32-32-32z m-320.85-223.847V541.92h-224.85V318.073h224.85z m-224.85 288.85h224.85v223.848h-224.85V606.923z m513.7 223.848h-224.85V605.92h224.85v224.851z" fill="" p-id="3845"></path><path d="M843.523 146.698h-280c-17.132 0-31.02 13.888-31.02 31.02v280c0 17.132 13.888 31.02 31.02 31.02h280c17.132 0 31.02-13.888 31.02-31.02v-280c0-17.132-13.888-31.02-31.02-31.02z m-31.019 280H594.543V208.737h217.961v217.961z" fill="" p-id="3846"></path><path d="M671.523 285.718h64v64h-64z" fill="" p-id="3847"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1676505193471" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3844" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M737.148 541.92h-256.85V286.073c0-17.673-14.327-32-32-32h-288.85c-17.673 0-32 14.327-32 32v576.698c0 17.673 14.327 32 32 32h577.7c17.673 0 32-14.327 32-32V573.92c0-17.673-14.327-32-32-32z m-320.85-223.847V541.92h-224.85V318.073h224.85z m-224.85 288.85h224.85v223.848h-224.85V606.923z m513.7 223.848h-224.85V605.92h224.85v224.851z" fill="" p-id="3845"></path><path d="M843.523 146.698h-280c-17.132 0-31.02 13.888-31.02 31.02v280c0 17.132 13.888 31.02 31.02 31.02h280c17.132 0 31.02-13.888 31.02-31.02v-280c0-17.132-13.888-31.02-31.02-31.02z m-31.019 280H594.543V208.737h217.961v217.961z" fill="" p-id="3846"></path><path d="M671.523 285.718h64v64h-64z" fill="" p-id="3847"></path></svg>
\ No newline at end of file

src/icons/svg/维修.svg

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1676505023922" class="icon" viewBox="0 0 1027 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2802" xmlns:xlink="http://www.w3.org/1999/xlink" width="200.5859375" height="200"><path d="M835.707408 791.0893c8.945488 8.935549 8.945488 23.039602-0.268365 32.52182-8.667184 8.408759-22.771238 8.408759-31.99503-0.546669l-140.434229-140.145985c-8.667184-8.935549-8.667184-23.039602 0.546669-32.253456 8.677124-8.677124 23.317907-8.677124 32.531759 0L835.707408 791.0893zM773.625718 0c14.640783 0 29.55987 1.083398 44.190713 4.601957 15.455816 2.713465 29.54993 7.325361 43.107315 13.020655 18.974375 8.130455 28.198167 30.633328 19.789408 50.154372a39.638453 39.638453 0 0 1-7.86209 11.927318c-29.013201 29.003261-58.016462 57.748098-86.761299 86.751359l4.880261 17.354247 4.343532 17.622613 17.890977 4.88026 17.354247 4.611897c28.734897-29.003261 57.748098-57.479733 86.751359-86.761299 14.650722-14.909147 39.042087-14.909147 54.2196 0 4.343532 4.611896 7.593726 10.307191 9.223792 16.27085a195.558317 195.558317 0 0 1 11.658953 38.495418v0.546669h0.268365c2.703525 13.825749 4.343532 28.734897 4.343532 44.459078 0 60.998292-25.216338 117.116322-65.610188 157.788476-40.125485 40.39385-96.52182 65.341823-157.788477 65.341823-4.343532 0-8.677124-0.268365-13.020655-0.268364l-42.292282 41.745612L950.935238 721.145519l1.888492 2.166797a156.715018 156.715018 0 0 1 44.190713 109.254232c0 40.125485-15.177512 80.519335-46.089144 111.152663l-0.546669 0.546669c-30.901693 30.374903-70.490449 45.552415-110.615934 45.552415s-81.056065-15.177512-111.152663-46.099084l-233.159187-232.880882-237.741264 238.307812c-49.617642 49.607703-109.532536 53.951235-158.60351 32.810063-18.974375-7.86209-36.050318-19.789408-50.154371-33.893461h-0.268365c-14.094114-14.362479-25.753067-31.179997-33.615158-49.886007-21.141171-49.070974-16.807579-109.254232 33.078429-158.593571v-0.546669L313.290884 473.892219l-97.05855-97.058549-86.214629-25.753067a37.740022 37.740022 0 0 1-24.401305-21.419475L22.930269 135.822333c-7.593726-14.094114-5.148626-32.53176 6.778692-44.459078L64.407517 56.933064 98.569343 22.771238c10.575555-10.565616 27.114769-14.640783 41.755552-8.130455l196.283895 83.769529a37.571051 37.571051 0 0 1 21.68784 24.401305l25.484703 86.214629 97.058549 97.05855 69.675415-69.138686c-0.268365-4.880261-0.546669-9.492157-0.546668-13.010716h0.268364c0-62.08169 24.947973-118.19972 65.341824-158.325206v-0.278304c40.383911-40.115546 96.511881-65.331884 158.046901-65.331884z m-109.532536 542.752601l-114.402857 114.412797 232.602578 232.602578c15.455816 15.724181 36.865352 23.854636 57.469793 23.854636s41.487187-8.130455 56.943004-23.586271l0.536729-0.268365c15.724181-15.177512 23.049542-36.596987 23.049542-57.201428 0-20.067712-7.325361-40.39385-21.966144-55.581302l-1.620127-1.620127-232.612518-232.612518zM366.963814 420.209349l59.914894-59.636589-103.837242-104.105607a38.525237 38.525237 0 0 1-10.297251-18.974375l-22.502873-76.185743L134.082932 95.428483l-15.992545 15.72418-15.992546 16.260911 66.425222 156.158409 78.620903 23.049542c6.510328 1.898431 11.927318 5.148626 16.27085 10.028887L366.963814 420.209349zM768.208728 76.454108a146.248796 146.248796 0 0 0-98.688616 43.375679 145.562976 145.562976 0 0 0-43.37568 104.105607h0.546669v10.575555l1.083398 8.945488c2.703525 11.927318-1.083398 24.938034-10.30719 34.430191L102.097841 792.987731h-0.268364c-23.854636 24.669669-26.568101 52.599472-16.807579 75.639074 4.065228 8.935549 10.307191 17.890977 17.622612 25.474764 7.86209 7.593726 16.539214 13.557385 26.031371 17.622612 23.039602 10.028886 50.701041 7.315422 75.092406-16.539214l264.060879-264.05094 1.083398-1.083398 168.085728-168.354092 1.083398-1.351763 80.7877-80.250971h0.268364c7.86209-8.677124 20.067712-13.010716 32.263395-11.112284 3.796863 0.536729 7.315422 1.083398 11.390589 1.083398 2.703525 0.268365 6.500388 0.546669 10.84392 0.546669 40.672154 0 77.537506-16.539214 104.105606-42.560646v-0.546669c25.216338-24.938034 41.208883-59.914894 42.570586-98.688616-16.539214 16.807579-33.078428 33.078428-49.617643 50.154371-9.482218 10.565616-23.854636 14.909147-38.495418 11.658954l-38.495419-10.575556-39.042087-10.565615c-13.020655-3.528498-23.586271-13.020655-27.11477-27.11477l-10.297251-39.042087-10.575555-39.042087c-2.981829-11.927318-0.268365-26.568101 10.038826-36.060258 17.056065-17.344308 34.141948-34.420252 51.496195-51.774499z" fill="#717071" p-id="2803"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1676505023922" class="icon" viewBox="0 0 1027 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2802" xmlns:xlink="http://www.w3.org/1999/xlink" width="200.5859375" height="200"><path d="M835.707408 791.0893c8.945488 8.935549 8.945488 23.039602-0.268365 32.52182-8.667184 8.408759-22.771238 8.408759-31.99503-0.546669l-140.434229-140.145985c-8.667184-8.935549-8.667184-23.039602 0.546669-32.253456 8.677124-8.677124 23.317907-8.677124 32.531759 0L835.707408 791.0893zM773.625718 0c14.640783 0 29.55987 1.083398 44.190713 4.601957 15.455816 2.713465 29.54993 7.325361 43.107315 13.020655 18.974375 8.130455 28.198167 30.633328 19.789408 50.154372a39.638453 39.638453 0 0 1-7.86209 11.927318c-29.013201 29.003261-58.016462 57.748098-86.761299 86.751359l4.880261 17.354247 4.343532 17.622613 17.890977 4.88026 17.354247 4.611897c28.734897-29.003261 57.748098-57.479733 86.751359-86.761299 14.650722-14.909147 39.042087-14.909147 54.2196 0 4.343532 4.611896 7.593726 10.307191 9.223792 16.27085a195.558317 195.558317 0 0 1 11.658953 38.495418v0.546669h0.268365c2.703525 13.825749 4.343532 28.734897 4.343532 44.459078 0 60.998292-25.216338 117.116322-65.610188 157.788476-40.125485 40.39385-96.52182 65.341823-157.788477 65.341823-4.343532 0-8.677124-0.268365-13.020655-0.268364l-42.292282 41.745612L950.935238 721.145519l1.888492 2.166797a156.715018 156.715018 0 0 1 44.190713 109.254232c0 40.125485-15.177512 80.519335-46.089144 111.152663l-0.546669 0.546669c-30.901693 30.374903-70.490449 45.552415-110.615934 45.552415s-81.056065-15.177512-111.152663-46.099084l-233.159187-232.880882-237.741264 238.307812c-49.617642 49.607703-109.532536 53.951235-158.60351 32.810063-18.974375-7.86209-36.050318-19.789408-50.154371-33.893461h-0.268365c-14.094114-14.362479-25.753067-31.179997-33.615158-49.886007-21.141171-49.070974-16.807579-109.254232 33.078429-158.593571v-0.546669L313.290884 473.892219l-97.05855-97.058549-86.214629-25.753067a37.740022 37.740022 0 0 1-24.401305-21.419475L22.930269 135.822333c-7.593726-14.094114-5.148626-32.53176 6.778692-44.459078L64.407517 56.933064 98.569343 22.771238c10.575555-10.565616 27.114769-14.640783 41.755552-8.130455l196.283895 83.769529a37.571051 37.571051 0 0 1 21.68784 24.401305l25.484703 86.214629 97.058549 97.05855 69.675415-69.138686c-0.268365-4.880261-0.546669-9.492157-0.546668-13.010716h0.268364c0-62.08169 24.947973-118.19972 65.341824-158.325206v-0.278304c40.383911-40.115546 96.511881-65.331884 158.046901-65.331884z m-109.532536 542.752601l-114.402857 114.412797 232.602578 232.602578c15.455816 15.724181 36.865352 23.854636 57.469793 23.854636s41.487187-8.130455 56.943004-23.586271l0.536729-0.268365c15.724181-15.177512 23.049542-36.596987 23.049542-57.201428 0-20.067712-7.325361-40.39385-21.966144-55.581302l-1.620127-1.620127-232.612518-232.612518zM366.963814 420.209349l59.914894-59.636589-103.837242-104.105607a38.525237 38.525237 0 0 1-10.297251-18.974375l-22.502873-76.185743L134.082932 95.428483l-15.992545 15.72418-15.992546 16.260911 66.425222 156.158409 78.620903 23.049542c6.510328 1.898431 11.927318 5.148626 16.27085 10.028887L366.963814 420.209349zM768.208728 76.454108a146.248796 146.248796 0 0 0-98.688616 43.375679 145.562976 145.562976 0 0 0-43.37568 104.105607h0.546669v10.575555l1.083398 8.945488c2.703525 11.927318-1.083398 24.938034-10.30719 34.430191L102.097841 792.987731h-0.268364c-23.854636 24.669669-26.568101 52.599472-16.807579 75.639074 4.065228 8.935549 10.307191 17.890977 17.622612 25.474764 7.86209 7.593726 16.539214 13.557385 26.031371 17.622612 23.039602 10.028886 50.701041 7.315422 75.092406-16.539214l264.060879-264.05094 1.083398-1.083398 168.085728-168.354092 1.083398-1.351763 80.7877-80.250971h0.268364c7.86209-8.677124 20.067712-13.010716 32.263395-11.112284 3.796863 0.536729 7.315422 1.083398 11.390589 1.083398 2.703525 0.268365 6.500388 0.546669 10.84392 0.546669 40.672154 0 77.537506-16.539214 104.105606-42.560646v-0.546669c25.216338-24.938034 41.208883-59.914894 42.570586-98.688616-16.539214 16.807579-33.078428 33.078428-49.617643 50.154371-9.482218 10.565616-23.854636 14.909147-38.495418 11.658954l-38.495419-10.575556-39.042087-10.565615c-13.020655-3.528498-23.586271-13.020655-27.11477-27.11477l-10.297251-39.042087-10.575555-39.042087c-2.981829-11.927318-0.268365-26.568101 10.038826-36.060258 17.056065-17.344308 34.141948-34.420252 51.496195-51.774499z" fill="#717071" p-id="2803"></path></svg>
\ No newline at end of file

src/main.js

@@ -31,9 +31,9 @@ import 'moment/locale/zh-cn'
 Vue.prototype.$moment = moment
 Vue.config.productionTip = false
 
-// axios.defaults.baseURL = 'http://192.168.3.74:5001'
+ //axios.defaults.baseURL = 'http://192.168.3.74:5001'
 //开发环境 
-//axios.defaults.baseURL = 'http://192.168.3.188:5007'
+  //axios.defaults.baseURL = 'http://192.168.3.188:5007'
 //现场
  axios.defaults.baseURL = 'http://41.204.124.248:5001'
 

src/router/modules/borrow.js

@@ -23,6 +23,13 @@ const borrow = [
   }
   ,
   {
+    //维修管理 - 入库表单接收
+    path: '/borrow/repairGet',
+    name: 'repairGet',
+    component: () => import('@/borrow/repairGet')
+  }
+  ,
+  {
     // 
     path: '/borrow/return',
     name: 'return',

src/router/modules/systemConfig.js

@@ -43,6 +43,13 @@ const systemConfig = [
     }
     ,
     {
+      // 维修申请
+      path: '/systemConfig/repairApply',
+      name: 'systemConfig/repairApply',
+      component: () => import( '@/systemConfig/repairApply')
+    }
+    ,
+    {
       // 借用申请
       path: '/systemConfig/borrowApply',
       name: 'systemConfig/borrowApply',

src/router/modules/warehouse.js

@@ -11,6 +11,13 @@ const warehouse = [
       component: () => import('@/warehouse/cabinet')
     },
     {
+      //模块管理
+      path: '/warehouse/modularization',
+      name: 'modularization',
+      component: () => import('@/warehouse/modularization')
+    }
+    ,
+    {
       //预案管理
       path: '/warehouse/emergencyPlan',
       name: 'emergencyPlan',

src/store/index.js

@@ -29,7 +29,7 @@ export default new Vuex.Store({
       {
         id: 1,
         path: '/borrow',
-        menuName: '借领管理',
+        menuName: '业务管理',
         icon: "iconfont icon-Home",
         children: [
           {
@@ -43,6 +43,12 @@ export default new Vuex.Store({
             path: '/borrow/borrowGet',
             menuName: '借用管理',
 
+          },
+          {
+            id: 1-3,
+            path: '/borrow/repairGet',
+            menuName: '维修管理',
+
           }
         ]
       },

src/views/baseInfo/Materiel.vue

@@ -85,7 +85,7 @@
           icon="search"
           style="height: 40px"
           class="textboxBo"
-          @click="getQueuData()"
+          @click="getQueuData(1)"
           >查询</a-button
         >
         <el-button
@@ -259,7 +259,7 @@
                     <th class="textHeader">视频查看</th>
                     <td class="textContentLast">
                      <video v-if="detailData.VideoUrl !=''&& detailData.VideoUrl !=null"
-                           v-bind:src="'http://41.204.124.248:5001/' +detailData.videoUrl"
+                           v-bind:src="'http://41.204.124.248:5001/' +detailData.VideoUrl"
                            class="avatar video-avatar"
                            controls="controls">
                         您的浏览器不支持视频播放
@@ -478,7 +478,7 @@
             background
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :current-page="searchData.page"
+            :current-page="searchData.Page"
             :page-sizes="[10, 20, 30, 40]"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"
@@ -842,7 +842,10 @@ console.log("up")
       });
     },
 
-    async getQueuData() {
+    async getQueuData(arg) {
+      if(arg) {
+       this.searchData.Page = 1
+     }
       this.loading = true;
       const { data: resclass } = await this.$axios.get("api/EqCategory", {
         params: this.searchEqCategoryData,

src/views/baseInfo/equipmentManage.vue

@@ -103,7 +103,7 @@
           icon="search"
           style="height: 40px"
           class="textboxBo"
-          @click="getQueuData()"
+          @click="getQueuData(1)"
           >查询</a-button
         >
         <el-button
@@ -660,7 +660,7 @@
             background
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :current-page="searchData.page"
+            :current-page="searchData.Page"
             :page-sizes="[10, 20, 30, 40]"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"
@@ -1326,9 +1326,11 @@ export default {
       if(this.$route.query.IsPublicType!=undefined)
       { this.searchData.IsPublic=this.$route.query.IsPublicType;}
     },
-    async getQueuData() {
+    async getQueuData(arg) {
       // console.log("CC",this.$route.query.StateType)
-    
+     if(arg) {
+       this.searchData.Page = 1
+     }
     
       // console.log("statet",aa)
       this.loading = true;
@@ -1359,8 +1361,7 @@ export default {
     // 每页显示条数发生改变时
     handleSizeChange(val) {
       this.searchData.Rows = val;
-
-      this.getQueuData();
+      this.getQueuData(); 
     },
     // 当前页数发生改变时
     handleCurrentChange(val) {

src/views/borrow/return.vue

@@ -20,7 +20,7 @@
               <el-breadcrumb-item :to="{ path: '/index' }"
                 >首页</el-breadcrumb-item
               >
-              <el-breadcrumb-item>借领管理</el-breadcrumb-item>
+              <el-breadcrumb-item>业务管理</el-breadcrumb-item>
               <el-breadcrumb-item>归还记录</el-breadcrumb-item>
             </el-breadcrumb></el-col
           >

src/views/login/Login.vue

@@ -117,7 +117,7 @@ export default {
         {
           id: 1,
           path: "/borrow",
-          menuName: "借领管理",
+          menuName: "业务管理",
           icon: "资源借用",
           children: [
             {
@@ -131,6 +131,12 @@ export default {
               path: "/borrow/borrowGet",
               menuName: "借用管理",
               icon: "i_3盘盒借用",
+            },
+            {
+              id: 1 - 3,
+              path: "/borrow/repairGet",
+              menuName: "维修管理",
+              icon: "维修",
             }
           ],
         },
@@ -186,6 +192,12 @@ export default {
               icon: "储位",
             },
             {
+              id: 3 - 5,
+              path: "/warehouse/modularization",
+              menuName: "模块管理",
+              icon: "模块",
+            },
+            {
               id: 3 - 3,
               path: "/warehouse/emergencyPlan",
               menuName: "预案管理",
@@ -292,6 +304,12 @@ export default {
               icon: "i_3盘盒借用",
             },
             {
+              id: 0 - 4,
+              path: "/systemConfig/repairApply",
+              menuName: "维修申请",
+              icon: "领用申请",
+            },
+            {
               id: 0 - 3,
               path: "/systemConfig/equipmentInfo",
               menuName: "装备信息",

src/views/systemConfig/borrowApply.vue

@@ -144,7 +144,7 @@
                 >查看</a-button
               >
               <a-button
-                v-if="[-2, -1].includes(scope.row.SubmitState)"
+                v-if="[-2].includes(scope.row.SubmitState)"
                 type="primary"
                 class="actions"
                 ghost

src/views/systemConfig/userInfo.vue

@@ -45,12 +45,12 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="储位:">
-                  <span class="clock_text">{{borrowData[0].StorageCode===""?"暂无":borrowData[0].StorageCode}}</span>
+                  <span class="clock_text">{{borrowData.StorageCode===""?"暂无":borrowData.StorageCode}}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="部门:">
-                  <span class="clock_text">{{borrowData[0].DepartName===""?"暂无":borrowData[0].DepartName}}</span>
+                  <span class="clock_text">{{borrowData.DepartName===""?"暂无":borrowData.DepartName}}</span>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -361,6 +361,7 @@ export default {
       form: {},
       tableData: [],
       borrowData: [],
+      StorageCode:'',
       cabinetShow:true,
       editData: [],
       addVisible: false,

src/views/warehouse/cabinet.vue

@@ -78,7 +78,7 @@
           style="height: 40px"
           class="funcButton"
           @click="addWarehouse()"
-          >新增</el-button
+          >添加储位</el-button
         >
       </el-form>
 

src/views/warehouse/warehouseInventory.vue

@@ -56,7 +56,7 @@
           icon="search"
           style="height: 40px"
           class="textboxBo"
-          @click="getQueuData()"
+          @click="getQueuData(1)"
           >查询</a-button
         >
         <el-button
@@ -274,9 +274,8 @@
             background
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :current-page="searchData.pageNo"
+            :current-page="searchData.Page"
             :page-sizes="[10, 20, 30, 40]"
-            :page-size="searchData.Page"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"
           />
@@ -412,7 +411,10 @@ export default {
       //   console.log("1",this.searchData.BeginTime)
       // console.log("2",this.searchData.EndTime)
     },
-    async getQueuData() {
+    async getQueuData(arg) {
+      if(arg) {
+       this.searchData.Page = 1
+     }
       this.loading = true;
       const { data: res } = await this.$axios.get("api/Inventory", {
         params: this.searchData,