多生物采集调整

src/router/modules/dswtz.js

@@ -33,15 +33,15 @@ const menuLayouts = [
     },
     component: () => import("@/views/dswtz/dnaxx/queryDnaxx.vue")
   },
-  {
-    path: "/addDnaxx",
-    name: "addDnaxx",
-    meta: {
-      isAdd: true,
-      title: 'DNA信息'
-    },
-    component: () => import("@/views/dswtz/dnaxx/addDnaxx.vue")
-  },
+  // {
+  //   path: "/addDnaxx",
+  //   name: "addDnaxx",
+  //   meta: {
+  //     isAdd: true,
+  //     title: 'DNA信息'
+  //   },
+  //   component: () => import("@/views/dswtz/dnaxx/addDnaxx.vue")
+  // },
   {
     path: "/detailDnaxx",
     name: "detailDnaxx",
@@ -83,15 +83,15 @@ const menuLayouts = [
     },
     component: () => import("@/views/dswtz/swxx/querySwxx.vue")
   },
-  {
-    path: "/addSwxx",
-    name: "addSwxx",
-    meta: {
-      isAdd: true,
-      title: '声纹信息'
-    },
-    component: () => import("@/views/dswtz/swxx/addSwxx.vue")
-  },
+  // {
+  //   path: "/addSwxx",
+  //   name: "addSwxx",
+  //   meta: {
+  //     isAdd: true,
+  //     title: '声纹信息'
+  //   },
+  //   component: () => import("@/views/dswtz/swxx/addSwxx.vue")
+  // },
   // {
   //   path: "/swtzxxgl",
   //   name: "swtzxxgl",

src/router/modules/dswtzxx.js

@@ -216,4 +216,22 @@ export default [
     },
     component: () => import("@/views/dswtz/swxx/dswcj.vue")
   },
+  {
+    path: "/addDnaxx",
+    name: "addDnaxx",
+    meta: {
+      isAdd: true,
+      title: 'DNA信息'
+    },
+    component: () => import("@/views/dswtz/dnaxx/addDnaxx.vue")
+  },
+  {
+    path: "/addSwxx",
+    name: "addSwxx",
+    meta: {
+      isAdd: true,
+      title: '声纹信息'
+    },
+    component: () => import("@/views/dswtz/swxx/addSwxx.vue")
+  }
 ]

src/views/dswtz/dnaxx/DNAlist.vue

@@ -13,6 +13,11 @@
                 @add="add"
                 ref="rightContent"
         >
+            <template #listOperation="scope">
+              <span class="hbyps" @click="add(scope.scope)">
+                <i class="el-ibncon-plus"></i>新增</span
+              >
+            </template>
             <template #btnGroup="scope">
                 <el-button @click="edit(scope.scope)" type="text">修改</el-button>
                 <el-button @click="dele(scope.scope)" type="text">删除</el-button>
@@ -204,5 +209,21 @@
     }
 </style>
 <style scoped lang="scss">
-    @import "@/assets/styles/rightContent.scss";
+  @import "@/assets/styles/rightContent.scss";
+  .hbyps{
+    width: 64px;
+    height: 24px;
+    background: #ffffff;
+    border: 1px solid #007aff;
+    margin-bottom: 15px;
+    opacity: 1;
+    border-radius: 4px;
+    text-align: center;
+    align-items: center;
+    display: inline-block;
+    font-size: 12px !important;
+    font-weight: 400 !important;
+    color: #007aff !important;
+    cursor: pointer;
+  }
 </style>

src/views/dswtz/hmxx/addHmxx.vue

@@ -101,8 +101,9 @@
         params.set('hmsjRight',this.fileBase64['hmsjRight'])
         updateHm(params).then(res=>{
          if(res.code){
-           loading.close()
-           this.$router.push("dswtzxxlbxx")
+          //  loading.close()
+          //  this.$router.push("dswtzxxlbxx")
+          this.$message.success("保存成功");
          }
         })
       },

