Browse Source

完成特种设备检定预警

hfxc226 2 years ago
parent
commit
5a560ee3cb

+ 2 - 0
src/router/generator-platform-routers.js

@@ -74,6 +74,8 @@ const constantRouterComponents = {
   'MeasureLogSpecial': () => import('@/views/sb/measurelog/MeasureLogSpecial'),
   // 特种设备基础信息
   'SpecialSbInfo': () => import('@/views/sb/info/SpecialSbInfo'),
+  // 特种设备预警
+  'SpecialSbInfoWarn': () => import('@/views/sb/info/SpecialSbInfoWarn'),
   // 父子设备树
   'ParentSbInfo': () => import('@/views/sb/info/ParentSbInfo'),
   // 设别型号库

+ 2 - 2
src/views/sb/info/SbInfo.vue

@@ -83,12 +83,12 @@
                       </a-select>
                     </a-form-item>
                   </a-col>-->
-                  <a-col :md="8" :sm="24">
+                  <a-col :md="6" :sm="24">
                     <a-form-item label="检定日期范围">
                       <a-range-picker v-model="dateRangeCheck" :style="{width: '256px'}" />
                     </a-form-item>
                   </a-col>
-                  <a-col :md="8" :sm="24">
+                  <a-col :md="6" :sm="24">
                     <a-form-item label="有效日期范围">
                       <a-range-picker v-model="dateRange" :style="{width: '256px'}" />
                     </a-form-item>

+ 18 - 0
src/views/sb/info/SpecialSbInfoWarn.vue

@@ -0,0 +1,18 @@
+<template>
+  <SbInfo :use-type="5" :is-measure="1" :measure-status="1">
+  </sbinfo>
+</template>
+
+<script>
+import SbInfo from './SbInfo'
+export default {
+  name: 'SpecialSbInfoWarn',
+  components: {
+    SbInfo
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

+ 2 - 2
src/views/sb/info/modules/BaseForm.vue

@@ -654,8 +654,8 @@
           </a-col>
         </a-row>
       </div>
-      <title-divider v-show="useType == 4" title="计量信息" width="90px"></title-divider>
-      <div v-show="useType == 4" >
+      <title-divider v-show="useType == 4 || useType == 5" title="检定周期信息" width="90px"></title-divider>
+      <div v-show="useType == 4 || useType == 5" >
         <!--        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
           <a-col :lg="12" :md="24" :sm="24">
             <a-form-item

+ 1 - 1
src/views/sb/measurelog/MeasureLog.vue

@@ -171,7 +171,7 @@ export default {
         },
         {
           title: '备注',
-          dataIndex: 'requirement'
+          dataIndex: 'remark'
         },
         {
           title: '操作',

+ 3 - 3
vue.config.js

@@ -100,11 +100,11 @@ const vueConfig = {
 
   devServer: {
     // development server port 8000
-    port: 8000,
+    port: 8050,
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://localhost:5000',
+        target: 'http://localhost:5050',
         ws: false,
         changeOrigin: true,
         pathRewrite: {
@@ -112,7 +112,7 @@ const vueConfig = {
         }
       },
       '/files': {
-        target: 'http://localhost:5000',
+        target: 'http://localhost:5050',
         ws: false,
         changeOrigin: true
       }