正式版

Signed-off-by: liuboyan <632697560@qq.com>

.env.development

@@ -1,3 +1,3 @@
-VITE_BASE_API = "https://ebeitest.wuyeface.com:1188/"
+VITE_BASE_API = "http://101.200.225.123/"
 VITE_TIME_OUT = 5000
-VITE_MENUCODE = "RoomManageSystem"
+VITE_MENUCODE = "HospitalPropertySystem"

.env.production

@@ -1,3 +1,3 @@
-VITE_BASE_API = "https://ebeitest.wuyeface.com:1188/"
+VITE_BASE_API = "http://101.200.225.123/"
 VITE_TIME_OUT = 5000
-VITE_MENUCODE = "RoomManageSystem"
+VITE_MENUCODE = "HospitalPropertySystem"

src/api/medicalManage.js

@@ -65,7 +65,7 @@ export function getDetailDataOfBatch (object) {
 //  医废批次管理--获取医废列表
 export function getWasteDataOfBatch (object) {
   return request({
-    url: '/hospital/rubbish/batch/queryRubbishBatchList',
+    url: '/hospital/rubbish/package/queryRubbishPackageList',
     method: 'post',
     data: object,
     type: 'JSON'
@@ -83,7 +83,7 @@ export function getWasteDetailDataOfBatch (object) {
 //  医废批次管理--获取运送路线
 export function getRouterDataOfBatch (object) {
   return request({
-    url: `/hospital/rubbish/batch/checkoutBatchPath/${object.batchId}`,
+    url: `/hospital/rubbish/batch/checkoutBatchPath`,
     method: 'get',
     params: object,
     type: 'JSON'
@@ -131,7 +131,7 @@ export function getRecordDataOfAbnormal (object) {
 //  异常医废管理--提交异常处理表单
 export function submitAbnormalHandleFormOfAbnormal (object) {
   return request({
-    url: `/hospital/rubbish/package/finishAbnormal/${object.packageId}`,
+    url: `/hospital/rubbish/package/finishAbnormal`,
     method: 'post',
     data: object,
     type: 'JSON'

src/components/menuAside/index.vue

@@ -53,7 +53,7 @@ export default {
     this.menuState.activeMenu = this.$route.path
     getMenu({
       menuTypes: 0,
-      userId: getStore({ name: 'userIdJH' }),
+      userId: getStore({ name: 'userIdObject' }),
       belongSystem: 1
     }).then(res => {
       if (res.resultCode == 200) {
@@ -77,6 +77,8 @@ export default {
         } else {
           next()
         }
+      } else if (to.path == '/') {
+        next()
       } else {
         next('/')
       }

src/components/menuHeader/index.vue

@@ -50,7 +50,7 @@ export default {
   data () {
     return {
       state: {
-        userName: getStore({ name: 'userNameJH' })
+        userName: getStore({ name: 'userNameObject' })
       }
     }
   },

src/utils/request.js

@@ -49,7 +49,7 @@ request.interceptors.response.use(
     // 请求成功处理
     const res = response.data
     if (res.status == 401 || res.code == 401) {
-      routers.push({
+      routers.replace({
         path: '/'
       })
     }

src/utils/store.js

@@ -3,10 +3,10 @@ import { validatenull } from 'utils/validate'
 //  获取token
 export const getToken = () => {
   let accessToken = ''
-  if (getStore({ name: 'tokenJH', type: 'session' })) {
-    accessToken = getStore({ name: 'tokenJH', type: 'session' })
-  } else if (getStore({ name: 'tokenJH' })) {
-    accessToken = getStore({ name: 'tokenJH' })
+  if (getStore({ name: 'tokenObject', type: 'session' })) {
+    accessToken = getStore({ name: 'tokenObject', type: 'session' })
+  } else if (getStore({ name: 'tokenObject' })) {
+    accessToken = getStore({ name: 'tokenObject' })
   }
   return accessToken
 }

src/utils/viewCurrency.js

@@ -53,7 +53,6 @@ const viewCurrency = {
     },
     //  切换表格每页条数
     handleSizeChange (val) {
-      debugger
       this.pageSize = val
       this.handlePageChange(1)
     },

src/views/dangerManage/voiceManage.vue

@@ -515,7 +515,7 @@ export default {
       }).then(res => {
         if (res.code == 200) {
           this.tableData = res.data.records
-          this.tableTotal = parseInt(res.data.total)
+          this.tableTotal = res.data.total
           this.tableLoading = false
         } else {
           ElNotification({

src/views/login.vue

@@ -79,9 +79,9 @@ export default {
           clearStore({ type: 'session' })
           Cookies.set('user', res.data.userName)
           Cookies.set('access', 0)
-          setStore({ name: 'userIdJH', content: res.data.userId })
-          setStore({ name: 'userNameJH', content: res.data.userName })
-          setStore({ name: 'tokenJH', content: this.$route.query.token })
+          setStore({ name: 'userIdObject', content: res.data.userId })
+          setStore({ name: 'userNameObject', content: res.data.userName })
+          setStore({ name: 'tokenObject', content: this.$route.query.token })
           this.$router.push({
             path: '/index'
           })
@@ -104,11 +104,11 @@ export default {
               clearStore({ type: 'session' })
               Cookies.set('user', res.users[0].userName)
               Cookies.set('access', 0)
-              setStore({ name: 'companyIdJH', content: res.users[0].companyId })
-              setStore({ name: 'userIdJH', content: res.users[0].userid })
-              setStore({ name: 'userNameJH', content: res.users[0].userName })
-              setStore({ name: 'companyNameJH', content: res.users[0].companyName })
-              setStore({ name: 'tokenJH', content: res.users[0].token })
+              setStore({ name: 'companyIdObject', content: res.users[0].companyId })
+              setStore({ name: 'userIdObject', content: res.users[0].userid })
+              setStore({ name: 'userNameObject', content: res.users[0].userName })
+              setStore({ name: 'companyNameObject', content: res.users[0].companyName })
+              setStore({ name: 'tokenObject', content: res.users[0].token })
               this.$router.push({
                 path: '/index'
               })

src/views/medicalWasteManage/medicalWasteManage.vue

@@ -32,9 +32,9 @@
                 >
                   <el-option
                     v-for="item in $store.state.projectList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
-                    :value="item.value"
+                    :value="item.code"
                   />
                 </el-select>
               </el-form-item>
@@ -58,7 +58,7 @@
                 >
                   <el-option
                     v-for="item in $store.state.batchNameList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
                     :value="item.label"
                   />
@@ -137,9 +137,9 @@
                 >
                   <el-option
                     v-for="item in $store.state.packStateList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
-                    :value="item.value"
+                    :value="item.code"
                   />
                 </el-select>
               </el-form-item>
@@ -154,9 +154,9 @@
                 >
                   <el-option
                     v-for="item in $store.state.abnormalTypeList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
-                    :value="item.value"
+                    :value="item.code"
                   />
                 </el-select>
               </el-form-item>
@@ -171,9 +171,9 @@
                 >
                   <el-option
                     v-for="item in $store.state.abnormalCategoryList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
-                    :value="item.value"
+                    :value="item.code"
                   />
                 </el-select>
               </el-form-item>
@@ -188,9 +188,9 @@
                 >
                   <el-option
                     v-for="item in $store.state.finishStateList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
-                    :value="item.value"
+                    :value="item.code"
                   />
                 </el-select>
               </el-form-item>
@@ -538,6 +538,7 @@
           size="medium"
           type="primary"
           :loading="buttonLoading"
+          disabled
           @click="printLabel"
         >
           打印标签

src/views/medicalWasteManage/wasteAbnormalManage.vue

@@ -32,9 +32,9 @@
                 >
                   <el-option
                     v-for="item in $store.state.projectList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
-                    :value="item.value"
+                    :value="item.code"
                   />
                 </el-select>
               </el-form-item>
@@ -58,7 +58,7 @@
                 >
                   <el-option
                     v-for="item in $store.state.batchNameList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
                     :value="item.label"
                   />
@@ -155,9 +155,9 @@
                 >
                   <el-option
                     v-for="item in $store.state.packStateList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
-                    :value="item.value"
+                    :value="item.code"
                   />
                 </el-select>
               </el-form-item>
@@ -172,9 +172,9 @@
                 >
                   <el-option
                     v-for="item in $store.state.abnormalCategoryList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
-                    :value="item.value"
+                    :value="item.code"
                   />
                 </el-select>
               </el-form-item>
@@ -189,9 +189,9 @@
                 >
                   <el-option
                     v-for="item in $store.state.finishStateList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
-                    :value="item.value"
+                    :value="item.code"
                   />
                 </el-select>
               </el-form-item>
@@ -566,6 +566,7 @@
           size="medium"
           type="primary"
           :loading="buttonLoading"
+          disabled
           @click="printLabel"
         >
           打印标签
@@ -605,9 +606,9 @@
               >
                 <el-option
                   v-for="item in $store.state.abnormalCategoryList"
-                  :key="item.value"
+                  :key="item.code"
                   :label="item.label"
-                  :value="item.value"
+                  :value="item.code"
                 />
               </el-select>
             </el-form-item>

src/views/medicalWasteManage/wasteBatchManage.vue

@@ -32,9 +32,9 @@
                 >
                   <el-option
                     v-for="item in $store.state.projectList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
-                    :value="item.value"
+                    :value="item.code"
                   />
                 </el-select>
               </el-form-item>
@@ -75,9 +75,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item prop="creatTime">
+              <el-form-item prop="createTime">
                 <el-date-picker
-                  v-model="filterForm.creatTime"
+                  v-model="filterForm.createTime"
                   type="datetime"
                   placeholder="请选择日期"
                 />
@@ -102,9 +102,9 @@
                 >
                   <el-option
                     v-for="item in $store.state.batchStateList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
-                    :value="item.value"
+                    :value="item.code"
                   />
                 </el-select>
               </el-form-item>
@@ -119,9 +119,9 @@
                 >
                   <el-option
                     v-for="item in $store.state.pathStateList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
-                    :value="item.value"
+                    :value="item.code"
                   />
                 </el-select>
               </el-form-item>
@@ -136,9 +136,9 @@
                 >
                   <el-option
                     v-for="item in $store.state.abnormalTypeList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
-                    :value="item.value"
+                    :value="item.code"
                   />
                 </el-select>
               </el-form-item>
@@ -153,9 +153,9 @@
                 >
                   <el-option
                     v-for="item in $store.state.finishStateList"
-                    :key="item.value"
+                    :key="item.code"
                     :label="item.label"
-                    :value="item.value"
+                    :value="item.code"
                   />
                 </el-select>
               </el-form-item>
@@ -214,7 +214,7 @@
             align="center"
           />
           <el-table-column
-            prop="creatTime"
+            prop="createTime"
             label="收集时间"
             min-width="180"
             align="center"
@@ -238,7 +238,7 @@
             align="center"
           />
           <el-table-column
-            prop="checkTime"
+            prop="updateTime"
             label="验收时间"
             min-width="180"
             align="center"
@@ -361,7 +361,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="收集时间">
-                      {{ detailForm.creatTime }}
+                      {{ detailForm.createTime }}
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -385,7 +385,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="验收时间">
-                      {{ detailForm.checkTime }}
+                      {{ detailForm.updateTime }}
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -785,7 +785,7 @@ export default {
         batchCode: '',
         batchName: '',
         collectUserName: '',
-        creatTime: '',
+        createTime: '',
         checkUserName: '',
         batchState: '',
         pathState: '',
@@ -802,7 +802,7 @@ export default {
         batchName: '',
         packState: '',
         collectUserName: '',
-        creatTime: '',
+        createTime: '',
         collectWeight: '',
         collectNo: '',
         checkUserName: '',
@@ -851,7 +851,7 @@ export default {
       this.tableLoading = true
       getTableListOfBatch({
         ...this.filterForm,
-        creatTime: this.filterForm.creatTime ? formatFullDateTime(this.filterForm.creatTime) : this.filterForm.creatTime,
+        createTime: this.filterForm.createTime ? formatFullDateTime(this.filterForm.createTime) : this.filterForm.createTime,
         pageIndex: this.pageIndex,
         pageSize: this.pageSize
       }).then(res => {
@@ -872,7 +872,7 @@ export default {
     exportFile () {
       downloadTableDataOfBatch({
         ...this.filterForm,
-        creatTime: this.filterForm.creatTime ? formatFullDateTime(this.filterForm.creatTime) : this.filterForm.creatTime
+        createTime: this.filterForm.createTime ? formatFullDateTime(this.filterForm.createTime) : this.filterForm.createTime
       })
     },
     //  获取详情

vite.config.js

@@ -27,6 +27,7 @@ export default ({ command, mode }) => {
           '/landcrm': {
             target: 'http://172.18.0.23/',
             // target: 'https://ebeitest.wuyeface.com:1188/',
+            // target: 'http://101.200.225.123/',
             changeOrigin: true,
             ws: true,
             rewrite: (path) => path.replace(/^\/landcrm/, '/landcrm')
@@ -34,6 +35,7 @@ export default ({ command, mode }) => {
           '/device': {
             target: 'http://172.18.0.23/',
             // target: 'https://ebeitest.wuyeface.com:1188/',
+            // target: 'http://101.200.225.123/',
             changeOrigin: true,
             ws: true,
             rewrite: (path) => path.replace(/^\/device/, '/device')
@@ -42,6 +44,7 @@ export default ({ command, mode }) => {
             // target: 'http://172.18.0.23/',
             target: 'http://172.18.0.78:9090/',
             // target: 'https://ebeitests.wuyeface.com:1188/',
+            // target: 'http://101.200.225.123/',
             changeOrigin: true,
             ws: true,
             rewrite: (path) => path.replace(/^\/hospital/, '/hospital')