From a6fe4945669787357d41a81385ad0bffa831cbb1 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 11 Mar 2024 17:27:09 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/index/loading.png           | Bin 0 -> 3087 bytes
 src/assets/scss/pages/smartImport.scss        | 103 ++++
 src/views/modules/base/smartImport.vue        | 513 ------------------
 .../base/smartImport/cpts/completeTask.vue    |  70 +++
 .../base/smartImport/cpts/createdTask.vue     | 196 +++++++
 .../base/smartImport/cpts/executeTask.vue     |  92 ++++
 .../base/smartImport/cpts/smartImportAdd.vue  |  51 ++
 .../smartImport/cpts/smartImportDetail.vue    |  23 +
 .../base/smartImport/cpts/smartImportInfo.vue |  39 ++
 src/views/modules/base/smartImport/index.vue  | 276 ++++++++++
 10 files changed, 850 insertions(+), 513 deletions(-)
 create mode 100644 src/assets/images/index/loading.png
 create mode 100644 src/assets/scss/pages/smartImport.scss
 delete mode 100644 src/views/modules/base/smartImport.vue
 create mode 100644 src/views/modules/base/smartImport/cpts/completeTask.vue
 create mode 100644 src/views/modules/base/smartImport/cpts/createdTask.vue
 create mode 100644 src/views/modules/base/smartImport/cpts/executeTask.vue
 create mode 100644 src/views/modules/base/smartImport/cpts/smartImportAdd.vue
 create mode 100644 src/views/modules/base/smartImport/cpts/smartImportDetail.vue
 create mode 100644 src/views/modules/base/smartImport/cpts/smartImportInfo.vue
 create mode 100644 src/views/modules/base/smartImport/index.vue