src/views/dswtz/rxxx/addRxxx.vue

@@ -153,7 +153,7 @@ export default {
     params.append('asjxgrybh',this.$route.query.rybh)
     this.$store.commit("user/SET_Breadcrumb", this.breadcrumbList);
     if (this.$route.query.rybh) {
-      this.title = "修改人像信息";
+      this.title = "人像信息";
       this.rybh = this.$route.query.rybh;
       this.getshuju();
     }

src/views/dswtz/swxx/SWlist.vue

@@ -14,6 +14,11 @@
                 @toInfor="toInfor"
                 ref="rightContent"
         >
+            <template #listOperation="scope">
+              <span class="hbyps" @click="add(scope.scope)">
+                <i class="el-ibncon-plus"></i>新增</span
+              >
+            </template>
             <template #btnGroup="scope">
                 <el-button @click="dele(scope.scope)" type="text">删除</el-button>
             </template>
@@ -35,7 +40,7 @@
     data() {
       return {
         tableOperation:true,
-        tableOperationWidth:800,
+        tableOperationWidth:100,
         header: "多生物特征信息",
         pageBs: "dswtzxxlbxx",
         cxFormData: {
@@ -215,4 +220,20 @@
 </style>
 <style scoped lang="scss">
     @import "@/assets/styles/rightContent.scss";
+    .hbyps{
+      width: 64px;
+      height: 24px;
+      background: #ffffff;
+      border: 1px solid #007aff;
+      margin-bottom: 15px;
+      opacity: 1;
+      border-radius: 4px;
+      text-align: center;
+      align-items: center;
+      display: inline-block;
+      font-size: 12px !important;
+      font-weight: 400 !important;
+      color: #007aff !important;
+      cursor: pointer;
+    }
 </style>

src/views/dswtz/swxx/addSwxx.vue

@@ -91,7 +91,14 @@
     },
     methods: {
       submit(params) {
-        if(!params.get('voicefile')){
+        // if(!params.get('voicefile')){
+        //   this.$message({
+        //     message: '请上传音频文件',
+        //     type: 'warning'
+        //   });
+        //   return
+        // }
+        if(!params.get('file')){
           this.$message({
             message: '请上传音频文件',
             type: 'warning'
@@ -105,6 +112,8 @@
           background: "rgba(255, 255, 255, 0.7)",
         });
         params.append('rybh',this.rybh)
+        params.append('voicefile', params.get('file'))
+        params.delete('file')
         saveSw(params).then(res=>{
           if(res.code === 200){
             loading.close();

src/views/dswtz/swxx/components/dcsfxx.vue

@@ -115,7 +115,7 @@
         this.form.name = data.rdbzcz
       },
       getRdbs(type) {
-      // 0-未比对 1-已比对 2-比对中 3-已认定
+      // 0-未认定 1-已认定
         let text = ''
         switch (type) {
           case '0':

src/views/dswtz/swxx/components/zwbd.vue

@@ -79,7 +79,7 @@
         pageBs: "dswtzxxlbxx",
         header: "多生物特征信息",
         tableData: [],
-        Url: '/Zwbzrw/gethainZwrwList',
+        Url: '/Zwbzrw/getOracleZwrwList',
         Url2: '/Zwbzrw/updateZwbdDswById',
         loading: false,
         cxFormData1: {

src/views/dswtzxx/jbxx/addryxx.vue

@@ -224,7 +224,8 @@
           insertRyxx(params).then(res=>{
             if(res.code===200){
               loading.close()
-              this.$router.go(-1)
+              // this.$router.go(-1)
+              this.$router.push('dswtzxxlbxx')
             }
           })
         }

src/views/dswtzxx/jbxx/lbxx.vue

@@ -131,7 +131,7 @@ export default {
           prop: "xbdmStr",
         },
       ],
-      cxUrl: "/rycj/selectOracleRyxxList",
+      cxUrl: "/rycj/selectRyxxList",
       Menu: [
         {
           id: "wfqdzczl",