Merge branch 'master' of http://git.mingansei.com/xiaobai/equipment

.env.development

@@ -25,4 +25,4 @@ VUE_APP_SJ_API = 'http://${VUE_APP_SJ_BASE_IP_ADDRESS}:9092/SJSE/'
 VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/'
 
 # websocket连接地址
-VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/'
+VUE_APP_WEBSOCKET =  'ws://${VUE_APP_SERVER_ADDRESS}/sdma-websocket/websocket/'

src/views/ysjl/4000/dj/jxs-az/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/4000/dj/common/index'
+
+export default {
+  name: 'QSQZJ',
+  components: { baseInfo },
+  data() {
+    return {
+      type: 6
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+</style>

src/views/ysjl/4000/dj/lds-qzj/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/4000/dj/common/index'
+
+export default {
+  name: 'QSQZJ',
+  components: { baseInfo },
+  data() {
+    return {
+      type: 3
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+</style>

src/views/ysjl/4000/dj/ms-qzj/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/4000/dj/common/index'
+
+export default {
+  name: 'QSQZJ',
+  components: { baseInfo },
+  data() {
+    return {
+      type: 1
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+</style>

src/views/ysjl/4000/dj/mzs-qzj/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/4000/dj/common/index'
+
+export default {
+  name: 'QSQZJ',
+  components: { baseInfo },
+  data() {
+    return {
+      type: 2
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+</style>

src/views/ysjl/4000/dj/qs-qzj/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/4000/dj/common/index'
+
+export default {
+  name: 'QSQZJ',
+  components: { baseInfo },
+  data() {
+    return {
+      type: 1
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+</style>

src/views/ysjl/4000/dj/sjj-az/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/4000/dj/common/index'
+
+export default {
+  name: 'QSQZJ',
+  components: { baseInfo },
+  data() {
+    return {
+      type: 4
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+</style>

src/views/ysjl/4000/dj/ts-qzj/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/4000/dj/common/index'
+
+export default {
+  name: 'QSQZJ',
+  components: { baseInfo },
+  data() {
+    return {
+      type: 5
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+</style>

src/views/ysjl/4000/jj/jxs-az/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/4000/jj/common/index'
+
+export default {
+  name: 'QSQZJ',
+  components: { baseInfo },
+  data() {
+    return {
+      type: 6
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+</style>

src/views/ysjl/4000/jj/lds-qzj/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/4000/jj/common/index'
+
+export default {
+  name: 'QSQZJ',
+  components: { baseInfo },
+  data() {
+    return {
+      type: 3
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+</style>

src/views/ysjl/4000/jj/ms-qzj/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/4000/jj/common/index'
+
+export default {
+  name: 'QSQZJ',
+  components: { baseInfo },
+  data() {
+    return {
+      type: 1
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+</style>

src/views/ysjl/4000/jj/mzs-qzj/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/4000/jj/common/index'
+
+export default {
+  name: 'QSQZJ',
+  components: { baseInfo },
+  data() {
+    return {
+      type: 2
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+</style>

src/views/ysjl/4000/jj/qs-qzj/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/4000/jj/common/index'
+
+export default {
+  name: 'QSQZJ',
+  components: { baseInfo },
+  data() {
+    return {
+      type: 1
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+</style>

src/views/ysjl/4000/jj/sjj-az/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/4000/jj/common/index'
+
+export default {
+  name: 'QSQZJ',
+  components: { baseInfo },
+  data() {
+    return {
+      type: 4
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+</style>

src/views/ysjl/4000/jj/ts-qzj/index.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/4000/jj/common/index'
+
+export default {
+  name: 'QSQZJ',
+  components: { baseInfo },
+  data() {
+    return {
+      type: 5
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+</style>

src/views/ysjl/5000/dj/jdgy-cl/index.vue

@@ -19,7 +19,7 @@
     </sticky>
     <el-tabs v-model="checkedTab" type="card">
       <el-tab-pane label="基本信息" name="first">
-        <el-form ref="ysjl" :model="ysjl" class="el-form" label-position="right" label-width="100px">
+        <el-form ref="ysjl" :model="ysjl" class="el-form" label-position="right" label-width="140px">
           <fieldset>
             <legend>基本信息</legend>
             <el-row :gutter="25">
@@ -40,20 +40,23 @@
               </el-col>
             </el-row>
             <el-row :gutter="20">
-              <el-col :span="9">
+              <el-col :span="18">
-                <el-form-item label="设备注册代码（使用登记证编号）" prop="zhucedaima" label-width="200">
+                <el-form-item label="车辆牌号" prop="车辆牌号">
-                  <el-input v-model="ysjl.zhucedaima" :disabled="edit" />
+                  <el-input v-model="chepai" style="width:80px" disabled />
+                  <el-input v-model="ysjl.cheliangpaihao" :disabled="edit" style="width:80px" />
                 </el-form-item>
               </el-col>
-              <el-col :span="9">
+            </el-row>
-                <el-form-item label="车辆牌号" prop="车辆牌号">
+            <el-row :gutter="20">
-                  <el-input v-model="ysjl.cheliangpaihao" :disabled="edit" />
+              <el-col :span="18">
+                <el-form-item label="设备注册代码（使用登记证编号）" prop="zhucedaima" label-width="240px">
+                  <el-input v-model="ysjl.zhucedaima" :disabled="edit" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
-                <el-form-item label="使用单位" prop="shiyongdanwei" label-width="160px">
+                <el-form-item label="使用单位" prop="shiyongdanwei">
                   <el-input v-model="ysjl.shiyongdanwei" :disabled="edit" type="text" />
                 </el-form-item>
               </el-col>
@@ -202,6 +205,20 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="18">
+                <el-form-item label="检验类别" prop="jianyanleibie">
+                  <el-radio-group v-model="ysjl.jianyanleibie">
+                    <el-radio label="SC">
+                      首次检验
+                    </el-radio>
+                    <el-radio label="DQ">
+                      定期检验
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
                 <el-form-item
@@ -368,6 +385,7 @@ export default {
       ysjl: {
         shiyongdanwei: ''
       },
+      chepai: '鲁·',
       param: {},
       state: this.$route.query.state,
       jianyanrenyuan: '',

src/views/ysjl/5000/dj/lygg-cl/index.vue

@@ -41,7 +41,7 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
-                <el-form-item label="设备注册代码（使用登记证编号）" prop="zhucedaima" label-width="300px">
+                <el-form-item label="设备注册代码（使用登记证编号）" prop="zhucedaima" label-width="240px">
                   <el-input v-model="ysjl.zhucedaima" :disabled="edit" />
                 </el-form-item>
               </el-col>
@@ -166,7 +166,7 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
-                <el-form-item label="检验类别" prop="jianyanleibie" label-width="300px">
+                <el-form-item label="检验类别" prop="jianyanleibie">
                   <el-radio-group v-model="ysjl.jianyanleibie">
                     <el-radio label="SC">
                       首次检验
@@ -382,7 +382,6 @@ export default {
       param: {},
       state: this.$route.query.state,
       jianyanrenyuan: '',
-      departmentId: this.$store.getters.departmentId,
       isRepeat: false,
       edit: false,
       sybjSData: [],