diff --git a/src/assets/images/index/loading.png b/src/assets/images/index/loading.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c8e36ff249b4db070e96543bd1cc418401f7d21
GIT binary patch
literal 3087
zcmV+q4Dj=bP)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400001b5ch_0Itp)
z=>Px=$w@>(R9HvFSq+d}Rh2&HzTfVi>G?~~Ou{%pl8_k2Fak+jA()^bDf!Xp)Iu2o
z*2aZRK`m^F%SKD4q)M!%aNR1GRR|jvvaH5n0R<?QnnZ|ZF`$M(2r@usCM47Ilj-T{
z?)Tok_nh^<nGT)FWM)EPcvW3p-S6J}zWbe@d(QU|-qXbb&VSK@2FHbz>w|3zfMQic
zI?>?>-ayP5%_7tcgPN$92@a5k7Zkys$hQu|=J|sFNT>2>Je9!!EZ~N>UC0F~u!Rqx
zERaF~VdNy#8JSx5endQ16C*JI5rAe^%n%SkQ4<X?<8uh`cmeH~VBWj|=$skg83JX5
zm2Z2HQPmKk4=62gaBOY>0E`i&<ea8zCk9Hu@jd4F9xyQI7&rqlhQvHb1ivNF4~BNM
z8y@=D@N|St4|L^r8&VC`U}F`aZGn&iESDh&0l)*_2T1siwyn_1)VZHY_|})D;>J>_
zMKNMKRNyJa2?lmC-kSjnK$;Z+9%g{YNYj1c*&peeiruM!u6)afOtBU$;e#$S7y|en
z)c62%n*f&0_2JyJeQ0Z~;aV3R09||JsPO*SQ%wHp?NU?kQPr9+>b8>PbB7Al97s-E
zf-MA$8P*I%Cf-E=-wt|@JP$iosma(q8Bol0ypobBF-wE+qe$y8FX9DiY5|s??ZeuO
zYhl?!4{CjY8qYV(8bg}^(T28C2}CXoY$bgsA4J~%Lt)LP?ITOOvcZ*udEG7**9n10
z%)kU%Gwl0|n{*bF`KRIj3*<zwlLF0bc%>?etc)EBpKZiQ1*`%mXrJfthSha=@wpx}
zje(o$iam7vV>ZCuxzKyFN7vu;<lu^z4~1)U1>GhDxW<o(m^H&|%(SuC+xOH&W={m#
z(Ub6<e52zF9|(~(Vs$mZ>b9Ejmepxm)a>Il08a+~7~==~0(aa073V*)E4TjbtXwUS
ztIZ@LG+_5CqFaM4i*^E_nG;{f1O59wPQCP+1v*J4#84y7s&V+*iyZpL%g>NaHPglB
zjPA#PO91-$eZ|>#{;2=@R}TeWvINu_I3_U=(XT_v8^T8yzcFr+3ZR`Vst&%<fT-(T
zAw;B@t6dkaztEwZE}x}Z8@*$@n-QGp2N`#eJ6<g`Zv5Zu`U8j5S|K29QW+7KwB{cO
z;omj<(1+vHb&S!b>yD(TdUUoOkrRaguIIuP%WVCPtN$t>%iA!Umpk?qXaCcd>}@>*
z(Ha!!GqXuw-HPGHk%tyOYg}LqXa`#@4X-zAfoU!wN{e~PT$}!V-5mMR*7u#siCo9b
ze(&kQ#ovE+`0iYZ&a(vwO{_G*Pa|pFGWy8;Yz)+}nXD?dXr=7}Gc_j=?^x3qeevUI
z{T>5ndcz+-LLbZp)-6BGUj2u+!mn%MStb)`hIbUx-wi#u@D~UjTdjpnOPaJ})kP5i
zDBz_FQuN*H>Z8_1&+K;k)9X}Woj5*rf#+W<Hs8Ft@9rbR@)Ad&MGT=Pe7K0T5#ffn
z{6+QDY76v>0duuObnE9DqidF>)oEh03|nV&p}k>K|CKMk72ZkAbqv5nbU-p(gXi4V
zQ*T*3N1(Qgnt4Hkt?ygkSUinv9v4_o?#Z9|t!)DjWJmNO+X5tltkir5Uii;lt>jt_
zp;Ur|rB}@Nqr0wcF4c@3iKoNtm5w0y_e8ZfZaTcNXHc%OE$}pPL6g{mmvz3gNDEb6
zk`jF1(tmqFRdL<L4dH1v`!VzP_J`h0o3b5$&dRSLa1D<||1P}ZUk{zfB>m9>a5^c}
zhELaytZb`}J|Lhp901(@--lQHzN>VvDHj=#HNl(s#d{BZf>_(dfT<yEsjq&1)?j;!
zXR4ReZT7g<E|oxS+A*~FN531{JW`}Nrnn@6Azb$#y{ohWQ3`<S8l0%}s+zu*jAu%^
z4+5wG8$P=?KkuF=jy~F-S1lIC=YIije4y`A(Ap}R0x_M4ZeLy9+miXf7(E8`-<~@9
zX#a?Av4lzdT)><E>z&U43r|YTRn>NM{i@o7AD!(6!8oH6OHR`wO;(1Q|IIaZiF#tD
zpD-^r{Ugs0Eq?6xqnq=_^rjML7{c4P^j*dPsYnB)EFmvhk~nzL0&CRw{bT8=3~nNr
z>3&ajU{%ho*nAvJcWphq;!g+Vy-IVVX#kW7rf>eZe-&%akZEF=)#5Y#p3k1=4b*rZ
z8CJ^-l@~6vHXXB->{f2HlJQBbpiO$ZbK6iy_n`cm>3oPlNzJ?PTiXVf3*fVe(IEoL
zRAaW|!ql6Yv?l`q)4azWar}KUbQRQ<$5*mh`CsLFW=!RhB>?$OUsT)qlYx!>BWjI6
z@DxEoD%gT|Kara+M6_IhNJ>eNPFVRhOH+TWYj8^dAWksf$^2mAQ>U=IAB+L4bZCF9
zzmmUstu*(6Ukz<KTHr+%FiH*mQqdjw?Vt8G_-^u2%Z3Im32j@*vl{JJKef2J7s|)z
zMBB}P+2g1xgPu6AVqM>dxG4GFGs9PPW#u=u#ySROso}tAfY)H>X7=kc1Amk7>^5R@
zOioStB751A<O_AFaaJcf>Qs(9nawA2%nC-!Y`)xGY`*Uox$hhurAsUULJ^0df`@Zx
zZH$xpfBx*~nXbd1MO&mvvxNfH84dQHk1w#gYJ8u90K_pfRYuiB^B(8WWyh{C@x;0B
zj@P+dU~T%<=+$p#<u{0^ffzw)K3oWS{S(EOpT|J&dG<)E!Sz>rHlD)(jwZH!Tl6n!
zv38u<nCu_-)pt*-iGU`C_$d_9z8{Mg^2t59bAI`9={uo>b|c1V0v$<uBA1UgJo)vr
z`o<s5xOwNu{Dj~ypbfK_&_)7GCdKPZKkV*I`)&>qtdkzA6GMHn(4QQ<>EmSAKymg@
zb{D@olvkev1kb2|N^^H1(l`Cj%`HC%EH`%m@ZGIFiIxx5Tx#2}(qc>*QOl&ORKnV`
zq{aSCbG@4j0<hn&8lcSNpAX5#$6p*--<Q+Z0dU$VfQq;nO8!AuNZj?%ZFR@D%Vxt5
z?>f?$b`xK6ENllx(=d5NER(MN+mE!`+s~+V2FKk%1i^bNT8u^&1VHSA?(Qkh{@K28
zUH`CJi^z4xFEufRlC}q-`iCFh)bd7IEjhkIV#aO1%P&m&aD!#xA_R1p!B@oEv#por
z)Z#O9GJa2u52g$>Id;Z?D@C-vT;T5O(eq#F4cF&Nd^r%M*#r**OT~LfLw)P_Z)o0W
zOkVbw6H2*GX3@TTWNB4WtQP_ofB_5OY0XA^>vml0>BY^?o@(D2_I-#-B`~t5@co!!
zEHgb0%&-^h38vPJqR`7pQMYq{Va3oWUl&Pk1LI<2A}>dp4-^CSFE4Z*cxp%I@$%!O
zHD~Ac?e?<T^Oq+a@fAy8n@KRl;1RP!#05aH-*@1bEp@mzowP<Q#|>SEh#7Pu5rYCF
zJDLEDB5<{cyzGdm*?X{fK|Z7_0?8lK%4kg>jO-XkxPpC!NOfk18=t=aMx2@KXdbk6
zD_hBV#rBjBUvUI{0ukz%&BEX+qjLk6gn)iUu#cJdTNZTJC+vZ`DlP)p&_5a`2Xl}a
zjnrJFp^ZVbmm+FXnrndBGX5BA{6r>jb_J5}mi4oq>s*DWB;>}f(b>u3!j7QDX0^_B
z#FfbKAwZELVoL+ttQi$^L`K7BkO-^*g|Q+?&6bpGE6uKAPBMYZae>ArszGT`iuiCK
z`LTRa->3Iwx;m$L@i3!y<C)!qY1enp_gt~ovBX7$m_eo#F&l<0O;COd!UhB}n|^#u
z#T}EsV;NkL(e5EsOhb``U89m7q>|Wu+vmqp&{WrqfX3`Hi%-4|^$-@?ElXTw+i(#u
z%qGATGaCiYj)P(hR192?zrNALf!0t|1OuU>=fY4wF17no-(^(;o%p`KzIk`A#vML+
zZN9#kSF;`0J>NoHZXutIh^+|F@RyecuJJ!6iXzQJQbCW@e4r%t3!0rh8u)Pcud4>9
dGV^52{y*irg`9mdA3Fd5002ovPDHLkV1m&r04V?f

literal 0
HcmV?d00001

diff --git a/src/assets/scss/pages/smartImport.scss b/src/assets/scss/pages/smartImport.scss
new file mode 100644
index 000000000..b8863eb9f
--- /dev/null
+++ b/src/assets/scss/pages/smartImport.scss
@@ -0,0 +1,103 @@
+.m-detail-main {
+    padding: 20px 20px 0;
+    .title-small{
+        position: relative;
+        &::after{
+            content: '';
+            width: 4px;
+            height: 16px;
+            background-color: #0056d6;
+            position: absolute;
+            left: -20px;
+            top: 0px;
+        }
+    }
+  }
+
+  .content_box{
+    display: flex;
+    .left{
+        width: 50%;
+        .rotate{
+             animation: rotate 5s infinite linear;
+        }
+        .u-item-width-normal{
+            width: 240px; 
+         }
+         .text-center{
+            border: 1px #c5c9d1 dashed ;
+            width: calc( 100% - 20px);
+            height: 175px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            .el-upload__text{
+                color: #c5c9d1;
+            }
+         }
+    }
+    .right{
+        padding: 15px;
+        width: 50%;
+        background: #f5f7fa;
+        border-radius: 3px;
+        h4{
+            margin-top: 0;
+            line-height: 19px;
+        }
+        .textBtn{
+            padding: 0px;
+            margin: 0 5px;     
+        }
+    }
+   
+  }
+  .steps {
+    width: 80%;
+    /deep/ .el-step__main {
+      position: absolute;
+      left: 24px;
+      top: -5px;
+      z-index: 10;
+      background: #fff;
+      width: 100px;
+      padding-left: 10px;
+    }
+    /deep/ .is-finish {
+      .el-step__icon {
+        background: #0056d6;
+        color: #fff;
+      }
+    }
+    /deep/ .is-process  {
+        color: #000;
+        font-weight: 400;
+        .el-step__icon {
+          background: #cbcbcb;
+          color: #fff;
+          border-color: #cbcbcb;
+        }
+      }
+      /deep/ .is-wait  {
+        color: #000;
+        .el-step__icon {
+          background: #cbcbcb;
+          color: #fff;
+          border-color: #cbcbcb;
+        }
+      }
+      /deep/ .el-step__description{
+        width: 300px;
+        color: #cbcbcb;
+      }
+      
+  }
+  @keyframes rotate {
+    from {
+      transform: rotate(0deg);
+    }
+    to {
+      transform: rotate(-360deg);
+    }
+  }
+  
\ No newline at end of file
diff --git a/src/views/modules/base/smartImport.vue b/src/views/modules/base/smartImport.vue
deleted file mode 100644
index bc0d46232..000000000
--- a/src/views/modules/base/smartImport.vue
+++ /dev/null
@@ -1,513 +0,0 @@
-<template>
-  <div class="g-main">
-    <div class="m-table">
-      <div class="u-table-btn1">
-        <el-dropdown size="small"
-                     type="primary"
-                     style="margin: 0 10px; height: 30px"
-                     trigger="hover">
-          <el-button type="primary"
-                     size="small">
-            表格导入<i class="el-icon-arrow-down el-icon--right"></i>
-          </el-button>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item v-for="(item, index) in resiClass"
-                              :key="index"
-                              @click.native="handleImportType(item.value)">
-              {{ item.label }}
-            </el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
-        <el-upload :headers="$getElUploadHeaders()"
-                   ref="upload"
-                   class="upload-btn"
-                   action="uploadUlr"
-                   :limit="1"
-                   :accept="'.xls,.xlsx'"
-                   :with-credentials="true"
-                   :show-file-list="false"
-                   :auto-upload="true"
-                   :on-progress="handleProgress"
-                   :on-success="handleExcelSuccess"
-                   :before-upload="beforeExcelUpload"
-                   :http-request="uploadHttpRequest"></el-upload>
-        <el-button class="diy-button--white"
-                   size="small"
-                   style="margin-left: 10px"
-                   @click="handleExportModule()">下载模板</el-button>
-      </div>
-      <div v-if="dataList.length > 0">
-        <el-table ref="ref_table"
-                  :data="dataList"
-                  border
-                  :height="tableHeight"
-                  class="m-table-item"
-                  v-loading="dataListLoading"
-                  style="width: 100%">
-          <el-table-column label="序号"
-                           header-align="center"
-                           align="center"
-                           type="index"
-                           width="100"></el-table-column>
-          <el-table-column prop="userTableHeader"
-                           header-align="center"
-                           align="center"
-                           label="表格信息"
-                           min-width="100">
-            <template slot-scope="scope">
-              {{ scope.row.userTableHeader || "--" }}
-            </template>
-          </el-table-column>
-
-          <el-table-column prop="itemGroupId"
-                           header-align="center"
-                           align="center"
-                           label="平台对应信息"
-                           min-width="110">
-            <template slot-scope="scope">
-              <div>
-                <el-select class="item_width_sel"
-                           v-model="scope.row.itemGroupId"
-                           size="small"
-                           placeholder="请选择">
-                  <el-option v-for="item in groupList"
-                             @click.native="handleSelGroup(scope.$index, item, 'change')"
-                             :key="item.value"
-                             :label="item.label"
-                             :value="item.label">
-                  </el-option>
-                </el-select>
-
-                <el-select class="item_width_sel"
-                           v-model="scope.row.itemId"
-                           size="small"
-                           style="margin-left: 10px"
-                           placeholder="请选择">
-                  <el-option v-for="item in scope.row.itemList"
-                             :key="item.itemId"
-                             :label="item.label"
-                             :value="item.label">
-                  </el-option>
-                </el-select>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <div ref="divEditBtn"
-             class="m-edit-btn">
-          <el-button type="primary"
-                     size="small"
-                     class="diy-button--blue"
-                     @click="handleComfirm">保 存</el-button>
-        </div>
-      </div>
-      <div class="m-hint"
-           v-else>请先导入表格</div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { requestPost } from "@/js/dai/request";
-import { mapGetters } from "vuex";
-
-export default {
-  data () {
-    return {
-      customerId: "", // 客户id，父组件传
-      customerName: "", // 客户名称，父组件传
-
-      tableParams: {
-        customerId: "",
-      },
-      search: "",
-      dataList: [],
-      dataListLoading: false,
-      total: 0,
-      pageSize:window.localStorage.getItem('pageSize') || 20,
-      pageNo: 0,
-
-      formShow: false,
-      formData: {},
-
-      scopeList: [],
-      dataSyncConfigId: "",
-      importLoading: false,
-
-      groupList: [],
-      sHeight: 100,
-
-      importCode: "",
-      importOption: { exist: {}, notExist: {} },
-
-      fileData: null,
-      resiClass: [],
-
-      importType: "",
-    };
-  },
-
-  computed: {
-    tableHeight () {
-      const h = this.clientHeight - this.sHeight + this.iframeHeigh;
-      const _h = this.clientHeight - this.sHeight;
-      return this.$store.state.inIframe ? h : _h;
-    },
-
-    ...mapGetters(["clientHeight", "iframeHeight"]),
-  },
-  components: {},
-  created () { },
-  watch: {
-    //监听dataList有数据才再让他给高度 解决报找不到dom节点错误
-    "dataList.length": {
-      immediate: true,
-      handler (newVal) {
-        this.$nextTick(() => {
-          if (newVal > 0) {
-            this.sHeight = this.$refs.divEditBtn.offsetHeight + 300;
-          }
-        });
-      },
-    },
-  },
-  async mounted () {
-    await this.loadPersonGroup();
-    this.getResident();
-  },
-  methods: {
-    diaClose () {
-      this.formShow = false;
-    },
-    handleDropdownClick (event) {
-      event.stopPropagation();
-    },
-    async loadPersonGroup () {
-      const url = "/oper/customize/icformitemgroup/list";
-      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-      let params = {
-        formCode: "resident_base_info",
-        policyFlag: "1",
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.groupList = data;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    //选择人员信息第一列下拉框
-    async handleSelGroup (index, item, change) {
-      console.log(index, item, change);
-      const url = "/oper/customize/icformitem/getItemListV2";
-      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-      let params = {
-        // policyFlag: "1",
-        groupId: item.id,
-      };
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        let oneData = this.dataList[index];
-        if (change == "change") {
-          this.dataList[index].itemId = "";
-        }
-        oneData.itemList = data;
-        this.$set(this.dataList, index, oneData);
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    // 加载列表数据
-    async loadData () {
-      this.dataListLoading = true;
-      // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/dataSyncConfig/list'
-      const url = "/epmetuser/dataSyncConfig/list";
-
-      this.tableParams = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
-      };
-
-      const { data, code, msg } = await requestPost(url, this.tableParams);
-      this.dataListLoading = false;
-      if (code === 0) {
-        this.total = data.total;
-        this.dataList = data.list;
-        this.dataList.forEach((element) => {
-          element.stateShow = element.switchStatus === "open" ? true : false;
-        });
-      } else {
-        // this.$message.error(msg )
-      }
-    },
-    handleImportType (command) {
-      this.importType = command;
-      this.$refs["upload"].$children[0].$refs.input.click();
-    },
-    handleChangeScope (value) {
-      this.orgIdArray = value;
-      this.scopeList = [];
-      let selArray = this.$refs["myCascader"].getCheckedNodes();
-      // console.log('selArray', selArray)
-
-      selArray.forEach((element, index) => {
-        let obj = {
-          orgId: element.data.agencyId,
-          orgType: element.data.level,
-          orgIdPath: element.path.join(":"),
-        };
-        this.scopeList.push(obj);
-      });
-
-      console.log("this.scopeList", this.scopeList);
-    },
-    async getResident () {
-      try {
-        const { data } = await this.$http.post("sys/dict/data/dictlist", {
-          dictType: "resident_category_import",
-        });
-        this.resiClass = data.data;
-      } catch (error) {
-        console.log(error, "获取居民类别字典");
-      }
-    },
-    async handleExportModule () {
-      let url = "/actual/base/residentBaseInfo/import/download-template";
-
-      let params = {};
-      await this.$http({
-        method: "POST",
-        url,
-        responseType: "blob",
-        data: params,
-      })
-        .then((res) => {
-          const url = window.URL.createObjectURL(new Blob([res.data]));
-          const aLink = document.createElement("a");
-          aLink.style.display = "none";
-          aLink.href = url;
-          aLink.setAttribute("download", "人员导入模板.zip");
-          document.body.appendChild(aLink);
-          aLink.click();
-          document.body.removeChild(aLink);
-          window.URL.revokeObjectURL(url);
-          // // this.download(res.data, title + '.xls')
-          // if (res.headers["content-disposition"]) {
-          // 	let fileName = window.decodeURI(
-          // 		res.headers["content-disposition"]
-          // 			.split(";")[1]
-          // 			.split("=")[1]
-          // 	);
-          // 	console.log("filename", fileName);
-          // 	let blob = new Blob([res.data], {
-          // 		type: "application/vnd.ms-excel",
-          // 	});
-          // 	var url = window.URL.createObjectURL(blob);
-          // 	var aLink = document.createElement("a");
-          // 	aLink.style.display = "none";
-          // 	aLink.href = url;
-          // 	aLink.setAttribute("download", fileName);
-          // 	document.body.appendChild(aLink);
-          // 	aLink.click();
-          // 	document.body.removeChild(aLink); //下载完成移除元素
-          // 	window.URL.revokeObjectURL(url); //释放掉blob对象
-          // } else this.$message.error("下载失败");
-        })
-        .catch((err) => {
-          console.log("err", err);
-          return this.$message.error("网络错误");
-        });
-    },
-    // 上传大图标成功
-    handleExcelSuccess (res, file) {
-      console.log(res, file);
-      if (!res) return;
-      if (res.code === 0 && res.msg === "success") {
-        console.log("resss---ppp", res);
-      } else {
-        this.$message.error(res.msg);
-      }
-    },
-    handleProgress (event, file, fileList) {
-      console.log("percentage", file.percentage);
-    },
-
-    beforeExcelUpload (file) {
-      console.log("file", file);
-      console.log(this.importType);
-
-      const isType = file.type === "application/vnd.ms-excel";
-      const isTypeComputer =
-        file.type ===
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-      const fileType = isType || isTypeComputer;
-      const isLt1M = file.size / 1024 / 1024 < 10;
-      if (!fileType) {
-        this.$message.error("上传文件只能是xls/xlsx格式！");
-      }
-
-      if (!isLt1M) {
-        this.$message.error("上传文件大小不能超过 10MB!");
-      }
-
-      if (!this.importType) {
-        this.$message.error("请选择导入的类别");
-      }
-      return fileType && isLt1M;
-    },
-    async uploadHttpRequest (file) {
-      if (!this.importType) return;
-      this.importLoading = true;
-      this.importBtnTitle = "正在上传中...";
-      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-      formData.append("file", file.file); //添加文件对象
-      formData.append("fileMode", this.importType); //添加文件对象
-      // http://127.0.0.1:4523/mock2/2515967/97869993
-      await this.$http
-        .post("/actual/base/importExcelData/extractExcelHead", formData)
-        .then((res) => {
-          console.log("res-up", res);
-          if (res.data.code == 0) {
-            const { metaListData, fileCode, msg } = res.data.data;
-            this.afterSuccess();
-            this.dataList = metaListData;
-            // 相等于在for循环中写filter过滤,这样写能够以 O(1) 的时间复杂度获取 itemGroupId 匹配的元素。
-            let groupMap = new Map(
-              this.groupList.map((item) => [item.label, item])
-            );
-            for (let i in this.dataList) {
-              this.handleSelGroup(
-                i,
-                groupMap.get(this.dataList[i].itemGroupId)
-              );
-            }
-            this.importCode = fileCode;
-            this.fileData = file;
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        })
-        .catch((err) => {
-          console.log("失败", err);
-          file.onError(); //上传失败的文件会从文件列表中删除
-          this.$message.error("导入失败");
-        });
-      this.importLoading = false;
-      this.importBtnTitle = "导入";
-      this.$refs.upload.clearFiles();
-    },
-
-    async handleComfirm () {
-      this.importLoading = true;
-      this.importBtnTitle = "正在上传中...";
-      const { importOption, importCode, dataList } = this;
-      let obj = dataList.reduce((acc, item) => {
-        if (item.userTableHeader) {
-          acc[item.userTableHeader] = item.itemId;
-        }
-        return acc;
-      }, {});
-      const formData = new FormData();
-      formData.append("columnMateJson", JSON.stringify(obj));
-      formData.append("fileCode", importCode);
-      await this.$http
-        .post("/actual/base/importExcelData/importResiHouseExcel", formData)
-        .then((res) => {
-          console.log("res-up", res);
-          if (res.data.code == 0 && res.data.msg == "success") {
-            // this.upload2(this.fileData, this.importCode);
-            this.afterSuccess();
-          } else this.$message.error(res.data.msg);
-        })
-        .catch((err) => {
-          console.log("失败", err);
-          file.onError(); //上传失败的文件会从文件列表中删除
-          // this.$message.error('导入失败')
-        });
-      this.importLoading = false;
-      this.importBtnTitle = "导入";
-    },
-
-    async upload2 (file, code) {
-      this.importLoading = true;
-      this.importBtnTitle = "正在上传中...";
-      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-      formData.append("file", file.file); //添加文件对象
-      formData.append("code", code); //添加文件对象
-      await this.$http
-        .post("/actual/base/residentBaseInfo/importExcel", formData)
-        .then((res) => {
-          console.log("res-up", res);
-          if (res.data.code == 0 && res.data.msg == "success") {
-            this.afterSuccess();
-          } else this.$message.error(res.data.msg);
-        })
-        .catch((err) => {
-          console.log("失败", err);
-          file.onError(); //上传失败的文件会从文件列表中删除
-          // this.$message.error('导入失败')
-        });
-      this.importLoading = false;
-      this.importBtnTitle = "导入";
-      this.$refs.upload.clearFiles();
-    },
-
-    afterSuccess () {
-      this.$message({
-        showClose: true,
-        dangerouslyUseHTMLString: true,
-        message:
-          "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-        duration: 3000,
-      });
-      let than = this;
-      document.getElementById("clickA").addEventListener("click", function () {
-        than.$router.push("/main/importRecord-index");
-      });
-      this.dataList = [];
-      this.importOption = {};
-      this.importCode = "";
-      this.fileData = null;
-    },
-
-    // 取消
-    diaCancel () {
-      this.$emit("cancleBack");
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "@/assets/scss/modules/management/list-main.scss";
-
-.m-edit-btn {
-  display: flex;
-  margin-top: 20px;
-  margin-right: 16px;
-  justify-content: flex-end;
-  text-align: center;
-}
-
-.item_width_sel {
-  width: 200px;
-}
-
-.m-hint {
-  font-size: 50px;
-  line-height: 300px;
-  text-align: center;
-  color: #aaaaaa;
-}
-::v-deep .upload-btn {
-  .el-button {
-    padding: 7px 20px;
-  }
-}
-</style>
diff --git a/src/views/modules/base/smartImport/cpts/completeTask.vue b/src/views/modules/base/smartImport/cpts/completeTask.vue
new file mode 100644
index 000000000..fdc34df62
--- /dev/null
+++ b/src/views/modules/base/smartImport/cpts/completeTask.vue
@@ -0,0 +1,70 @@
+<template>
+  <div class="">
+    <div class="content_box">
+      <div class="left">
+        <i class="el-icon-success" style="font-size: 50px; color: #1cc58c;"></i>
+        <p>导入完成</p>
+      </div>
+      <div class="right">
+        <h4>
+          <el-icon
+            class="el-icon-warning-outline"
+            style="color: #0056d6; font-size: 18px; font-weight: 600"
+          ></el-icon>
+          操作说明
+        </h4>
+        <p>1、可以到居民信息中查看本次导入的数据。</p>
+        <p>2、导入失效的数据,您可以下载失败文件修改后,重新创建任务导入。</p>
+      </div>
+    </div>
+    <h3 class="title-small">数据导入明细</h3>
+  </div>
+</template>
+      <script>
+import { requestPost } from "@/js/dai/request";
+export default {
+  data() {
+    return {
+      form: {
+        importCategory: null,
+        taskName: null,
+      },
+      rules: {
+        importCategory: [
+          { required: true, message: "请选择任务类型", trigger: "change" },
+        ],
+        taskName: [
+          { required: true, message: "请输入任务名称", trigger: "change" },
+        ],
+      },
+      resident_category_import_list: [],
+    };
+  },
+  props: {},
+  created() {},
+  methods: {
+    handelClickUpload() {
+      this.$emit("handelClickUpload");
+    },
+    handelClickBack() {
+      //   this.$emit("handelClickBack");
+    },
+  },
+  components: {},
+  computed: {},
+  watch: {},
+};
+</script>
+      <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
+@import "@/assets/scss/pages/smartImport.scss";
+.left {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  color: #838383;
+}
+</style>
+      
\ No newline at end of file
diff --git a/src/views/modules/base/smartImport/cpts/createdTask.vue b/src/views/modules/base/smartImport/cpts/createdTask.vue
new file mode 100644
index 000000000..c49cb6233
--- /dev/null
+++ b/src/views/modules/base/smartImport/cpts/createdTask.vue
@@ -0,0 +1,196 @@
+<template>
+  <div class="">
+    <h3 class="title-small">基本信息</h3>
+    <div class="content_box">
+      <div class="left">
+        <el-form :model="form" :rules="rules" ref="importForm">
+          <el-form-item label="任务类型" prop="importCategory">
+            <el-select
+              v-model="form.importCategory"
+              placeholder="请选择"
+              size="small"
+              class="u-item-width-normal"
+            >
+              <el-option
+                v-for="item in resident_category_import_list"
+                :label="item.label"
+                :value="item.value"
+                clearable
+                :key="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="下载模板" prop="desc">
+            <span
+              >导入模板.xlsx <el-button type="text">点击下载</el-button></span
+            >
+          </el-form-item>
+          <el-form-item label="任务名称" prop="taskName">
+            <el-input
+              v-model="form.taskName"
+              size="small"
+              class="u-item-width-normal"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="right">
+        <h4>
+          <el-icon
+            class="el-icon-warning-outline"
+            style="color: #0056d6; font-size: 18px; font-weight: 600"
+          ></el-icon>
+          操作说明
+        </h4>
+        <p>
+          1、导入数据前请先确定您的网格组织已经维护完毕。<el-button
+            class="textBtn"
+            type="text"
+            >查看</el-button
+          >
+        </p>
+        <p>2、导入房屋和居民信息前请先确保已经导入了完整的小区楼栋信息。</p>
+        <p>
+          3、您也可以<el-button class="textBtn" type="text"
+            >点击这里下载</el-button
+          >全部的导入模板文件
+        </p>
+      </div>
+    </div>
+    <h3 class="title-small">上传数据</h3>
+    <div class="content_box">
+      <div class="left">
+        <el-upload
+          :headers="$getElUploadHeaders()"
+          name="processFile"
+          :action="url"
+          :show-file-list="false"
+          :on-progress="handleProgress"
+          :before-upload="beforeUploadHandle"
+          :on-success="successHandle"
+          :http-request="uploadHttpRequest"
+          class="text-center"
+        >
+          <i class="el-icon-upload" style="font-size: 58px; color: #c5c9d1"></i>
+          <div class="el-upload__text" v-html="$t('upload.text')"></div>
+        </el-upload>
+      </div>
+      <div class="right">
+        <p>4、上传按导入模板整理后的excel数据文件。</p>
+        <p>5、文件大小不超过50M。</p>
+      </div>
+    </div>
+    <el-row type="flex" style="margin-top: 15px">
+      <el-col :span="12" align="center">
+        <el-button
+          style="margin-left: 10px"
+          size="small"
+          class="diy-button--white"
+          plain
+          @click="handelClickBack"
+          >取消</el-button
+        >
+        <el-button class="diy-button--add" size="small" type="primary" @click="handelClickUpload">
+          开始导入</el-button
+        >
+      </el-col>
+    </el-row>
+  </div>
+</template>
+  <script>
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  data() {
+    return {
+      form: {
+        importCategory: null,
+        taskName: null,
+      },
+      rules: {
+        importCategory: [
+          { required: true, message: "请选择任务类型", trigger: "change" },
+        ],
+        taskName: [
+          { required: true, message: "请输入任务名称", trigger: "change" },
+        ],
+      },
+      resident_category_import_list: [],
+    };
+  },
+  props: {},
+  created() {
+    this.getDictList();
+  },
+  methods: {
+    async uploadHttpRequest (file) {
+      if (!this.importType) return;
+      this.importLoading = true;
+      this.importBtnTitle = "正在上传中...";
+      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append("file", file.file); //添加文件对象
+      formData.append("fileMode", this.importType); //添加文件对象
+      // http://127.0.0.1:4523/mock2/2515967/97869993
+      await this.$http
+        .post("/actual/base/importExcelData/extractExcelHead", formData)
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0) {
+            const { metaListData, fileCode, msg } = res.data.data;
+            this.afterSuccess();
+            this.dataList = metaListData;
+            // 相等于在for循环中写filter过滤,这样写能够以 O(1) 的时间复杂度获取 itemGroupId 匹配的元素。
+            let groupMap = new Map(
+              this.groupList.map((item) => [item.label, item])
+            );
+            for (let i in this.dataList) {
+              this.handleSelGroup(
+                i,
+                groupMap.get(this.dataList[i].itemGroupId)
+              );
+            }
+            this.importCode = fileCode;
+            this.fileData = file;
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          this.$message.error("导入失败");
+        });
+      this.importLoading = false;
+      this.importBtnTitle = "导入";
+      this.$refs.upload.clearFiles();
+    },
+    async getDictList() {
+      const url = "/sys/dict/data/dictlist";
+      const { data, code, msg } = await requestPost(url, {
+        dictType: "resident_category_import",
+      });
+      if (code === 0) {
+        this.resident_category_import_list = [...data];
+      } else {
+        this.$message.err("字典错误");
+      }
+    },
+    handelClickUpload(){
+        this.$emit('handelClickUpload')
+    },
+    handelClickBack(){
+        this.$emit('handelClickBack')
+    }
+  },
+  components: {},
+  computed: {},
+  watch: {},
+};
+</script>
+  <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
+@import "@/assets/scss/pages/smartImport.scss";
+</style>
+  
\ No newline at end of file
diff --git a/src/views/modules/base/smartImport/cpts/executeTask.vue b/src/views/modules/base/smartImport/cpts/executeTask.vue
new file mode 100644
index 000000000..030144c8a
--- /dev/null
+++ b/src/views/modules/base/smartImport/cpts/executeTask.vue
@@ -0,0 +1,92 @@
+<template>
+  <div class="">
+    <div class="content_box">
+      <div class="left">
+        <img class="rotate" src="@/assets/images/index/loading.png" alt="" />
+        <p>请您耐心等待！如果您发现导入数据问题较多，可以取消导入</p>
+        <el-button
+          style="margin-left: 10px"
+          size="small"
+          class="diy-button--white"
+          plain
+          @click="handelClickBack"
+          >取消导入</el-button
+        >
+      </div>
+      <div class="right">
+        <h4>
+          <el-icon
+            class="el-icon-warning-outline"
+            style="color: #0056d6; font-size: 18px; font-weight: 600"
+          ></el-icon>
+          操作说明
+        </h4>
+        <p>1、导入数据多大，系统需要一定事件处理。</p>
+        <p>
+          2、导入过程中可查看导入明细，如果发现导入数据问题较多，可以取消本次导入，重新整理数据后，重新创建任务导入。
+        </p>
+        <p>3、导入失败的数据，您可以下载失败文件，修改后重新创建任务导入</p>
+      </div>
+    </div>
+    <h3 class="title-small">数据导入明细</h3>
+  </div>
+</template>
+    <script>
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  data() {
+    return {
+      form: {
+        importCategory: null,
+        taskName: null,
+      },
+      rules: {
+        importCategory: [
+          { required: true, message: "请选择任务类型", trigger: "change" },
+        ],
+        taskName: [
+          { required: true, message: "请输入任务名称", trigger: "change" },
+        ],
+      },
+      resident_category_import_list: [],
+    };
+  },
+  props: {},
+  created() {
+  },
+  methods: {
+ 
+    handelClickUpload() {
+      this.$emit("handelClickUpload");
+    },
+    handelClickBack() {
+        this.$confirm(`您确定要取消本次数据导入任务吗`, {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '再想想',
+                    type: 'warning'
+                }).then(() => {
+                    this.$emit("handelClickBack");
+                }).catch(() => {
+                    
+                });
+    },
+  },
+  components: {},
+  computed: {},
+  watch: {},
+};
+</script>
+    <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
+@import "@/assets/scss/pages/smartImport.scss";
+.left {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  color: #838383;
+}
+</style>
+    
\ No newline at end of file
diff --git a/src/views/modules/base/smartImport/cpts/smartImportAdd.vue b/src/views/modules/base/smartImport/cpts/smartImportAdd.vue
new file mode 100644
index 000000000..38d965da2
--- /dev/null
+++ b/src/views/modules/base/smartImport/cpts/smartImportAdd.vue
@@ -0,0 +1,51 @@
+<template>
+  <div class="m-detail-main">
+    <el-card>
+      <div class="steps">
+        <el-steps :active="progress" >
+            <!-- description="这是一段很长很长很长的描述性文字" -->
+          <el-step  title="创建任务" ></el-step>
+          <el-step title="正在导入"></el-step>
+          <el-step title="导入完成"></el-step>
+        </el-steps>
+      </div>
+      <div style="margin-top: 37px;">
+        <created-task v-if="progress == 1" @handelClickUpload="handelClickUpload" @handelClickBack="handelClickBack"></created-task>
+        <execute-task v-if="progress == 2"@handelClickBack="handelClickBack"></execute-task>
+        <complete-task v-if="progress == 3"@handelClickBack="handelClickBack"></complete-task>
+      </div>
+    </el-card>
+  </div>
+</template>
+  <script>
+import createdTask from './createdTask.vue'
+import executeTask from './executeTask.vue'
+import completeTask from './completeTask.vue'
+export default {
+  data() {
+    return {
+      progress:1,
+    };
+  },
+  props: {},
+  created() {
+  },
+  methods: {
+    handelClickUpload(){
+        this.progress = 2;
+    },
+    handelClickBack(){
+        this.$emit('handleClose');
+    },
+  },
+  components: {createdTask,executeTask,completeTask},
+  computed: {},
+  watch: {},
+};
+</script>
+  <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
+@import "@/assets/scss/pages/smartImport.scss";
+</style>
+  
\ No newline at end of file
diff --git a/src/views/modules/base/smartImport/cpts/smartImportDetail.vue b/src/views/modules/base/smartImport/cpts/smartImportDetail.vue
new file mode 100644
index 000000000..75baf8593
--- /dev/null
+++ b/src/views/modules/base/smartImport/cpts/smartImportDetail.vue
@@ -0,0 +1,23 @@
+<template>
+    <div class="">
+     detail
+    </div>
+  </template>
+  <script>
+  
+  export default {
+    data() {
+      return {};
+    },
+    props: {
+    },
+    created() {},
+    methods: {},
+    components: {},
+    computed: {},
+    watch: {},
+  };
+  </script>
+  <style lang="scss" scoped>
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/modules/base/smartImport/cpts/smartImportInfo.vue b/src/views/modules/base/smartImport/cpts/smartImportInfo.vue
new file mode 100644
index 000000000..a864362ac
--- /dev/null
+++ b/src/views/modules/base/smartImport/cpts/smartImportInfo.vue
@@ -0,0 +1,39 @@
+<template>
+  <div class="">
+    <div v-if="pageType == 'add'">
+        <smart-import-add @handleClose="handleClose" @handelClickCloseUpload="handelClickCloseUpload"></smart-import-add>
+    </div>
+    <div v-if="pageType == 'detail'">
+        <smart-import-detail></smart-import-detail>
+    </div>
+  </div>
+</template>
+<script>
+import smartImportAdd from "./smartImportAdd";
+import smartImportDetail from "./smartImportDetail";
+
+export default {
+  data() {
+    return {};
+  },
+  props: {
+    pageType: String,
+    default: "",
+  },
+  created() {},
+  methods: {
+    handleClose(){
+      this.$emit("handleClose");
+    },
+    handelClickCloseUpload(){
+      this.$emit("handelClickCloseUpload");
+    },
+  },
+  components: {smartImportAdd,smartImportDetail},
+  computed: {},
+  watch: {},
+};
+</script>
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/modules/base/smartImport/index.vue b/src/views/modules/base/smartImport/index.vue
new file mode 100644
index 000000000..d04815a3c
--- /dev/null
+++ b/src/views/modules/base/smartImport/index.vue
@@ -0,0 +1,276 @@
+<template>
+  <div class="g-main">
+    <div  v-show="pageType == 'list'">
+      <div class="m-search">
+        <el-form  :inline="true" :model="formData"  :label-width="'100px'">
+        <el-form-item label="任务类型">
+            <el-select v-model="formData.importCategory" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
+              <el-option v-for="item in dicts.resident_category_import" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="状态">
+            <el-select v-model="formData.processStatus" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
+              <el-option v-for="item in dicts.import_status" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="任务名称">
+            <el-input v-model="formData.taskName" placeholder="请输入" size="small" class="u-item-width-normal"
+              clearable></el-input>
+          </el-form-item>
+          <el-row type="flex">
+            <el-col :span="24" align="right">
+              <el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearch">查询</el-button>
+              <el-button style="margin-left: 10px" is-plain class="diy-button--white el-button--default" size="small"
+                @click="resetSearch">重置</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+
+      <div class="m-table">
+        <div class="div_btn">
+          <el-button size="small" @click="handleAdd" type="primary" icon="el-icon-plus">新建导入任务</el-button>
+        </div>
+
+        <el-table :data="tableData" border v-loading="tableLoading" class="m-table-item" style="width: 100%"
+          :height="maxTableHeight">
+          <el-table-column type="selection" fixed="left" align="center" width="50" />
+          <el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+
+          <el-table-column prop="originFileName" align="center"  label="任务名称" :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="importCategory" align="center" width="100" label="任务类型" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{
+                scope.row.importCategory
+                ? scope.row.importCategory == "1"
+                  ? "导入房屋信息"
+                  : scope.row.importCategory == "2"
+                    ? "导入居民信息"
+                    : "--"
+                : "--"
+              }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="processStatus" align="center" width="200" label="状态" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ binaryText(scope.row.processStatus) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="importSuccessNum" align="center" width="80" label="成功数目" :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="importFailNum" align="center" width="80" label="失败数目" :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="createdByName" align="center" width="100" label="操作人" :show-overflow-tooltip="true"> 
+          </el-table-column>
+          <el-table-column prop="completedTime" align="center" width="180" label="操作完成时间"
+            :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column fixed="right" label="操作" align="center" width="220">
+            <template slot-scope="scope">
+              <el-button @click="handleCloseImport(scope.row)" v-if="scope.row.importCategory === 'processing'" type="text" size="small">取消导入</el-button>
+              <!-- <el-button @click="handleCloseCheck(scope.row)"  v-if="scope.row.importCategory === 'processing'" type="text" size="small">确认完成</el-button> -->
+              <el-button @click="handleDetail(scope.row)" type="text" size="small">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div>
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
+            :page-sizes="[20, 50, 100, 200]" :page-size="parseInt(pageSize)" layout="sizes, prev, pager, next, total"
+            :total="total">
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+    <div v-if=" pageType == 'detail' || pageType == 'add'">
+      <!-- :eventDetailData="eventDetailData" -->
+            <smart-import-info ref="eleEditForm" :pageType="pageType"  
+                @handleClose="handleClose" @handleOk="handleOk"/>
+        </div>
+  </div>
+</template>
+  
+<script>
+import { requestPost } from "@/js/dai/request";
+import { genderList, binaryOptionList } from "@/js/columns/constants";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import axios from "axios";
+import smartImportInfo from "./cpts/smartImportInfo";
+export default {
+  components: {smartImportInfo},
+
+  data() {
+    return {
+      tableLoading: false,
+      searchH: 170,
+      tableData: [],
+      genderList,
+      binaryOptionList,
+      formData: {},
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+      pageType: "add", // 列表list 新增add  详情detail
+
+      dicts: {
+        import_status:[],
+        resident_category_import:[],
+      
+      }, //字典对象
+    };
+  },
+  computed: {
+    maxTableHeight() {
+      const h = this.clientHeight - this.searchH - 330 + this.iframeHeight;
+      const _h = this.clientHeight - 330 - this.searchH;
+      return this.$store.state.inIframe ? h : _h;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
+  watch: {},
+  async created() {
+    await this.getDicts();
+  },
+  mounted() {
+    this.getTableData();
+  },
+  methods: {
+    // --------------------------------------字典------------------------------------------
+    async getDicts() {
+      try {
+        const dictTypes = ["import_status", 'resident_category_import']; // 把所有dictType放在这个数组里
+        const requests = dictTypes.map((dictType) => {
+          return this.$http.post("sys/dict/data/dictlist", {
+            dictType: dictType,
+          });
+        });
+        const results = await Promise.all(requests);
+        results.forEach((result, index) => {
+          if (result.data.code === 0) {
+            this.dicts[dictTypes[index]].push(...result.data.data);
+          } else {
+            console.log(`获取${dictTypes[index]}字典失败: ${result.msg}`);
+          }
+        });
+      } catch (error) {
+        console.log("获取字典失败: ", error);
+      }
+    },
+    binaryText(value) {
+      let text = "";
+      let foundItem = this.dicts.import_status.filter(
+        (item) => item.value == value
+      )[0];
+      text = foundItem ? foundItem.label : "--";
+      return text;
+    },
+    // ------------------------------------事件------------------------------------------
+    // 搜索事件
+    handleSearch(val) {
+      console.log(this.formData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+
+    //   调出新增组件
+    async handleAdd() {
+      this.pageType = "add";
+    },
+    //   查看详情触发事件
+    async handleDetail(row) {
+      this.pageType = "detail";
+    },
+   
+    //  新增弹出框组件取消事件
+    handleClose() {
+      this.pageType = "list";
+     
+    },
+    //  新增弹出框组件确定事件
+    handleOk(type) {
+     
+    },
+    //   删除触发事件
+    async handleDel(row) {
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.cancelFuwu([row.categorizedResiId]);
+        })
+        .catch((err) => {
+          if (err == "cancel") {
+            // this.$message({
+            //   type: "info",
+            //   message: "已取消删除"
+            // });
+          }
+        });
+    },
+    //   删除处理
+    async cancelFuwu(id) {
+      const url = "/actual/base/resiCategorized/disability/deleteBatch";
+      const { data, code, msg } = await requestPost(url, id);
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.getTableData();
+      } else {
+        this.$message.error("操作失败！");
+      }
+    },
+    //   获取列表
+    async getTableData() {
+      this.tableLoading = true;
+      const url = "/commonservice/import-task/page";
+      const { pageSize, pageNo, formData } = this;
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...formData,
+      });
+      this.tableLoading = false;
+      if (code === 0) {
+        this.total = data.total || 0;
+        this.tableData = data.list;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //   分页
+    handleSizeChange(val) {
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+
+    //   分页
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.getTableData();
+    },
+    //   重置
+    resetSearch() {
+      this.formData = {};
+
+      this.pageNo = 1;
+      this.getTableData();
+    },
+  },
+
+  props: {},
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+</style>
+  
\ No newline at end of file

From 7f93bcb13463977057d1121bdeb8599dc89ba5b8 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 12 Mar 2024 15:13:46 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=A4=84=E7=90=86,=E8=A1=A8=E5=A4=B4=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/smartImport/cpts/createdTask.vue     | 386 +++++++++++++++---
 .../base/smartImport/cpts/executeTask.vue     |  12 +
 .../base/smartImport/cpts/smartImportAdd.vue  |   2 +-
 3 files changed, 347 insertions(+), 53 deletions(-)

diff --git a/src/views/modules/base/smartImport/cpts/createdTask.vue b/src/views/modules/base/smartImport/cpts/createdTask.vue
index c49cb6233..89f6e66f3 100644
--- a/src/views/modules/base/smartImport/cpts/createdTask.vue
+++ b/src/views/modules/base/smartImport/cpts/createdTask.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="">
+  <div class="" v-loading="dataListLoading">
     <h3 class="title-small">基本信息</h3>
     <div class="content_box">
       <div class="left">
@@ -17,13 +17,20 @@
                 :value="item.value"
                 clearable
                 :key="item.value"
+                @click.native="handelClickCategory(item.label)"
               >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="下载模板" prop="desc">
-            <span
-              >导入模板.xlsx <el-button type="text">点击下载</el-button></span
+            <span>
+              <span v-if="categoryName">{{
+                this.$store.state.user.agencyName + categoryName || ""
+              }}</span
+              >导入模板.xlsx
+              <el-button type="text" @click="handelClickDownModule"
+                >点击下载</el-button
+              ></span
             >
           </el-form-item>
           <el-form-item label="任务名称" prop="taskName">
@@ -47,12 +54,16 @@
           1、导入数据前请先确定您的网格组织已经维护完毕。<el-button
             class="textBtn"
             type="text"
+            @click="$router.push('/main/base-organization-organization')"
             >查看</el-button
           >
         </p>
         <p>2、导入房屋和居民信息前请先确保已经导入了完整的小区楼栋信息。</p>
         <p>
-          3、您也可以<el-button class="textBtn" type="text"
+          3、您也可以<el-button
+            class="textBtn"
+            type="text"
+            @click="handleExportModuleAll"
             >点击这里下载</el-button
           >全部的导入模板文件
         </p>
@@ -64,13 +75,14 @@
         <el-upload
           :headers="$getElUploadHeaders()"
           name="processFile"
-          :action="url"
+          action="uploadUlr"
+          :accept="'.xls,.xlsx'"
+          :limit="1"
           :show-file-list="false"
-          :on-progress="handleProgress"
-          :before-upload="beforeUploadHandle"
-          :on-success="successHandle"
+          :before-upload="beforeExcelUpload"
           :http-request="uploadHttpRequest"
           class="text-center"
+          ref="upload"
         >
           <i class="el-icon-upload" style="font-size: 58px; color: #c5c9d1"></i>
           <div class="el-upload__text" v-html="$t('upload.text')"></div>
@@ -91,11 +103,102 @@
           @click="handelClickBack"
           >取消</el-button
         >
-        <el-button class="diy-button--add" size="small" type="primary" @click="handelClickUpload">
+        <el-button
+          class="diy-button--add"
+          size="small"
+          type="primary"
+          @click="handelClickUpload"
+        >
           开始导入</el-button
         >
       </el-col>
     </el-row>
+    <el-dialog
+      title="确认上传表格数据匹配关系"
+      :visible.sync="dialogVisibleExtractExcelHead"
+      width="75%"
+    >
+      <div v-if="dataList.length > 0" style="height: 600px; overflow-y: scroll">
+        <el-table
+          ref="ref_table"
+          :data="dataList"
+          border
+          class="m-table-item"
+          style="width: 100%"
+        >
+          <el-table-column
+            label="序号"
+            header-align="center"
+            align="center"
+            type="index"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            prop="userTableHeader"
+            header-align="center"
+            align="center"
+            label="表格信息"
+            min-width="80"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.userTableHeader || "--" }}
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="itemGroupId"
+            header-align="center"
+            align="center"
+            label="平台对应信息"
+            min-width="110"
+          >
+            <template slot-scope="scope">
+              <div>
+                <el-select
+                  class="item_width_sel"
+                  v-model="scope.row.itemGroupId"
+                  size="small"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in groupList"
+                    @click.native="handleSelGroup(scope.$index, item, 'change')"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.label"
+                  >
+                  </el-option>
+                </el-select>
+
+                <el-select
+                  class="item_width_sel"
+                  v-model="scope.row.itemId"
+                  size="small"
+                  style="margin-left: 10px"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in scope.row.itemList"
+                    :key="item.itemId"
+                    :label="item.label"
+                    :value="item.label"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisibleExtractExcelHead = false"
+          >取 消</el-button
+        >
+        <el-button type="primary" @click="dialogVisibleExtractExcelHead = false"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
   </div>
 </template>
   <script>
@@ -117,41 +220,136 @@ export default {
         ],
       },
       resident_category_import_list: [],
+      categoryName: "",
+      createdFileName: null,
+      createdFileUrl: null,
+      dialogVisibleExtractExcelHead: false,
+      dataListLoading: false,
+      dataList: [],
+      groupList: [],
+      fileCode:null,
     };
   },
   props: {},
-  created() {
-    this.getDictList();
+  async created() {
+    await this.getDictList();
+    await this.loadPersonGroup();
   },
   methods: {
-    async uploadHttpRequest (file) {
-      if (!this.importType) return;
-      this.importLoading = true;
-      this.importBtnTitle = "正在上传中...";
-      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-      formData.append("file", file.file); //添加文件对象
-      formData.append("fileMode", this.importType); //添加文件对象
-      // http://127.0.0.1:4523/mock2/2515967/97869993
+    async loadPersonGroup() {
+      const url = "/oper/customize/icformitemgroup/list";
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+      let params = {
+        formCode: "resident_base_info",
+        policyFlag: "1",
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.groupList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async handleSelGroup(index, item, change) {
+      const url = "/oper/customize/icformitem/getItemListV2";
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+      let params = {
+        // policyFlag: "1",
+        groupId: item.id,
+      };
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        let oneData = this.dataList[index];
+        if (change == "change") {
+          this.dataList[index].itemId = "";
+        }
+        oneData.itemList = data;
+        this.$set(this.dataList, index, oneData);
+        console.log(this.dataList);
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    
+
+    handelClickCategory(label) {
+      this.categoryName = label;
+    },
+
+    async checkExtractExcelHead() {
+      const url = "/actual/base/intelligentImportData/extractExcelHead";
+      let params = {
+        originFileName: this.createdFileName,
+        originalFilePath: this.createdFileUrl,
+        importCategory: this.form.importCategory,
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.dialogVisibleExtractExcelHead = true;
+        const { metaListData, fileCode, msg } = data;
+        this.dataList = metaListData;
+        this.fileCode = fileCode;
+        let groupMap = new Map(
+          this.groupList.map((item) => [item.label, item])
+        );
+        for (let i in this.dataList) {
+          this.handleSelGroup(i, groupMap.get(this.dataList[i].itemGroupId));
+        }
+        this.dataListLoading = false;
+      } else if (code >= 8000) {
+        this.$message.err(msg);
+        this.dataListLoading = false;
+      }
+    },
+    async getDictList() {
+      const url = "/sys/dict/data/dictlist";
+      const { data, code, msg } = await requestPost(url, {
+        dictType: "resident_category_import",
+      });
+      if (code === 0) {
+        this.resident_category_import_list = [...data];
+      } else {
+        this.$message.err("字典错误");
+      }
+    },
+
+    beforeExcelUpload(file) {
+      this.dataListLoading = true;
+      const isType = file.type === "application/vnd.ms-excel";
+      const isTypeComputer =
+        file.type ===
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+      const fileType = isType || isTypeComputer;
+      const isLt1M = file.size / 1024 / 1024 < 50;
+      if (!fileType) {
+        this.$message.error("上传文件只能是xls/xlsx格式！");
+      }
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 10MB!");
+      }
+
+      if (!this.form.importCategory) {
+        this.$message.error("请选择导入的类别");
+      }
+      return fileType && isLt1M;
+    },
+    async uploadHttpRequest(file) {
+      const formData = new FormData();
+      formData.append("file", file.file);
       await this.$http
-        .post("/actual/base/importExcelData/extractExcelHead", formData)
+        .post("/actual/base/intelligentImportData/uploadFile", formData)
         .then((res) => {
           console.log("res-up", res);
+
           if (res.data.code == 0) {
-            const { metaListData, fileCode, msg } = res.data.data;
-            this.afterSuccess();
-            this.dataList = metaListData;
-            // 相等于在for循环中写filter过滤,这样写能够以 O(1) 的时间复杂度获取 itemGroupId 匹配的元素。
-            let groupMap = new Map(
-              this.groupList.map((item) => [item.label, item])
-            );
-            for (let i in this.dataList) {
-              this.handleSelGroup(
-                i,
-                groupMap.get(this.dataList[i].itemGroupId)
-              );
-            }
-            this.importCode = fileCode;
-            this.fileData = file;
+            const { fileName, url } = res.data.data;
+            this.createdFileName = fileName;
+            this.createdFileUrl = url;
+            this.checkExtractExcelHead();
           } else {
             this.$message.error(res.data.msg);
           }
@@ -159,29 +357,113 @@ export default {
         .catch((err) => {
           console.log("失败", err);
           file.onError(); //上传失败的文件会从文件列表中删除
-          this.$message.error("导入失败");
+          // this.$message.error("导入失败");
         });
-      this.importLoading = false;
-      this.importBtnTitle = "导入";
       this.$refs.upload.clearFiles();
     },
-    async getDictList() {
-      const url = "/sys/dict/data/dictlist";
-      const { data, code, msg } = await requestPost(url, {
-        dictType: "resident_category_import",
+    // 下载全部模板
+    async handleExportModuleAll() {
+      let url = "/actual/base/residentBaseInfo/import/download-template";
+
+      let params = {};
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: params,
+      })
+        .then((res) => {
+          const url = window.URL.createObjectURL(new Blob([res.data]));
+          const aLink = document.createElement("a");
+          aLink.style.display = "none";
+          aLink.href = url;
+          aLink.setAttribute("download", "人员导入模板.zip");
+          document.body.appendChild(aLink);
+          aLink.click();
+          document.body.removeChild(aLink);
+          window.URL.revokeObjectURL(url);
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    // 下载单个模板
+    async handelClickDownModule() {
+      let url = "/actual/base/intelligentImportData/downloadImportModule";
+      let params = {
+        importCategory: this.form.importCategory,
+      };
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: params,
+      })
+        .then((res) => {
+          if (res.headers["content-disposition"]) {
+            // let fileName = window.decodeURI(
+            // 	res.headers["content-disposition"]
+            // 		.split(";")[1]
+            // 		.split("=")[1]
+            // );
+            let fileName = `${
+              this.$store.state.user.agencyName + this.categoryName
+            }导入模板`;
+            let blob = new Blob([res.data], {
+              type: "application/vnd.ms-excel",
+            });
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          } else this.$message.error("下载失败");
+        })
+        .catch((err) => {
+          console.log(err);
+          return this.$message.error("网络错误");
+        });
+    },
+    handelClickUpload() {
+      this.$refs["importForm"].validate( (valid) => {
+        if (valid) {
+           this.saveImportResiHouseExcel()
+        }
       });
-      if (code === 0) {
-        this.resident_category_import_list = [...data];
-      } else {
-        this.$message.err("字典错误");
-      }
     },
-    handelClickUpload(){
-        this.$emit('handelClickUpload')
+   async saveImportResiHouseExcel(){
+      const { fileCode, dataList } = this;
+      let obj = dataList.reduce((acc, item) => {
+        if (item.userTableHeader) {
+          acc[item.userTableHeader] = item.itemId;
+        }
+        return acc;
+      }, {});
+      const formData = new FormData();
+      formData.append("columnMateJson", JSON.stringify(obj));
+      formData.append("fileCode", fileCode);
+      formData.append("taskName", this.form.taskName);
+      await this.$http
+        .post("/actual/base/intelligentImportData/importResiHouseExcel", formData)
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            this.$emit("handelClickUpload");
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError();
+        });
+    },
+    handelClickBack() {
+      this.$emit("handelClickBack");
     },
-    handelClickBack(){
-        this.$emit('handelClickBack')
-    }
   },
   components: {},
   computed: {},
diff --git a/src/views/modules/base/smartImport/cpts/executeTask.vue b/src/views/modules/base/smartImport/cpts/executeTask.vue
index 030144c8a..ccb2a57ca 100644
--- a/src/views/modules/base/smartImport/cpts/executeTask.vue
+++ b/src/views/modules/base/smartImport/cpts/executeTask.vue
@@ -4,6 +4,14 @@
       <div class="left">
         <img class="rotate" src="@/assets/images/index/loading.png" alt="" />
         <p>请您耐心等待！如果您发现导入数据问题较多，可以取消导入</p>
+       <div>
+        <el-button
+          style="margin-left: 10px"
+          size="small"
+          type="primary"
+          @click="handelClickBackList"
+          >返回任务列表</el-button
+        >
         <el-button
           style="margin-left: 10px"
           size="small"
@@ -12,6 +20,7 @@
           @click="handelClickBack"
           >取消导入</el-button
         >
+       </div>
       </div>
       <div class="right">
         <h4>
@@ -71,6 +80,9 @@ export default {
                     
                 });
     },
+    handelClickBackList(){
+      this.$emit("handelClickBack");
+    }
   },
   components: {},
   computed: {},
diff --git a/src/views/modules/base/smartImport/cpts/smartImportAdd.vue b/src/views/modules/base/smartImport/cpts/smartImportAdd.vue
index 38d965da2..6daf227fd 100644
--- a/src/views/modules/base/smartImport/cpts/smartImportAdd.vue
+++ b/src/views/modules/base/smartImport/cpts/smartImportAdd.vue
@@ -24,7 +24,7 @@ import completeTask from './completeTask.vue'
 export default {
   data() {
     return {
-      progress:1,
+      progress:2,
     };
   },
   props: {},

From 406af35f75782887aa9041b9f4115b9466a30a16 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 12 Mar 2024 19:31:18 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/pages/smartImport.scss        |   1 -
 src/views/components/resiSearch.vue           | 135 -----------------
 .../base/smartImport/cpts/createdTask.vue     |   5 +-
 .../base/smartImport/cpts/executeTask.vue     | 138 ++++++++++++++++--
 .../base/smartImport/cpts/smartImportAdd.vue  |   8 +-
 src/views/modules/base/smartImport/index.vue  |   2 +-
 6 files changed, 135 insertions(+), 154 deletions(-)

diff --git a/src/assets/scss/pages/smartImport.scss b/src/assets/scss/pages/smartImport.scss
index b8863eb9f..55563c016 100644
--- a/src/assets/scss/pages/smartImport.scss
+++ b/src/assets/scss/pages/smartImport.scss
@@ -25,7 +25,6 @@
             width: 240px; 
          }
          .text-center{
-            border: 1px #c5c9d1 dashed ;
             width: calc( 100% - 20px);
             height: 175px;
             display: flex;
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 0333e38f7..4c34bde1a 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -124,141 +124,6 @@
           </el-select>
         </el-form-item>
 
-        <!-- <el-form-item label="居民姓名">
-          <el-input v-model="form.name"
-                    placeholder="请输入"
-                    size="small"
-                    @keydown.native.enter="handleSearchFrom"
-                    class="u-item-width-normal"
-                    clearable></el-input>
-        </el-form-item> -->
-        <!-- <el-form-item label="联系电话">
-          <el-input v-model="form.mobile"
-                    size="small"
-                    placeholder="请输入"
-                    class="u-item-width-normal"
-                    clearable></el-input>
-        </el-form-item> -->
-        <!-- <el-form-item label="证件号">
-          <el-input v-model="form.idNum"
-                    size="small"
-                    placeholder="请输入"
-                    class="u-item-width-normal"
-                    clearable></el-input>
-        </el-form-item> -->
-
-        <!-- <el-form-item label="出生日期">
-          <el-date-picker v-model="form.birthdayStart"
-                          type="date"
-                          size="small"
-                          class="u-item-width-daterange"
-                          value-format="yyyy-MM-dd"
-                          placeholder="开始日期"
-                          :picker-options="pickerOptionsStart">
-          </el-date-picker>
-          <span class="u-data-tag">至</span>
-          <el-date-picker v-model="form.birthdayEnd"
-                          type="date"
-                          size="small"
-                          value-format="yyyy-MM-dd"
-                          class="u-item-width-daterange u-data-tag"
-                          placeholder="结束日期"
-                          :picker-options="pickerOptionsEnd">
-          </el-date-picker>
-        </el-form-item> -->
-
-
-        <!-- <el-form-item label="本地户籍">
-          <el-select v-model="form.localResidenceFlag" class="u-item-width-normal" clearable size="small">
-            <el-option label='是' value='1'> </el-option>
-            <el-option label='否' value='0'> </el-option>
-          </el-select>
-        </el-form-item> -->
-
-
-
-
-        <!-- <el-form-item>
-          <span style="width:100px;text-align: right;padding-right:14px;display: inline-block; ">所属组织:</span>
-          <el-cascader class="u-item-width-normal"
-                       size="small"
-                       ref="myCascader"
-                       v-model="form.agencyId"
-                       :options="orgOptions"
-                       :props="orgOptionProps"
-                       :show-all-levels="false"
-                       @change="handleChangeAgency"
-                       clearable></el-cascader>
-        </el-form-item> -->
-        <!-- <el-form-item prop="villageId">
-          <div class="resi-cell">
-            <div class="resi-cell-value">
-              <span style="width:100px;text-align: right;padding-right:14px;display: inline-block; ">所属房屋:</span>
-              <el-select v-model.trim="form.villageId"
-                         placeholder="请选择小区"
-                         size="small"
-                         filterable
-                         clearable
-                         class="u-item-width-communitycascader"
-                         @clear="handleClearVillage"
-                         @change="handleChangeV"
-                         v-el-select-loadmore="loadmore"
-                         >
-                <el-option v-for="item in optionsV"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-              <el-select v-model.trim="form.buildId"
-                         placeholder="楼号"
-                         size="small"
-                         filterable
-                         clearable
-                         style="margin-left: 5px"
-                         class="u-item-width-buildcascader"
-                         :disabled="changeVDisabled"
-                         @clear="handleClearBuild"
-                         @change="handleChangeB">
-                <el-option v-for="item in optionsB"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-              <el-select v-model.trim="form.unitId"
-                         :disabled="changeBDisabled"
-                         placeholder="单元"
-                         size="small"
-                         filterable
-                         clearable
-                         style="margin-left: 5px"
-                         class="u-item-width-buildcascader"
-                         @click="handleClearDan"
-                         @change="handleChangeD">
-                <el-option v-for="item in optionsD"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-              <el-select v-model.trim="form.homeId"
-                         :disabled="changeDDisabled"
-                         placeholder="房号"
-                         size="small"
-                         filterable
-                         clearable
-                         style="margin-left: 5px"
-                         class="u-item-width-buildcascader">
-                <el-option v-for="item in optionsH"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-            </div>
-          </div>
-        </el-form-item> -->
         <el-form-item label="备注">
           <el-input v-model="form.remark" placeholder="请输入" size="small" class="u-item-width-normal" clearable></el-input>
         </el-form-item>
diff --git a/src/views/modules/base/smartImport/cpts/createdTask.vue b/src/views/modules/base/smartImport/cpts/createdTask.vue
index 89f6e66f3..be6182d5b 100644
--- a/src/views/modules/base/smartImport/cpts/createdTask.vue
+++ b/src/views/modules/base/smartImport/cpts/createdTask.vue
@@ -78,7 +78,7 @@
           action="uploadUlr"
           :accept="'.xls,.xlsx'"
           :limit="1"
-          :show-file-list="false"
+          drag
           :before-upload="beforeExcelUpload"
           :http-request="uploadHttpRequest"
           class="text-center"
@@ -453,7 +453,8 @@ export default {
         .then((res) => {
           console.log("res-up", res);
           if (res.data.code == 0 && res.data.msg == "success") {
-            this.$emit("handelClickUpload");
+
+            this.$emit("handelClickUpload",fileCode);
           } else this.$message.error(res.data.msg);
         })
         .catch((err) => {
diff --git a/src/views/modules/base/smartImport/cpts/executeTask.vue b/src/views/modules/base/smartImport/cpts/executeTask.vue
index ccb2a57ca..390bc8423 100644
--- a/src/views/modules/base/smartImport/cpts/executeTask.vue
+++ b/src/views/modules/base/smartImport/cpts/executeTask.vue
@@ -38,18 +38,44 @@
       </div>
     </div>
     <h3 class="title-small">数据导入明细</h3>
+        <el-row type="flex" justify="" >
+            <el-col :span="24">
+              {{this.importSuccessNum || '--'}}条数据已导入。<el-button type="text" @click="handelClickLook('success')">查看</el-button>
+            </el-col>
+        </el-row>
+        <el-row type="flex" justify="" >
+            <el-col :span="24">
+              {{this.importFailNum || '--'}}条问题数据导入失败。<el-button type="text" @click="handelClickLook('fail')">查看</el-button>
+            </el-col>
+        </el-row>
+        <!-- <el-dialog title="列表"
+                   :visible.sync="dialogVisible"
+                   width="50%">
+          <el-table :data="tableDate"
+                    border
+                    style="width: 100%">
+            <el-table-column type="设置类型"> 
+            </el-table-column>
+            <el-table-column prop="渲染绑定的表数据tableDate中的哪个数据"
+                             label="显示名字"
+                             width="180">
+            </el-table-column>
+          </el-table>
+          <span slot="footer"
+                class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary"
+                       @click="dialogVisible = false">确 定</el-button>
+          </span>
+        </el-dialog> -->
   </div>
 </template>
     <script>
-import { requestPost } from "@/js/dai/request";
+import { requestPost,requestGet} from "@/js/dai/request";
 
 export default {
   data() {
     return {
-      form: {
-        importCategory: null,
-        taskName: null,
-      },
       rules: {
         importCategory: [
           { required: true, message: "请选择任务类型", trigger: "change" },
@@ -59,15 +85,100 @@ export default {
         ],
       },
       resident_category_import_list: [],
+      taskId:null,
+      timerId:null,
+      importSuccessNum:null,
+      importFailNum:null,
+      importCategory:null,
     };
   },
-  props: {},
-  created() {
+  props: {
+    fileCode:{
+      type:String,
+      default:''
+    }
+  },
+ async created() {
+   await this.getTaskInfo();
+  //  await this.getQuaryExcelDataList()
+   await this.startTimer();
   },
   methods: {
- 
-    handelClickUpload() {
-      this.$emit("handelClickUpload");
+    startTimer() {
+      if (!this.timerId ) {
+        this.timerId = setInterval(this.getProcessRate, 3000);
+      }
+    },
+    // 停止定时器
+    stopTimer() {
+      clearInterval(this.timerId);
+      this.timerId = null; 
+    },
+    async getProcessRate() {
+      let url = '/actual/base/intelligentImportData/processRate'
+      let parm = {
+        fileCode:this.fileCode
+      }
+     let res= await requestPost(url, parm)
+     if(res.code == 0){
+        if(res.data == 100){
+          this.stopTimer()
+        }
+     }else if(code >= 8000){
+      this.$message.error(msg);
+     }
+    },
+    async getTaskInfo () {
+      let url = '/actual/base/intelligentImportData/getTaskInfo'
+      let parm = {
+        fileCode:this.fileCode
+      }
+     let {data,code,msg} = await requestPost(url, parm)
+     if(code == 0){
+        this.taskId = data.taskId;
+        this.importFailNum = data.importFailNum.toString();
+        this.importSuccessNum = data.importSuccessNum.toString();
+        this.importCategory = data.importCategory
+        if(data.processStatus != 'processing'){
+          this.stopTimer()
+        }
+     }else if(code >= 8000){
+      this.$message.error(msg);
+     }
+      // this.$emit("handelClickUpload");
+    },
+    async handelClickLook (type) {
+      let url = '/actual/base/excelDataShow/quaryExcelDataList'
+      let parm = {
+        taskId:this.taskId,
+        boolranFlag:type == 'success'?'1':'0',
+        pageNo:1,
+        pageSize:20,
+        importCategory:this.importCategory
+      }
+     let {data,code,msg} = await requestPost(url, parm)
+     if(code == 0){
+        console.log(data);
+     }else if(code >= 8000){
+      this.$message.error(msg);
+     }
+      // this.$emit("handelClickUpload");
+    },
+   
+    async cancelTask(){
+      let url = '/actual/base/intelligentImportData/cancelTask'
+      let parm = {
+        fileCode:this.fileCode,
+        taskId:this.taskId
+      }
+     let {data,code,msg} = await requestPost(url, parm)
+     if(code == 0){
+        console.log(data);
+        this.$message.info('任务已取消');
+        this.$emit("handelClickBack");
+     }else if(code >= 8000){
+      this.$message.error(msg);
+     }
     },
     handelClickBack() {
         this.$confirm(`您确定要取消本次数据导入任务吗`, {
@@ -75,15 +186,18 @@ export default {
                     cancelButtonText: '再想想',
                     type: 'warning'
                 }).then(() => {
-                    this.$emit("handelClickBack");
+                  this.cancelTask()
                 }).catch(() => {
-                    
                 });
     },
+
     handelClickBackList(){
       this.$emit("handelClickBack");
     }
   },
+  destroyed(){
+    this.stopTimer()
+  },
   components: {},
   computed: {},
   watch: {},
diff --git a/src/views/modules/base/smartImport/cpts/smartImportAdd.vue b/src/views/modules/base/smartImport/cpts/smartImportAdd.vue
index 6daf227fd..659589427 100644
--- a/src/views/modules/base/smartImport/cpts/smartImportAdd.vue
+++ b/src/views/modules/base/smartImport/cpts/smartImportAdd.vue
@@ -11,7 +11,7 @@
       </div>
       <div style="margin-top: 37px;">
         <created-task v-if="progress == 1" @handelClickUpload="handelClickUpload" @handelClickBack="handelClickBack"></created-task>
-        <execute-task v-if="progress == 2"@handelClickBack="handelClickBack"></execute-task>
+        <execute-task v-if="progress == 2"@handelClickBack="handelClickBack" :fileCode="fileCode"></execute-task>
         <complete-task v-if="progress == 3"@handelClickBack="handelClickBack"></complete-task>
       </div>
     </el-card>
@@ -24,15 +24,17 @@ import completeTask from './completeTask.vue'
 export default {
   data() {
     return {
-      progress:2,
+      progress:1,
+      fileCode:null
     };
   },
   props: {},
   created() {
   },
   methods: {
-    handelClickUpload(){
+    handelClickUpload(fileCode){
         this.progress = 2;
+        this.fileCode = fileCode;
     },
     handelClickBack(){
         this.$emit('handleClose');
diff --git a/src/views/modules/base/smartImport/index.vue b/src/views/modules/base/smartImport/index.vue
index d04815a3c..a283664ad 100644
--- a/src/views/modules/base/smartImport/index.vue
+++ b/src/views/modules/base/smartImport/index.vue
@@ -116,7 +116,7 @@ export default {
       pageNo: 1,
       pageSize: window.localStorage.getItem("pageSize") || 20,
       total: 1,
-      pageType: "add", // 列表list 新增add  详情detail
+      pageType: "list", // 列表list 新增add  详情detail
 
       dicts: {
         import_status:[],

From a798c66b84594530c41cd9ec300c4d548fbec07d Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 13 Mar 2024 15:17:59 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=88=97=E8=A1=A8,=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/pages/smartImport.scss        |   7 +
 .../base/smartImport/cpts/completeTask.vue    | 175 +++++++++-
 .../base/smartImport/cpts/executeTask.vue     | 313 +++++++++++-------
 .../base/smartImport/cpts/smartImportAdd.vue  |  53 ---
 .../smartImport/cpts/smartImportDetail.vue    |  23 --
 .../base/smartImport/cpts/smartImportInfo.vue |  93 ++++--
 src/views/modules/base/smartImport/index.vue  |  23 +-
 7 files changed, 439 insertions(+), 248 deletions(-)
 delete mode 100644 src/views/modules/base/smartImport/cpts/smartImportAdd.vue
 delete mode 100644 src/views/modules/base/smartImport/cpts/smartImportDetail.vue

diff --git a/src/assets/scss/pages/smartImport.scss b/src/assets/scss/pages/smartImport.scss
index 55563c016..ab75a4236 100644
--- a/src/assets/scss/pages/smartImport.scss
+++ b/src/assets/scss/pages/smartImport.scss
@@ -32,6 +32,13 @@
             align-items: center;
             .el-upload__text{
                 color: #c5c9d1;
+                width: 100%;
+            }
+            /deep/ .el-upload {
+              width: 100%;
+              .el-upload-dragger{
+                width: 100%;
+              }
             }
          }
     }
diff --git a/src/views/modules/base/smartImport/cpts/completeTask.vue b/src/views/modules/base/smartImport/cpts/completeTask.vue
index fdc34df62..932952954 100644
--- a/src/views/modules/base/smartImport/cpts/completeTask.vue
+++ b/src/views/modules/base/smartImport/cpts/completeTask.vue
@@ -2,8 +2,15 @@
   <div class="">
     <div class="content_box">
       <div class="left">
-        <i class="el-icon-success" style="font-size: 50px; color: #1cc58c;"></i>
+        <i class="el-icon-success" style="font-size: 50px; color: #1cc58c"></i>
         <p>导入完成</p>
+        <el-button
+          style="margin-left: 10px"
+          size="small"
+          type="primary"
+          @click="handelClickBackList"
+          >返回任务列表</el-button
+        >
       </div>
       <div class="right">
         <h4>
@@ -18,6 +25,70 @@
       </div>
     </div>
     <h3 class="title-small">数据导入明细</h3>
+    <el-row type="flex" justify="">
+      <el-col :span="24">
+      <i class="el-icon-circle-check" style="color: #1cc58c; font-size: 15px;font-weight: 600;"></i>   {{ this.importSuccessNum || "--" }}条数据已导入。<el-button
+          type="text"
+          @click="handelClickLook('success')"
+          >查看</el-button
+        >
+      </el-col>
+    </el-row>
+    <el-row type="flex" justify="">
+      <el-col :span="24">
+        <i class="el-icon-circle-close" style="color: #ff5b5d;font-size: 15px;font-weight: 600;"></i> {{ this.importFailNum || "--" }}条问题数据导入失败。<el-button
+          type="text"
+          @click="handelClickLook('fail')"
+          >查看</el-button
+        >
+        <!--     -->
+        <i class="el-icon-download" style="margin-left: 16px;"></i>
+        <a
+        v-if="this.resultDescFile"
+        :href="this.resultDescFile"
+              target="_blank"
+              style="color: #ff4d4f; cursor: pointer"
+              >下载结果说明</a
+            >
+      </el-col>
+    </el-row>
+    <el-dialog
+      title="列表"
+      :visible.sync="showTable"
+      width="50%"
+      v-if="showTable"
+    >
+      <el-table
+        :data="tableData"
+        row-key="fileCode"
+        border
+        style="width: 100%; height: 500px; overflow-y: auto"
+      >
+        <el-table-column
+          v-for="item in tableHeader"
+          :key="item.columnName"
+          :prop="item.columnName"
+          :label="item.label"
+          :align="item.align"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ handleFilterSpan(scope.row, item) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="pageNo"
+        :page-size="pageSize"
+        :total="total"
+        layout=" prev, pager, next"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="showTable = false">取 消</el-button>
+        <el-button type="primary" @click="showTable = false">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
       <script>
@@ -25,29 +96,99 @@ import { requestPost } from "@/js/dai/request";
 export default {
   data() {
     return {
-      form: {
-        importCategory: null,
-        taskName: null,
-      },
-      rules: {
-        importCategory: [
-          { required: true, message: "请选择任务类型", trigger: "change" },
-        ],
-        taskName: [
-          { required: true, message: "请输入任务名称", trigger: "change" },
-        ],
-      },
       resident_category_import_list: [],
+      showTable: false,
+      tableHeader: [],
+      tableData: [],
+      importSuccessNum: null,
+      importFailNum: null,
+      importCategory:null,
+      pageNo:1,
+      pageSize:20,
+      total:0,
+      tableType:null
     };
   },
-  props: {},
-  created() {},
+  props: {
+    fileCode: {
+      type: String,
+      default: "",
+    },
+    fileCodeP: {
+      type: String,
+      default: "",
+    },
+  },
+  created() {
+    this.getTaskInfo();
+  },
   methods: {
+    handleFilterSpan(row, item) {
+      let _val = "";
+      if (item.options && item.options.length > 0) {
+        item.options.forEach((n) => {
+          if (n.value === row[item.columnName]) _val = n.label;
+        });
+      }
+      return _val || row[item.columnName];
+    },
+    async handelClickLook(type) {
+      this.showTable = true;
+      this.tableType = type;
+      this.getTable()
+    },
+    async getTable(){
+      let url = "/actual/base/excelDataShow/quaryExcelDataList";
+      const {pageNo,pageSize,importCategory,tableType} = this;
+      let parm = {
+        taskId: this.taskId,
+        boolranFlag: tableType == "success" ? "1" : "0",
+        pageNo,
+        pageSize,
+        fileCategory:importCategory,
+      };
+      let { data, code, msg } = await requestPost(url, parm);
+      if (code == 0) {
+        this.showTable = true;
+        this.tableHeader = Object.entries(data.columnsDict).map((item) => ({
+          label: item[0],
+          columnName: item[1],
+        })); //属性名和属性值
+        this.tableData = data.excelDataShowDTOList.list;
+        this.total = data.excelDataShowDTOList.total;
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
+    },
+    pageCurrentChangeHandle (val) {
+      this.pageNo = val
+      this.getTable()
+    },
     handelClickUpload() {
       this.$emit("handelClickUpload");
     },
-    handelClickBack() {
-      //   this.$emit("handelClickBack");
+    handelClickBackList() {
+      this.$emit("handelClickBack");
+    },
+    async getTaskInfo() {
+      let url = "/actual/base/intelligentImportData/getTaskInfo";
+      let parm = {
+        fileCode: this.fileCodeP || this.fileCode,
+      };
+      let { data, code, msg } = await requestPost(url, parm);
+      if (code == 0) {
+        this.taskId = data.taskId;
+        this.importFailNum = data.importFailNum.toString();
+        this.importSuccessNum = data.importSuccessNum.toString();
+        this.importCategory = data.importCategory;
+        this.resultDescFile = data.resultDescFile;
+        this.$emit("updateoperatorName", {
+          operatorName: data.operatorName,
+          createdTime: data.createdTime,
+        });
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
     },
   },
   components: {},
diff --git a/src/views/modules/base/smartImport/cpts/executeTask.vue b/src/views/modules/base/smartImport/cpts/executeTask.vue
index 390bc8423..60e561b46 100644
--- a/src/views/modules/base/smartImport/cpts/executeTask.vue
+++ b/src/views/modules/base/smartImport/cpts/executeTask.vue
@@ -4,23 +4,23 @@
       <div class="left">
         <img class="rotate" src="@/assets/images/index/loading.png" alt="" />
         <p>请您耐心等待！如果您发现导入数据问题较多，可以取消导入</p>
-       <div>
-        <el-button
-          style="margin-left: 10px"
-          size="small"
-          type="primary"
-          @click="handelClickBackList"
-          >返回任务列表</el-button
-        >
-        <el-button
-          style="margin-left: 10px"
-          size="small"
-          class="diy-button--white"
-          plain
-          @click="handelClickBack"
-          >取消导入</el-button
-        >
-       </div>
+        <div>
+          <el-button
+            style="margin-left: 10px"
+            size="small"
+            type="primary"
+            @click="handelClickBackList"
+            >返回任务列表</el-button
+          >
+          <el-button
+            style="margin-left: 10px"
+            size="small"
+            class="diy-button--white"
+            plain
+            @click="handelClickBack"
+            >取消导入</el-button
+          >
+        </div>
       </div>
       <div class="right">
         <h4>
@@ -38,40 +38,68 @@
       </div>
     </div>
     <h3 class="title-small">数据导入明细</h3>
-        <el-row type="flex" justify="" >
-            <el-col :span="24">
-              {{this.importSuccessNum || '--'}}条数据已导入。<el-button type="text" @click="handelClickLook('success')">查看</el-button>
-            </el-col>
-        </el-row>
-        <el-row type="flex" justify="" >
-            <el-col :span="24">
-              {{this.importFailNum || '--'}}条问题数据导入失败。<el-button type="text" @click="handelClickLook('fail')">查看</el-button>
-            </el-col>
-        </el-row>
-        <!-- <el-dialog title="列表"
-                   :visible.sync="dialogVisible"
-                   width="50%">
-          <el-table :data="tableDate"
-                    border
-                    style="width: 100%">
-            <el-table-column type="设置类型"> 
-            </el-table-column>
-            <el-table-column prop="渲染绑定的表数据tableDate中的哪个数据"
-                             label="显示名字"
-                             width="180">
-            </el-table-column>
-          </el-table>
-          <span slot="footer"
-                class="dialog-footer">
-            <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary"
-                       @click="dialogVisible = false">确 定</el-button>
-          </span>
-        </el-dialog> -->
+    <el-row type="flex" justify="">
+      <el-col :span="24">
+        <i class="el-icon-circle-check" style="color: #1cc58c; font-size: 15px;font-weight: 600;"></i>  {{ this.importSuccessNum || "--" }}条数据已导入。<el-button
+          type="text"
+          @click="handelClickLook('success')"
+          >查看</el-button
+        >
+      </el-col>
+    </el-row>
+    <el-row type="flex" justify="">
+      <el-col :span="24">
+        <i class="el-icon-circle-close" style="color: #ff5b5d;font-size: 15px;font-weight: 600;"></i> {{ this.importFailNum || "--" }}条问题数据导入失败。<el-button
+          type="text"
+          @click="handelClickLook('fail')"
+          >查看</el-button
+        >
+      </el-col>
+    </el-row>
+    <el-dialog
+      title="列表"
+      :visible.sync="showTable"
+      width="50%"
+      v-if="showTable"
+    >
+      <el-table
+        :data="tableData"
+        row-key="fileCode"
+        border
+        style="width: 100%"
+      >
+        <el-table-column
+          v-for="item in tableHeader"
+          :key="item.columnName"
+          :prop="item.columnName"
+          :label="item.label"
+          :align="item.align"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ handleFilterSpan(scope.row, item) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="pageNo"
+        :page-size="pageSize"
+        :total="total"
+        layout=" prev, pager, next"
+        @current-change="pageCurrentChangeHandle"
+        >
+      </el-pagination>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="showTable = false">取 消</el-button>
+        <el-button type="primary" @click="showTable = false"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
   </div>
 </template>
     <script>
-import { requestPost,requestGet} from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 
 export default {
   data() {
@@ -85,118 +113,153 @@ export default {
         ],
       },
       resident_category_import_list: [],
-      taskId:null,
-      timerId:null,
-      importSuccessNum:null,
-      importFailNum:null,
-      importCategory:null,
+      taskId: null,
+      timerId: null,
+      importSuccessNum: null,
+      importFailNum: null,
+      importCategory: null,
+      showTable: false,
+      tableHeader: [],
+      tableData:[],
+      pageNo:1,
+      pageSize:20,
+      total:0,
+      tableType:null
+
     };
   },
   props: {
-    fileCode:{
-      type:String,
-      default:''
-    }
+    fileCode: {
+      type: String,
+      default: "",
+    },
+    fileCodeP: {
+      type: String,
+      default: "",
+    },
   },
- async created() {
-   await this.getTaskInfo();
-  //  await this.getQuaryExcelDataList()
-   await this.startTimer();
+  async created() {
+    await this.getTaskInfo();
+    await this.startTimer();
   },
   methods: {
+    handleFilterSpan(row, item) {
+      let _val = "";
+      if (item.options && item.options.length > 0) {
+        item.options.forEach((n) => {
+          if (n.value === row[item.columnName]) _val = n.label;
+        });
+      }
+      return _val || row[item.columnName];
+    },
     startTimer() {
-      if (!this.timerId ) {
-        this.timerId = setInterval(this.getProcessRate, 3000);
+      if (!this.timerId) {
+        this.timerId = setInterval(this.getProcessRate, 500);
       }
     },
     // 停止定时器
     stopTimer() {
       clearInterval(this.timerId);
-      this.timerId = null; 
+      this.timerId = null;
     },
     async getProcessRate() {
-      let url = '/actual/base/intelligentImportData/processRate'
+      let url = "/actual/base/intelligentImportData/processRate";
       let parm = {
-        fileCode:this.fileCode
-      }
-     let res= await requestPost(url, parm)
-     if(res.code == 0){
-        if(res.data == 100){
-          this.stopTimer()
+        fileCode: this.fileCode,
+      };
+      let res = await requestPost(url, parm);
+      if (res.code == 0) {
+        if (res.data === 100) {
+          this.stopTimer();
+          this.$emit('successImport')
+        }else{
+          this.$emit('updateProgress',res.data)
         }
-     }else if(code >= 8000){
-      this.$message.error(msg);
-     }
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
     },
-    async getTaskInfo () {
-      let url = '/actual/base/intelligentImportData/getTaskInfo'
+    async getTaskInfo() {
+      let url = "/actual/base/intelligentImportData/getTaskInfo";
       let parm = {
-        fileCode:this.fileCode
-      }
-     let {data,code,msg} = await requestPost(url, parm)
-     if(code == 0){
+        fileCode: this.fileCodeP || this.fileCode,
+      };
+      let { data, code, msg } = await requestPost(url, parm);
+      if (code == 0) {
         this.taskId = data.taskId;
         this.importFailNum = data.importFailNum.toString();
         this.importSuccessNum = data.importSuccessNum.toString();
-        this.importCategory = data.importCategory
-        if(data.processStatus != 'processing'){
-          this.stopTimer()
+        this.importCategory = data.importCategory;
+        this.$emit('updateoperatorName',{operatorName:data.operatorName,createdTime:data.createdTime})
+        if (data.processStatus != "processing") {
+          this.stopTimer();
         }
-     }else if(code >= 8000){
-      this.$message.error(msg);
-     }
-      // this.$emit("handelClickUpload");
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
+    },
+    async handelClickLook(type) {
+      this.showTable = true;
+      this.tableType = type;
+      this.getTable()
     },
-    async handelClickLook (type) {
-      let url = '/actual/base/excelDataShow/quaryExcelDataList'
+    async getTable(){
+      let url = "/actual/base/excelDataShow/quaryExcelDataList";
+      const {pageNo,pageSize,importCategory,tableType} = this;
       let parm = {
-        taskId:this.taskId,
-        boolranFlag:type == 'success'?'1':'0',
-        pageNo:1,
-        pageSize:20,
-        importCategory:this.importCategory
+        taskId: this.taskId,
+        boolranFlag: tableType == "success" ? "1" : "0",
+        pageNo,
+        pageSize,
+        fileCategory:importCategory,
+      };
+      let { data, code, msg } = await requestPost(url, parm);
+      if (code == 0) {
+        this.showTable = true;
+        this.tableHeader = Object.entries(data.columnsDict).map((item) => ({
+          label: item[0],
+          columnName: item[1],
+        })); //属性名和属性值
+        this.tableData = data.excelDataShowDTOList.list;
+        this.total = data.excelDataShowDTOList.total;
+      } else if (code >= 8000) {
+        this.$message.error(msg);
       }
-     let {data,code,msg} = await requestPost(url, parm)
-     if(code == 0){
-        console.log(data);
-     }else if(code >= 8000){
-      this.$message.error(msg);
-     }
-      // this.$emit("handelClickUpload");
     },
-   
-    async cancelTask(){
-      let url = '/actual/base/intelligentImportData/cancelTask'
+
+    async cancelTask() {
+      let url = "/actual/base/intelligentImportData/cancelTask";
       let parm = {
-        fileCode:this.fileCode,
-        taskId:this.taskId
-      }
-     let {data,code,msg} = await requestPost(url, parm)
-     if(code == 0){
+        fileCode: this.fileCode,
+        taskId: this.taskId,
+      };
+      let { data, code, msg } = await requestPost(url, parm);
+      if (code == 0) {
         console.log(data);
-        this.$message.info('任务已取消');
+        this.$message.info("任务已取消");
         this.$emit("handelClickBack");
-     }else if(code >= 8000){
-      this.$message.error(msg);
-     }
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
     },
     handelClickBack() {
-        this.$confirm(`您确定要取消本次数据导入任务吗`, {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '再想想',
-                    type: 'warning'
-                }).then(() => {
-                  this.cancelTask()
-                }).catch(() => {
-                });
+      this.$confirm(`您确定要取消本次数据导入任务吗`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "再想想",
+        type: "warning",
+      })
+        .then(() => {
+          this.cancelTask();
+        })
+        .catch(() => {});
     },
 
-    handelClickBackList(){
+    handelClickBackList() {
       this.$emit("handelClickBack");
-    }
+    },
   },
-  destroyed(){
-    this.stopTimer()
+  destroyed() {
+    this.stopTimer();
   },
   components: {},
   computed: {},
diff --git a/src/views/modules/base/smartImport/cpts/smartImportAdd.vue b/src/views/modules/base/smartImport/cpts/smartImportAdd.vue
deleted file mode 100644
index 659589427..000000000
--- a/src/views/modules/base/smartImport/cpts/smartImportAdd.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<template>
-  <div class="m-detail-main">
-    <el-card>
-      <div class="steps">
-        <el-steps :active="progress" >
-            <!-- description="这是一段很长很长很长的描述性文字" -->
-          <el-step  title="创建任务" ></el-step>
-          <el-step title="正在导入"></el-step>
-          <el-step title="导入完成"></el-step>
-        </el-steps>
-      </div>
-      <div style="margin-top: 37px;">
-        <created-task v-if="progress == 1" @handelClickUpload="handelClickUpload" @handelClickBack="handelClickBack"></created-task>
-        <execute-task v-if="progress == 2"@handelClickBack="handelClickBack" :fileCode="fileCode"></execute-task>
-        <complete-task v-if="progress == 3"@handelClickBack="handelClickBack"></complete-task>
-      </div>
-    </el-card>
-  </div>
-</template>
-  <script>
-import createdTask from './createdTask.vue'
-import executeTask from './executeTask.vue'
-import completeTask from './completeTask.vue'
-export default {
-  data() {
-    return {
-      progress:1,
-      fileCode:null
-    };
-  },
-  props: {},
-  created() {
-  },
-  methods: {
-    handelClickUpload(fileCode){
-        this.progress = 2;
-        this.fileCode = fileCode;
-    },
-    handelClickBack(){
-        this.$emit('handleClose');
-    },
-  },
-  components: {createdTask,executeTask,completeTask},
-  computed: {},
-  watch: {},
-};
-</script>
-  <style lang="scss" scoped>
-@import "@/assets/scss/buttonstyle.scss";
-@import "@/assets/scss/modules/management/detail-main.scss";
-@import "@/assets/scss/pages/smartImport.scss";
-</style>
-  
\ No newline at end of file
diff --git a/src/views/modules/base/smartImport/cpts/smartImportDetail.vue b/src/views/modules/base/smartImport/cpts/smartImportDetail.vue
deleted file mode 100644
index 75baf8593..000000000
--- a/src/views/modules/base/smartImport/cpts/smartImportDetail.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-    <div class="">
-     detail
-    </div>
-  </template>
-  <script>
-  
-  export default {
-    data() {
-      return {};
-    },
-    props: {
-    },
-    created() {},
-    methods: {},
-    components: {},
-    computed: {},
-    watch: {},
-  };
-  </script>
-  <style lang="scss" scoped>
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/modules/base/smartImport/cpts/smartImportInfo.vue b/src/views/modules/base/smartImport/cpts/smartImportInfo.vue
index a864362ac..24d0f44de 100644
--- a/src/views/modules/base/smartImport/cpts/smartImportInfo.vue
+++ b/src/views/modules/base/smartImport/cpts/smartImportInfo.vue
@@ -1,39 +1,88 @@
 <template>
-  <div class="">
-    <div v-if="pageType == 'add'">
-        <smart-import-add @handleClose="handleClose" @handelClickCloseUpload="handelClickCloseUpload"></smart-import-add>
-    </div>
-    <div v-if="pageType == 'detail'">
-        <smart-import-detail></smart-import-detail>
-    </div>
+  <div class="m-detail-main">
+    <el-card>
+      <div class="steps">
+        <el-steps :active="progress" >
+            <!-- description="这是一段很长很长很长的描述性文字" -->
+          <el-step :class="[this.operatorName == null?'showNum':'']"  title="创建任务" :description="`${this.operatorName}(${this.createdTime})`" ></el-step>
+          <el-step  title="正在导入" :description="`导入进度${this.processStatus == 'processing'?this.progressNum:100 }%`"></el-step>
+          <el-step title="导入完成"></el-step>
+        </el-steps>
+      </div>
+      <div style="margin-top: 37px;">
+        <created-task v-if="progress == 1" @handelClickUpload="handelClickUpload" @handelClickBack="handelClickBack"></created-task>
+        <execute-task v-if="progress == 2" @successImport="successImport" @handelClickBack="handelClickBack" @updateProgress="updateProgress" :fileCode="fileCode" :fileCodeP="fileCodeP"  @updateoperatorName="updateoperatorName"></execute-task>
+        <complete-task v-if="progress == 3"@handelClickBack="handelClickBack" :fileCodeP="fileCodeP" @updateoperatorName="updateoperatorName" :fileCode="fileCode"></complete-task>
+      </div>
+    </el-card>
   </div>
 </template>
-<script>
-import smartImportAdd from "./smartImportAdd";
-import smartImportDetail from "./smartImportDetail";
-
+  <script>
+import createdTask from './createdTask.vue'
+import executeTask from './executeTask.vue'
+import completeTask from './completeTask.vue'
 export default {
   data() {
-    return {};
+    return {
+      progress:1,
+      fileCode:null,
+      progressNum:null,
+      createdTime:null,
+      operatorName:null
+    };
   },
   props: {
-    pageType: String,
-    default: "",
+    fileCodeP:{
+      type:String,
+      default:null
+    },
+    taskId:{
+      type:String,
+      default:null
+    },
+    processStatus:{
+      type:String,
+      default:null
+    }
+  },
+  created() {
+    console.log(this.processStatus);
+    if(this.processStatus){
+      this.progress = this.processStatus == 'processing'?2:3
+    }
   },
-  created() {},
   methods: {
-    handleClose(){
-      this.$emit("handleClose");
+    handelClickUpload(fileCode){
+        this.progress = 2;
+        this.fileCode = fileCode;
+    },
+    handelClickBack(){
+        this.$emit('handleClose');
+    },
+    successImport(){
+      this.progress = 3;
+    },
+    updateProgress(num){
+      this.progressNum = num;
     },
-    handelClickCloseUpload(){
-      this.$emit("handelClickCloseUpload");
+    updateoperatorName({operatorName,createdTime}){
+      this.operatorName = operatorName;
+      this.createdTime = createdTime;
     },
   },
-  components: {smartImportAdd,smartImportDetail},
+  components: {createdTask,executeTask,completeTask},
   computed: {},
   watch: {},
 };
 </script>
-<style lang="scss" scoped>
-
+  <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
+@import "@/assets/scss/pages/smartImport.scss";
+.showNum{
+  /deep/.el-step__description{
+    display: none;
+  }
+}
 </style>
+  
\ No newline at end of file
diff --git a/src/views/modules/base/smartImport/index.vue b/src/views/modules/base/smartImport/index.vue
index a283664ad..81fa5930a 100644
--- a/src/views/modules/base/smartImport/index.vue
+++ b/src/views/modules/base/smartImport/index.vue
@@ -41,7 +41,7 @@
           <el-table-column type="selection" fixed="left" align="center" width="50" />
           <el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 
-          <el-table-column prop="originFileName" align="center"  label="任务名称" :show-overflow-tooltip="true">
+          <el-table-column prop="taskName" align="center"  label="任务名称" :show-overflow-tooltip="true">
           </el-table-column>
           <el-table-column prop="importCategory" align="center" width="100" label="任务类型" :show-overflow-tooltip="true">
             <template slot-scope="scope">
@@ -66,7 +66,7 @@
           </el-table-column>
           <el-table-column prop="importFailNum" align="center" width="80" label="失败数目" :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="createdByName" align="center" width="100" label="操作人" :show-overflow-tooltip="true"> 
+          <el-table-column prop="operatorName" align="center" width="100" label="操作人" :show-overflow-tooltip="true"> 
           </el-table-column>
           <el-table-column prop="completedTime" align="center" width="180" label="操作完成时间"
             :show-overflow-tooltip="true">
@@ -87,10 +87,10 @@
         </div>
       </div>
     </div>
-    <div v-if=" pageType == 'detail' || pageType == 'add'">
+    <div v-if="pageType == 'add'">
       <!-- :eventDetailData="eventDetailData" -->
             <smart-import-info ref="eleEditForm" :pageType="pageType"  
-                @handleClose="handleClose" @handleOk="handleOk"/>
+                @handleClose="handleClose" @handleOk="handleOk" :fileCodeP="fileCode" :taskId="taskId" :processStatus="processStatus"/>
         </div>
   </div>
 </template>
@@ -121,8 +121,11 @@ export default {
       dicts: {
         import_status:[],
         resident_category_import:[],
-      
       }, //字典对象
+
+      fileCode:null,
+      taskId:null,
+      processStatus:null,
     };
   },
   computed: {
@@ -184,13 +187,17 @@ export default {
     },
     //   查看详情触发事件
     async handleDetail(row) {
-      this.pageType = "detail";
+      this.pageType = "add";
+      const {taskId,fileCode,processStatus} = row;
+      this.taskId = taskId;
+      this.fileCode = fileCode;
+      this.processStatus = processStatus;
     },
    
     //  新增弹出框组件取消事件
     handleClose() {
       this.pageType = "list";
-     
+      this.processStatus = null;
     },
     //  新增弹出框组件确定事件
     handleOk(type) {
@@ -229,7 +236,7 @@ export default {
     //   获取列表
     async getTableData() {
       this.tableLoading = true;
-      const url = "/commonservice/import-task/page";
+      const url = "/commonservice/import-task/pageList";
       const { pageSize, pageNo, formData } = this;
       const { data, code, msg } = await requestPost(url, {
         pageSize,