档案采集、档案合集

1 year ago · 934f1a9770
parent 2900921acd
commit 934f1a9770
9 changed files with 40 additions and 104 deletions
--- a/dangan-ui/src/store/modules/user.js
+++ b/dangan-ui/src/store/modules/user.js
@ -8,7 +8,8 @@ const user = {
    name: '',
    avatar: '',
    roles: [],
-    permissions: []
+    permissions: [],
+    ip:""
  },

  mutations: {
@ -29,6 +30,9 @@ const user = {
    },
    SET_PERMISSIONS: (state, permissions) => {
      state.permissions = permissions
+    },
+    SET_IP: (state, ip) => {
+      state.ip = ip
    }
  },

@ -65,6 +69,7 @@ const user = {
          commit('SET_ID', user.userId)
          commit('SET_NAME', user.userName)
          commit('SET_AVATAR', avatar)
+          commit('SET_IP', user.loginIp)
          resolve(res)
        }).catch(error => {
          reject(error)
--- a/dangan-ui/src/views/dangan/birthDJ/index.vue
+++ b/dangan-ui/src/views/dangan/birthDJ/index.vue
@ -9,14 +9,6 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-<!--      <el-form-item label="出生证编号" prop="birthNum">
-        <el-input
-          v-model="queryParams.birthNum"
-          placeholder="请输入出生证编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
      <el-form-item label="姓名" prop="name">
        <el-input
          v-model="queryParams.name"
@ -33,30 +25,14 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-<!--      <el-form-item label="出生地点" prop="bornAddress">
+      <el-form-item label="身份证号" prop="mCardId">
        <el-input
-          v-model="queryParams.bornAddress"
-          placeholder="请输入出生地点"
+          v-model="queryParams.mCardId"
+          placeholder="请输入身份证号"
          clearable
          @keyup.enter.native="handleQuery"
        />
-      </el-form-item>-->
-<!--      <el-form-item label="接生人员签字" prop="jsrySign">
-        <el-input
-          v-model="queryParams.jsrySign"
-          placeholder="请输入接生人员签字"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-<!--      <el-form-item label="接生单位" prop="jsUnit">
-        <el-input
-          v-model="queryParams.jsUnit"
-          placeholder="请输入接生单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
+      </el-form-item>
      <el-form-item label="纠错状态" prop="errorCorrect">
        <el-select
          v-model="queryParams.errorCorrect"
@ -646,7 +622,7 @@

    <!--选择档案历史记录-->
    <el-dialog title="选择档案历史记录" :visible.sync="dalsInfo.visible" width="1200px" append-to-body>
-      <el-form :model="dalsInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+      <el-form :model="dalsInfo.queryParams" ref="queryFormDals" size="small" :inline="true" label-width="100px">

        <el-form-item label="图片ID" prop="id">
          <el-input
--- a/dangan-ui/src/views/dangan/collection/index.vue
+++ b/dangan-ui/src/views/dangan/collection/index.vue
@ -34,7 +34,7 @@
      <el-col :span="20" :xs="24">
        <div style="display: flex; justify-content: space-between">
          <div>
-            <el-button icon="el-icon-upload2" type="primary" @click="handleUpload">点击上传</el-button>
+            <el-button icon="el-icon-upload2" type="primary" @click="handleUpload">本地上传</el-button>
            <el-button icon="el-icon-upload2" type="primary" @click="handleScan">扫描上传</el-button>
          </div>
          <el-button icon="el-icon-full-screen" type="primary" v-if="pictureRecard.length>0" @click="cjsbrw">创建识别任务</el-button>
@ -320,6 +320,7 @@ export default {
  dicts: ['total_task', 'tatal_task_pic', 'url'],
  data() {
    return {
+      Ip:null,
      // 档案类型
      dAType: {
        // 弹出框
@ -354,7 +355,7 @@ export default {
        ]
      },
      // 颜色模式，0：黑白 1：灰色 2：彩色
-      pixel: 1,
+      pixel: 2,
      // 是否单面
      single: true,
      // 是否去白页
@ -415,10 +416,9 @@ export default {
    WebScanInit(){

      let _this = this;
-      let WebScanUrl = this.dict.type.url[0].value;

      _this.WebScan = new WebScan({
-        url: WebScanUrl,
+        url: "http://"+this.$store.state.user.ip+":18989/WebScan",
        wsUrl:'http://localhost:28989/',
        licence:'V4tMKPYgFtW8vQr4C0s4/g=='
      });
--- a/dangan-ui/src/views/dangan/czrkdj/index.vue
+++ b/dangan-ui/src/views/dangan/czrkdj/index.vue
@ -3,7 +3,7 @@

    <el-tabs v-model="queryParams.ywType" @tab-click="ywTypeClick">
      <el-tab-pane label="常住人口登记1" name="option1">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+        <el-form :model="queryParams" ref="queryForm1" size="small" :inline="true" v-show="showSearch" label-width="90px">

          <el-form-item label="任务ID" prop="taskId">
            <el-input
@ -188,7 +188,7 @@
        </el-table>
      </el-tab-pane>
      <el-tab-pane label="常住人口登记2" name="option3">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+        <el-form :model="queryParams" ref="queryForm2" size="small" :inline="true" v-show="showSearch" label-width="90px">
          <el-form-item label="任务ID" prop="taskId">
            <el-input
              v-model="queryParams.taskId"
@ -381,7 +381,7 @@
        </el-table>
      </el-tab-pane>
      <el-tab-pane label="常住人口登记3" name="option9">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+        <el-form :model="queryParams" ref="queryForm3" size="small" :inline="true" v-show="showSearch" label-width="90px">
          <el-form-item label="任务ID" prop="taskId">
            <el-input
              v-model="queryParams.taskId"
@ -577,7 +577,7 @@
        </el-table>
      </el-tab-pane>
      <el-tab-pane label="常住卡" name="option2">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+        <el-form :model="queryParams" ref="queryForm4" size="small" :inline="true" v-show="showSearch" label-width="90px">
          <el-form-item label="任务ID" prop="taskId">
            <el-input
              v-model="queryParams.taskId"
@ -2217,7 +2217,7 @@

    <!--选择档案历史记录-->
    <el-dialog title="选择档案历史记录" :visible.sync="dalsInfo.visible" width="1200px" append-to-body>
-      <el-form :model="dalsInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="130px">
+      <el-form :model="dalsInfo.queryParams" ref="queryFormDals" size="small" :inline="true" label-width="130px">

        <el-form-item label="图片ID" prop="id">
          <el-input
@ -2648,7 +2648,10 @@ export default {
    },
    /** 重置按钮操作 */
    resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm("queryForm1");
+      this.resetForm("queryForm2");
+      this.resetForm("queryForm3");
+      this.resetForm("queryForm4");
      this.handleQuery();
    },
    /** 新增按钮操作 */
--- a/dangan-ui/src/views/dangan/pictureRecard/index.vue
+++ b/dangan-ui/src/views/dangan/pictureRecard/index.vue
@ -108,7 +108,7 @@
            v-hasPermi="['dangan:pictureRecard:export']"
          >导出</el-button>
        </el-col>
-        <el-col :span="1.5" v-if="queryParams.recognize==='1'">
+        <el-col :span="1.5">
          <el-button
            type="warning"
            plain
--- a/dangan-ui/src/views/dangan/qyz/index.vue
+++ b/dangan-ui/src/views/dangan/qyz/index.vue
@ -17,22 +17,14 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-<!--      <el-form-item label="发文单位" prop="fwUnit">
+      <el-form-item label="身份证号" prop="cardId1">
        <el-input
-          v-model="queryParams.fwUnit"
-          placeholder="请输入发文单位"
+          v-model="queryParams.cardId1"
+          placeholder="请输入身份证号"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-      <el-form-item label="文件序号" prop="wjXh">
-        <el-input
-          v-model="queryParams.wjXh"
-          placeholder="请输入文件序号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
      <el-form-item label="纠错状态" prop="errorCorrect">
        <el-select
          v-model="queryParams.errorCorrect"
@ -637,7 +629,7 @@

    <!--选择档案历史记录-->
    <el-dialog title="选择档案历史记录" :visible.sync="dalsInfo.visible" width="1200px" append-to-body>
-      <el-form :model="dalsInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+      <el-form :model="dalsInfo.queryParams" ref="queryFormDals" size="small" :inline="true" label-width="100px">

        <el-form-item label="图片ID" prop="id">
          <el-input
--- a/dangan-ui/src/views/dangan/ytzm/index.vue
+++ b/dangan-ui/src/views/dangan/ytzm/index.vue
@ -25,30 +25,14 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-<!--      <el-form-item label="年份" prop="year">
+      <el-form-item label="身份证号" prop="wCardId">
        <el-input
-          v-model="queryParams.year"
-          placeholder="请输入年份"
+          v-model="queryParams.wCardId"
+          placeholder="请输入身份证号"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-      <el-form-item label="序号" prop="xh">
-        <el-input
-          v-model="queryParams.xh"
-          placeholder="请输入序号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="生育证号" prop="syzh">
-        <el-input
-          v-model="queryParams.syzh"
-          placeholder="请输入生育证号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
      <el-form-item label="纠错状态" prop="errorCorrect">
        <el-select
          v-model="queryParams.errorCorrect"
@ -582,7 +566,7 @@

    <!--选择档案历史记录-->
    <el-dialog title="选择档案历史记录" :visible.sync="dalsInfo.visible" width="1200px" append-to-body>
-      <el-form :model="dalsInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+      <el-form :model="dalsInfo.queryParams" ref="queryFormDals" size="small" :inline="true" label-width="100px">

        <el-form-item label="图片ID" prop="id">
          <el-input
--- a/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
+++ b/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
@ -659,7 +659,7 @@

    <!--选择档案历史记录-->
    <el-dialog title="选择档案历史记录" :visible.sync="dalsInfo.visible" width="1200px" append-to-body>
-      <el-form :model="dalsInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+      <el-form :model="dalsInfo.queryParams" ref="queryFormDals" size="small" :inline="true" label-width="100px">

        <el-form-item label="图片ID" prop="id">
          <el-input
--- a/dangan-ui/src/views/dangan/zqz/index.vue
+++ b/dangan-ui/src/views/dangan/zqz/index.vue
@ -9,18 +9,10 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-<!--      <el-form-item label="编号" prop="num">
-        <el-input
-          v-model="queryParams.num"
-          placeholder="请输入编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item label="申请人姓名" prop="name">
+      <el-form-item label="姓名" prop="name">
        <el-input
          v-model="queryParams.name"
-          placeholder="请输入申请人姓名"
+          placeholder="请输入姓名"
          clearable
          @keyup.enter.native="handleQuery"
        />
@ -33,30 +25,14 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-<!--      <el-form-item label="户口登记机关" prop="djJg">
+      <el-form-item label="出生日期" prop="birthDate1">
        <el-input
-          v-model="queryParams.djJg"
-          placeholder="请输入户口登记机关"
+          v-model="queryParams.birthDate1"
+          placeholder="请输入出生日期"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-      <el-form-item label="发往单位" prop="fwdw">
-        <el-input
-          v-model="queryParams.fwdw"
-          placeholder="请输入发往单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="批准机关" prop="pzjg">
-        <el-input
-          v-model="queryParams.pzjg"
-          placeholder="请输入批准机关"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
      <el-form-item label="纠错状态" prop="errorCorrect">
        <el-select
          v-model="queryParams.errorCorrect"
@ -784,7 +760,7 @@

    <!--选择档案历史记录-->
    <el-dialog title="选择档案历史记录" :visible.sync="dalsInfo.visible" width="1200px" append-to-body>
-      <el-form :model="dalsInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="130px">
+      <el-form :model="dalsInfo.queryParams" ref="queryFormDals" size="small" :inline="true" label-width="130px">

        <el-form-item label="图片ID" prop="id">
          <el-input