From be10d49922400ca9d08ecf412ed4c1ceb2e2d1d7 Mon Sep 17 00:00:00 2001
From: xiaobai <857694115@qq.com>
Date: Mon, 16 Aug 2021 15:02:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9=E5=8E=9F=E5=A7=8B=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E9=99=84=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                         |  4 +-
 src/views/task/list.vue                  | 17 +++++-
 src/views/ysjl/3000/dj/common/zdftFb.vue |  8 +--
 src/views/ysjl/3000/jj/zdft/index.vue    | 73 ++++++++++++++++++++++++
 4 files changed, 95 insertions(+), 7 deletions(-)
 create mode 100644 src/views/ysjl/3000/jj/zdft/index.vue

diff --git a/.env.development b/.env.development
index 49cdc66..9ee891d 100644
--- a/.env.development
+++ b/.env.development
@@ -4,10 +4,10 @@
 VUE_APP_PROJECT_NAME = 'SJJY'
 
 # 微服务IP
-VUE_APP_SERVER_ADDRESS = '192.168.1.130'
+VUE_APP_SERVER_ADDRESS = 'test.sdma.mingansei.com'
 
 # 微服务地址
-VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}:9100'
+VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}'
 
 # 省局数据后台IP
 VUE_APP_SJ_BASE_IP_ADDRESS = '192.168.1.130'
diff --git a/src/views/task/list.vue b/src/views/task/list.vue
index f86054e..4b67df9 100644
--- a/src/views/task/list.vue
+++ b/src/views/task/list.vue
@@ -31,6 +31,9 @@
           <el-select v-model="listQuery.shebeizhongleidaima" placeholder="请选择设备种类" clearable>
             <el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
+          <el-select v-model="listQuery.neibuleibie" placeholder="请选择检验类别" clearable>
+            <el-option v-for="item in searchNblbList" :key="item.code" :label="item.name" :value="item.code" v-show="item.parentId" />
+          </el-select>
           <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 340px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 230px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="使用登记证号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
@@ -229,7 +232,7 @@ import Pagination from '@/components/Pagination'
 import Utils from '../../utils/contact.js'
 import { getOwnList, terminateRenwu, completeRenwuFn } from '@/api/renwu'
 import { cancelRenwuFn } from '@/api/common'
-
+import { mapGetters } from 'vuex'
 import Enclosure from '@/views/common/Enclosure'
 export default {
   name: 'MyTask',
@@ -288,11 +291,23 @@ export default {
       isSysUser: this.$store.getters.clientType === 'System'
     }
   },
+  filters: {
+  screen(value) {
+    console.log(value,254444)
+    return value.charAt(0).toUpperCase() + value.slice(1)
+  }
+},
   created() {
     this.getList()
     this.getSbList(undefined, undefined, 1)
     this.jylbList = this.$store.getters.allCategory
   },
+  computed: {
+  // 使用对象展开运算符将 getter 混入 computed 对象中
+    searchNblbList(){
+     return this.$store.getters.allCategory
+    }
+  },
   mounted() {
     const that = this
     this.common.$on('task-list', function() {
diff --git a/src/views/ysjl/3000/dj/common/zdftFb.vue b/src/views/ysjl/3000/dj/common/zdftFb.vue
index b7fe5fd..6a83677 100644
--- a/src/views/ysjl/3000/dj/common/zdftFb.vue
+++ b/src/views/ysjl/3000/dj/common/zdftFb.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-table :data="data" style="width: 50%">
-      <el-table-column label="" prop="D2" />
+    <el-table :data="data" style="width: 30%" border="">
+      <el-table-column label="" prop="D2" width="100" />
       <el-table-column label="制停距离（m）" prop="D1">
         <template slot-scope="scope">
           <el-input v-model="scope.row.D1" />
@@ -21,7 +21,7 @@ export default {
     },
     state: {
       type: String,
-      require: true
+      required: true
     }
   },
   data() {
@@ -44,7 +44,7 @@ export default {
   },
   computed: {
     data() {
-      if (this.state == 'create') {
+      if (this.state === 'create') {
         const arr = [
           {
             D2: '第一次',
diff --git a/src/views/ysjl/3000/jj/zdft/index.vue b/src/views/ysjl/3000/jj/zdft/index.vue
new file mode 100644
index 0000000..09fa772
--- /dev/null
+++ b/src/views/ysjl/3000/jj/zdft/index.vue
@@ -0,0 +1,73 @@
+<template>
+  <div class="app-container">
+    <baseInfo :from-type="type" :array-group="arrayGroup" />
+  </div>
+</template>
+<script>
+import baseInfo from '@/views/ysjl/3000/common/index'
+
+export default {
+  name: 'ElevatorYeyin',
+  components: { baseInfo },
+  data() {
+    return {
+      type: 5,
+      arrayGroup: [
+        {
+          header: [
+            {
+              label: '',
+              prop: 'D2',
+              type: 1
+            },
+            {
+              label: '制停距离（m）',
+              prop: 'D1',
+              type: 1
+            }
+          ]
+        }
+      ],
+      tableHeader2: [
+        {
+          label: '载荷',
+          type: 1
+        },
+        {
+          label: '30%',
+          prop: 'D1',
+          type: 1
+        },
+        {
+          label: '40%',
+          prop: 'D2',
+          type: 1
+        },
+        {
+          label: '45%',
+          prop: 'D3',
+          type: 1
+        },
+        {
+          label: '50%',
+          prop: 'D4',
+          type: 1
+        },
+        {
+          label: '60%',
+          prop: 'D5',
+          type: 1
+        }
+      ],
+      list: [],
+      list1: []
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {}
+}
+</script>
+
+<style>
+</style>