From b83120c678f0f66b334b5a15e4742f71d3191792 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 03 三月 2023 17:55:40 +0800
Subject: [PATCH] yxh

---
 ruoyi-ui/src/views/smartor/svytopic/index.vue        |  450 ++++--------
 ruoyi-ui/src/views/smartor/svyfinishoption/index.vue |  328 +++++++++
 ruoyi-ui/src/views/smartor/svyfinishtopic/index.vue  |  334 +++++++++
 ruoyi-ui/src/api/smartor/svyfinishtopic.js           |   44 +
 ruoyi-ui/src/api/smartor/finish.js                   |   44 +
 ruoyi-ui/src/api/smartor/svyfinish.js                |   44 +
 ruoyi-ui/src/views/smartor/svyfinish/index.vue       |  349 +++++++++
 ruoyi-ui/src/views/smartor/svytopicoption/index.vue  |  453 +++---------
 ruoyi-ui/src/api/smartor/svyfinishoption.js          |   44 +
 9 files changed, 1,452 insertions(+), 638 deletions(-)

diff --git a/ruoyi-ui/src/api/smartor/finish.js b/ruoyi-ui/src/api/smartor/finish.js
new file mode 100644
index 0000000..defe939
--- /dev/null
+++ b/ruoyi-ui/src/api/smartor/finish.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 鏌ヨ闂嵎鏈�缁堢粨鏋滃垪琛�
+export function listFinish(query) {
+  return request({
+    url: '/smartor/finish/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 鏌ヨ闂嵎鏈�缁堢粨鏋滆缁�
+export function getFinish(id) {
+  return request({
+    url: '/smartor/finish/' + id,
+    method: 'get'
+  })
+}
+
+// 鏂板闂嵎鏈�缁堢粨鏋�
+export function addFinish(data) {
+  return request({
+    url: '/smartor/finish',
+    method: 'post',
+    data: data
+  })
+}
+
+// 淇敼闂嵎鏈�缁堢粨鏋�
+export function updateFinish(data) {
+  return request({
+    url: '/smartor/finish',
+    method: 'put',
+    data: data
+  })
+}
+
+// 鍒犻櫎闂嵎鏈�缁堢粨鏋�
+export function delFinish(id) {
+  return request({
+    url: '/smartor/finish/' + id,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/api/smartor/svyfinish.js b/ruoyi-ui/src/api/smartor/svyfinish.js
new file mode 100644
index 0000000..a80fe4a
--- /dev/null
+++ b/ruoyi-ui/src/api/smartor/svyfinish.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 鏌ヨ闂嵎鏈�缁堢粨鏋滃垪琛�
+export function listSvyfinish(query) {
+  return request({
+    url: '/smartor/svyfinish/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 鏌ヨ闂嵎鏈�缁堢粨鏋滆缁�
+export function getSvyfinish(id) {
+  return request({
+    url: '/smartor/svyfinish/' + id,
+    method: 'get'
+  })
+}
+
+// 鏂板闂嵎鏈�缁堢粨鏋�
+export function addSvyfinish(data) {
+  return request({
+    url: '/smartor/svyfinish',
+    method: 'post',
+    data: data
+  })
+}
+
+// 淇敼闂嵎鏈�缁堢粨鏋�
+export function updateSvyfinish(data) {
+  return request({
+    url: '/smartor/svyfinish',
+    method: 'put',
+    data: data
+  })
+}
+
+// 鍒犻櫎闂嵎鏈�缁堢粨鏋�
+export function delSvyfinish(id) {
+  return request({
+    url: '/smartor/svyfinish/' + id,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/api/smartor/svyfinishoption.js b/ruoyi-ui/src/api/smartor/svyfinishoption.js
new file mode 100644
index 0000000..a4389d8
--- /dev/null
+++ b/ruoyi-ui/src/api/smartor/svyfinishoption.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 鏌ヨ闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏鍒楄〃
+export function listSvyfinishoption(query) {
+  return request({
+    url: '/smartor/svyfinishoption/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 鏌ヨ闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏璇︾粏
+export function getSvyfinishoption(id) {
+  return request({
+    url: '/smartor/svyfinishoption/' + id,
+    method: 'get'
+  })
+}
+
+// 鏂板闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏
+export function addSvyfinishoption(data) {
+  return request({
+    url: '/smartor/svyfinishoption',
+    method: 'post',
+    data: data
+  })
+}
+
+// 淇敼闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏
+export function updateSvyfinishoption(data) {
+  return request({
+    url: '/smartor/svyfinishoption',
+    method: 'put',
+    data: data
+  })
+}
+
+// 鍒犻櫎闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏
+export function delSvyfinishoption(id) {
+  return request({
+    url: '/smartor/svyfinishoption/' + id,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/api/smartor/svyfinishtopic.js b/ruoyi-ui/src/api/smartor/svyfinishtopic.js
new file mode 100644
index 0000000..775ef5c
--- /dev/null
+++ b/ruoyi-ui/src/api/smartor/svyfinishtopic.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 鏌ヨ闂嵎璋冩煡缁撴灉璇︽儏鍒楄〃
+export function listSvyfinishtopic(query) {
+  return request({
+    url: '/smartor/svyfinishtopic/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 鏌ヨ闂嵎璋冩煡缁撴灉璇︽儏璇︾粏
+export function getSvyfinishtopic(id) {
+  return request({
+    url: '/smartor/svyfinishtopic/' + id,
+    method: 'get'
+  })
+}
+
+// 鏂板闂嵎璋冩煡缁撴灉璇︽儏
+export function addSvyfinishtopic(data) {
+  return request({
+    url: '/smartor/svyfinishtopic',
+    method: 'post',
+    data: data
+  })
+}
+
+// 淇敼闂嵎璋冩煡缁撴灉璇︽儏
+export function updateSvyfinishtopic(data) {
+  return request({
+    url: '/smartor/svyfinishtopic',
+    method: 'put',
+    data: data
+  })
+}
+
+// 鍒犻櫎闂嵎璋冩煡缁撴灉璇︽儏
+export function delSvyfinishtopic(id) {
+  return request({
+    url: '/smartor/svyfinishtopic/' + id,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/views/smartor/svyfinish/index.vue b/ruoyi-ui/src/views/smartor/svyfinish/index.vue
new file mode 100644
index 0000000..b149395
--- /dev/null
+++ b/ruoyi-ui/src/views/smartor/svyfinish/index.vue
@@ -0,0 +1,349 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label=" 闂嵎鏍囬 " prop="svytitle">
+        <el-input
+          v-model="queryParams.svytitle"
+          placeholder="璇疯緭鍏� 闂嵎鏍囬 "
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label=" 鎬诲緱鍒� " prop="totalscore">
+        <el-input
+          v-model="queryParams.totalscore"
+          placeholder="璇疯緭鍏� 鎬诲緱鍒� "
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label=" 鏈烘瀯ID " prop="orgid">
+        <el-input
+          v-model="queryParams.orgid"
+          placeholder="璇疯緭鍏� 鏈烘瀯ID "
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label=" 鏄惁寮傚父 " prop="isabnormal">
+        <el-input
+          v-model="queryParams.isabnormal"
+          placeholder="璇疯緭鍏� 鏄惁寮傚父 "
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['smartor:svyfinish:add']"
+        >鏂板</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['smartor:svyfinish:edit']"
+        >淇敼</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['smartor:svyfinish:remove']"
+        >鍒犻櫎</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['smartor:svyfinish:export']"
+        >瀵煎嚭</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="svyfinishList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label=" 鑷ID " align="center" prop="id" />
+      <el-table-column label=" 鎮h�匢D " align="center" prop="patid" />
+      <el-table-column label=" 鍏宠仈鏂规ID " align="center" prop="schemeid" />
+      <el-table-column label=" 闂嵎鏍囬 " align="center" prop="svytitle" />
+      <el-table-column label=" 闂嵎ID " align="center" prop="svyid" />
+      <el-table-column label=" 鎬诲緱鍒� " align="center" prop="totalscore" />
+      <el-table-column label=" 鍙嶉缁撴灉鍐呭 " align="center" prop="resultcontent" />
+      <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
+      <el-table-column label=" 灞曠ず寰楀垎 " align="center" prop="isshowscore" />
+      <el-table-column label=" 璁″垝ID " align="center" prop="schemeplanid" />
+      <el-table-column label=" 浠诲姟ID " align="center" prop="schemetaskid" />
+      <el-table-column label=" 鏄惁寮傚父 " align="center" prop="isabnormal" />
+      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:svyfinish:edit']"
+          >淇敼</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:svyfinish:remove']"
+          >鍒犻櫎</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 娣诲姞鎴栦慨鏀归棶鍗锋渶缁堢粨鏋滃璇濇 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label=" 鎮h�匢D " prop="patid">
+          <el-input v-model="form.patid" placeholder="璇疯緭鍏� 鎮h�匢D " />
+        </el-form-item>
+        <el-form-item label=" 鍏宠仈鏂规ID " prop="schemeid">
+          <el-input v-model="form.schemeid" placeholder="璇疯緭鍏� 鍏宠仈鏂规ID " />
+        </el-form-item>
+        <el-form-item label=" 闂嵎鏍囬 " prop="svytitle">
+          <el-input v-model="form.svytitle" placeholder="璇疯緭鍏� 闂嵎鏍囬 " />
+        </el-form-item>
+        <el-form-item label=" 闂嵎ID " prop="svyid">
+          <el-input v-model="form.svyid" placeholder="璇疯緭鍏� 闂嵎ID " />
+        </el-form-item>
+        <el-form-item label=" 鎬诲緱鍒� " prop="totalscore">
+          <el-input v-model="form.totalscore" placeholder="璇疯緭鍏� 鎬诲緱鍒� " />
+        </el-form-item>
+        <el-form-item label=" 鍙嶉缁撴灉鍐呭 ">
+          <editor v-model="form.resultcontent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
+          <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+        </el-form-item>
+        <el-form-item label=" 灞曠ず寰楀垎 " prop="isshowscore">
+          <el-input v-model="form.isshowscore" placeholder="璇疯緭鍏� 灞曠ず寰楀垎 " />
+        </el-form-item>
+        <el-form-item label=" 璁″垝ID " prop="schemeplanid">
+          <el-input v-model="form.schemeplanid" placeholder="璇疯緭鍏� 璁″垝ID " />
+        </el-form-item>
+        <el-form-item label=" 浠诲姟ID " prop="schemetaskid">
+          <el-input v-model="form.schemetaskid" placeholder="璇疯緭鍏� 浠诲姟ID " />
+        </el-form-item>
+        <el-form-item label=" 鏄惁寮傚父 " prop="isabnormal">
+          <el-input v-model="form.isabnormal" placeholder="璇疯緭鍏� 鏄惁寮傚父 " />
+        </el-form-item>
+        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
+        </el-form-item>
+        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
+          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
+        </el-form-item>
+        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
+          <el-date-picker clearable
+            v-model="form.uploadTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+        <el-button @click="cancel">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSvyfinish, getSvyfinish, delSvyfinish, addSvyfinish, updateSvyfinish } from "@/api/smartor/svyfinish";
+
+export default {
+  name: "Svyfinish",
+  data() {
+    return {
+      // 閬僵灞�
+      loading: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 闂嵎鏈�缁堢粨鏋滆〃鏍兼暟鎹�
+      svyfinishList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        svytitle: null,
+        totalscore: null,
+        orgid: null,
+        isabnormal: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        delFlag: [
+          { required: true, message: " 鍒犻櫎鏍囪 涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        isupload: [
+          { required: true, message: " 涓婁紶鏍囪 涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 鏌ヨ闂嵎鏈�缁堢粨鏋滃垪琛� */
+    getList() {
+      this.loading = true;
+      listSvyfinish(this.queryParams).then(response => {
+        this.svyfinishList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        id: null,
+        patid: null,
+        schemeid: null,
+        svytitle: null,
+        svyid: null,
+        totalscore: null,
+        resultcontent: null,
+        orgid: null,
+        isshowscore: null,
+        schemeplanid: null,
+        schemetaskid: null,
+        isabnormal: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        isupload: null,
+        uploadTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞闂嵎鏈�缁堢粨鏋�";
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getSvyfinish(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "淇敼闂嵎鏈�缁堢粨鏋�";
+      });
+    },
+    /** 鎻愪氦鎸夐挳 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateSvyfinish(this.form).then(response => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSvyfinish(this.form).then(response => {
+              this.$modal.msgSuccess("鏂板鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('鏄惁纭鍒犻櫎闂嵎鏈�缁堢粨鏋滅紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+        return delSvyfinish(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      }).catch(() => {});
+    },
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      this.download('smartor/svyfinish/export', {
+        ...this.queryParams
+      }, `svyfinish_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/smartor/svyfinishoption/index.vue b/ruoyi-ui/src/views/smartor/svyfinishoption/index.vue
new file mode 100644
index 0000000..88cdbfe
--- /dev/null
+++ b/ruoyi-ui/src/views/smartor/svyfinishoption/index.vue
@@ -0,0 +1,328 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label=" 鎵�閫夐鐩�夐」ID " prop="psqoptionid">
+        <el-input
+          v-model="queryParams.psqoptionid"
+          placeholder="璇疯緭鍏� 鎵�閫夐鐩�夐」ID "
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label=" 鏈烘瀯ID " prop="orgid">
+        <el-input
+          v-model="queryParams.orgid"
+          placeholder="璇疯緭鍏� 鏈烘瀯ID "
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label=" 鏈哄櫒浜洪�夋嫨鏍囪 " prop="isrobot">
+        <el-input
+          v-model="queryParams.isrobot"
+          placeholder="璇疯緭鍏� 鏈哄櫒浜洪�夋嫨鏍囪 "
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['smartor:svyfinishoption:add']"
+        >鏂板</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['smartor:svyfinishoption:edit']"
+        >淇敼</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['smartor:svyfinishoption:remove']"
+        >鍒犻櫎</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['smartor:svyfinishoption:export']"
+        >瀵煎嚭</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="svyfinishoptionList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label=" 鑷ID " align="center" prop="id" />
+      <el-table-column label=" 璇︽儏ID " align="center" prop="finshresultdetailid" />
+      <el-table-column label=" 鎵�閫夐鐩�夐」ID " align="center" prop="psqoptionid" />
+      <el-table-column label=" 鎵�濉�夐」鍐呭 " align="center" prop="content" />
+      <el-table-column label=" 褰撳墠閫夐」寰楀垎 " align="center" prop="score" />
+      <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
+      <el-table-column label=" 鏈哄櫒浜洪�夋嫨鏍囪 " align="center" prop="isrobot" />
+      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:svyfinishoption:edit']"
+          >淇敼</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:svyfinishoption:remove']"
+          >鍒犻櫎</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 娣诲姞鎴栦慨鏀归棶鍗锋渶缁堢粨鏋滈�夐」璇︽儏瀵硅瘽妗� -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label=" 璇︽儏ID " prop="finshresultdetailid">
+          <el-input v-model="form.finshresultdetailid" placeholder="璇疯緭鍏� 璇︽儏ID " />
+        </el-form-item>
+        <el-form-item label=" 鎵�閫夐鐩�夐」ID " prop="psqoptionid">
+          <el-input v-model="form.psqoptionid" placeholder="璇疯緭鍏� 鎵�閫夐鐩�夐」ID " />
+        </el-form-item>
+        <el-form-item label=" 鎵�濉�夐」鍐呭 ">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label=" 褰撳墠閫夐」寰楀垎 " prop="score">
+          <el-input v-model="form.score" placeholder="璇疯緭鍏� 褰撳墠閫夐」寰楀垎 " />
+        </el-form-item>
+        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
+          <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+        </el-form-item>
+        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+          <el-select v-model="form.delFlag" placeholder="璇烽�夋嫨 鍒犻櫎鏍囪 ">
+            <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
+          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
+        </el-form-item>
+        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
+          <el-date-picker clearable
+            v-model="form.uploadTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label=" 鏄惁寮傚父 " prop="isabnormal">
+          <el-input v-model="form.isabnormal" placeholder="璇疯緭鍏� 鏄惁寮傚父 " />
+        </el-form-item>
+        <el-form-item label=" 鏈哄櫒浜洪�夋嫨鏍囪 " prop="isrobot">
+          <el-input v-model="form.isrobot" placeholder="璇疯緭鍏� 鏈哄櫒浜洪�夋嫨鏍囪 " />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+        <el-button @click="cancel">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSvyfinishoption, getSvyfinishoption, delSvyfinishoption, addSvyfinishoption, updateSvyfinishoption } from "@/api/smartor/svyfinishoption";
+
+export default {
+  name: "Svyfinishoption",
+  dicts: ['sys_yes_no'],
+  data() {
+    return {
+      // 閬僵灞�
+      loading: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏琛ㄦ牸鏁版嵁
+      svyfinishoptionList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        psqoptionid: null,
+        content: null,
+        orgid: null,
+        isrobot: null
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        delFlag: [
+          { required: true, message: " 鍒犻櫎鏍囪 涓嶈兘涓虹┖", trigger: "change" }
+        ],
+        isupload: [
+          { required: true, message: " 涓婁紶鏍囪 涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 鏌ヨ闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏鍒楄〃 */
+    getList() {
+      this.loading = true;
+      listSvyfinishoption(this.queryParams).then(response => {
+        this.svyfinishoptionList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        id: null,
+        finshresultdetailid: null,
+        psqoptionid: null,
+        content: null,
+        score: null,
+        orgid: null,
+        delFlag: null,
+        updateBy: null,
+        updateTime: null,
+        createBy: null,
+        createTime: null,
+        isupload: null,
+        uploadTime: null,
+        isabnormal: null,
+        isrobot: null
+      };
+      this.resetForm("form");
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏";
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getSvyfinishoption(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "淇敼闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏";
+      });
+    },
+    /** 鎻愪氦鎸夐挳 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateSvyfinishoption(this.form).then(response => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSvyfinishoption(this.form).then(response => {
+              this.$modal.msgSuccess("鏂板鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('鏄惁纭鍒犻櫎闂嵎鏈�缁堢粨鏋滈�夐」璇︽儏缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+        return delSvyfinishoption(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      }).catch(() => {});
+    },
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      this.download('smartor/svyfinishoption/export', {
+        ...this.queryParams
+      }, `svyfinishoption_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/smartor/svyfinishtopic/index.vue b/ruoyi-ui/src/views/smartor/svyfinishtopic/index.vue
new file mode 100644
index 0000000..2ed3eb6
--- /dev/null
+++ b/ruoyi-ui/src/views/smartor/svyfinishtopic/index.vue
@@ -0,0 +1,334 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label=" 褰撳墠棰樼洰ID " prop="topicid">
+        <el-input
+          v-model="queryParams.topicid"
+          placeholder="璇疯緭鍏� 褰撳墠棰樼洰ID "
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label=" 褰撳墠閫夐」寰楀垎 " prop="score">
+        <el-input
+          v-model="queryParams.score"
+          placeholder="璇疯緭鍏� 褰撳墠閫夐」寰楀垎 "
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label=" 鏈烘瀯ID " prop="orgid">
+        <el-input
+          v-model="queryParams.orgid"
+          placeholder="璇疯緭鍏� 鏈烘瀯ID "
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
+        <el-input
+          v-model="queryParams.isupload"
+          placeholder="璇疯緭鍏� 涓婁紶鏍囪 "
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
+        <el-date-picker clearable
+          v-model="queryParams.uploadTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['smartor:svyfinishtopic:add']"
+        >鏂板</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['smartor:svyfinishtopic:edit']"
+        >淇敼</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['smartor:svyfinishtopic:remove']"
+        >鍒犻櫎</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['smartor:svyfinishtopic:export']"
+        >瀵煎嚭</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="svyfinishtopicList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label=" 鑷ID " align="center" prop="id" />
+      <el-table-column label=" 闂嵎ID " align="center" prop="psqid" />
+      <el-table-column label=" 鏈�缁堢粨鏋淚D " align="center" prop="resultid" />
+      <el-table-column label=" 褰撳墠棰樼洰ID " align="center" prop="topicid" />
+      <el-table-column label=" 褰撳墠閫夐」寰楀垎 " align="center" prop="score" />
+      <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
+      <el-table-column label=" 涓婁紶鏍囪 " align="center" prop="isupload" />
+      <el-table-column label=" 涓婁紶鏃堕棿 " align="center" prop="uploadTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:svyfinishtopic:edit']"
+          >淇敼</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:svyfinishtopic:remove']"
+          >鍒犻櫎</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 娣诲姞鎴栦慨鏀归棶鍗疯皟鏌ョ粨鏋滆鎯呭璇濇 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label=" 闂嵎ID " prop="psqid">
+          <el-input v-model="form.psqid" placeholder="璇疯緭鍏� 闂嵎ID " />
+        </el-form-item>
+        <el-form-item label=" 鏈�缁堢粨鏋淚D " prop="resultid">
+          <el-input v-model="form.resultid" placeholder="璇疯緭鍏� 鏈�缁堢粨鏋淚D " />
+        </el-form-item>
+        <el-form-item label=" 褰撳墠棰樼洰ID " prop="topicid">
+          <el-input v-model="form.topicid" placeholder="璇疯緭鍏� 褰撳墠棰樼洰ID " />
+        </el-form-item>
+        <el-form-item label=" 褰撳墠閫夐」寰楀垎 " prop="score">
+          <el-input v-model="form.score" placeholder="璇疯緭鍏� 褰撳墠閫夐」寰楀垎 " />
+        </el-form-item>
+        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
+          <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+        </el-form-item>
+        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
+        </el-form-item>
+        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
+          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
+        </el-form-item>
+        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
+          <el-date-picker clearable
+            v-model="form.uploadTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+        <el-button @click="cancel">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSvyfinishtopic, getSvyfinishtopic, delSvyfinishtopic, addSvyfinishtopic, updateSvyfinishtopic } from "@/api/smartor/svyfinishtopic";
+
+export default {
+  name: "Svyfinishtopic",
+  data() {
+    return {
+      // 閬僵灞�
+      loading: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 闂嵎璋冩煡缁撴灉璇︽儏琛ㄦ牸鏁版嵁
+      svyfinishtopicList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        topicid: null,
+        score: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        delFlag: [
+          { required: true, message: " 鍒犻櫎鏍囪 涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        isupload: [
+          { required: true, message: " 涓婁紶鏍囪 涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 鏌ヨ闂嵎璋冩煡缁撴灉璇︽儏鍒楄〃 */
+    getList() {
+      this.loading = true;
+      listSvyfinishtopic(this.queryParams).then(response => {
+        this.svyfinishtopicList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        id: null,
+        psqid: null,
+        resultid: null,
+        topicid: null,
+        score: null,
+        orgid: null,
+        delFlag: null,
+        updateBy: null,
+        updateTime: null,
+        createBy: null,
+        createTime: null,
+        isupload: null,
+        uploadTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞闂嵎璋冩煡缁撴灉璇︽儏";
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getSvyfinishtopic(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "淇敼闂嵎璋冩煡缁撴灉璇︽儏";
+      });
+    },
+    /** 鎻愪氦鎸夐挳 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateSvyfinishtopic(this.form).then(response => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSvyfinishtopic(this.form).then(response => {
+              this.$modal.msgSuccess("鏂板鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('鏄惁纭鍒犻櫎闂嵎璋冩煡缁撴灉璇︽儏缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+        return delSvyfinishtopic(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      }).catch(() => {});
+    },
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      this.download('smartor/svyfinishtopic/export', {
+        ...this.queryParams
+      }, `svyfinishtopic_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/smartor/svytopic/index.vue b/ruoyi-ui/src/views/smartor/svytopic/index.vue
index f7a34f2..9cd6cbf 100644
--- a/ruoyi-ui/src/views/smartor/svytopic/index.vue
+++ b/ruoyi-ui/src/views/smartor/svytopic/index.vue
@@ -1,269 +1,97 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label=" 棰樼洰鍐呭 " prop="topic">
-
-        <el-input v-model="queryParams.topic" placeholder="璇疯緭鍏� 棰樼洰鍐呭 " clearable @keyup.enter.native="handleQuery" />
-
-
+      <el-form-item label=" 鑰佺増鏈琁D " prop="oldid">
+        <el-input
+          v-model="queryParams.oldid"
+          placeholder="璇疯緭鍏� 鑰佺増鏈琁D "
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-
-
-      <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-
-
-
-        <el-input v-model="queryParams.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " clearable @keyup.enter.native="handleQuery" />
-
-
-
-      </el-form-item>
-
-
-
-
-
-
-
       <el-form-item label=" 鏄惁闅愯棌 " prop="ishide">
-
-
-
-
-
-
-
         <el-select v-model="queryParams.ishide" placeholder="璇烽�夋嫨 鏄惁闅愯棌 " clearable>
-
-
-
-
-
-
-
-          <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
-
-
-
-
-
-
-
+          <el-option
+            v-for="dict in dict.type.sys_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
-
-
-
-
-
-
-
       </el-form-item>
-
-
-
-
-
-
-
+      <el-form-item label=" 鏈烘瀯ID " prop="orgid">
+        <el-input
+          v-model="queryParams.orgid"
+          placeholder="璇疯緭鍏� 鏈烘瀯ID "
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
-
-
-
-
-
-
-
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
-
-
-
-
-
-
-
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
-
-
-
-
-
-
-
       </el-form-item>
-
-
-
-
-
-
-
     </el-form>
 
-
-
     <el-row :gutter="10" class="mb8">
-
       <el-col :span="1.5">
-
-
-
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['smartor:svytopic:add']">鏂板</el-button>
-
-
-
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['smartor:svytopic:add']"
+        >鏂板</el-button>
       </el-col>
-
-
-
       <el-col :span="1.5">
-
-
-
-
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['smartor:svytopic:edit']">淇敼</el-button>
-
-
-
-
-
-
-
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['smartor:svytopic:edit']"
+        >淇敼</el-button>
       </el-col>
-
-
-
-
-
-
-
       <el-col :span="1.5">
-
-
-
-
-
-
-
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['smartor:svytopic:remove']">鍒犻櫎</el-button>
-
-
-
-
-
-
-
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['smartor:svytopic:remove']"
+        >鍒犻櫎</el-button>
       </el-col>
-
-
-
-
-
-
-
       <el-col :span="1.5">
-
-
-
-
-
-
-
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['smartor:svytopic:export']">瀵煎嚭</el-button>
-
-
-
-
-
-
-
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['smartor:svytopic:export']"
+        >瀵煎嚭</el-button>
       </el-col>
-
-
-
-
-
-
-
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-
-
-
-
-
-
-
     </el-row>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     <el-table v-loading="loading" :data="svytopicList" @selection-change="handleSelectionChange">
-
-
-
-
-
-
-
       <el-table-column type="selection" width="55" align="center" />
-
-
-
-
-
-
-
-      <el-table-column label=" 棰樼洰绫诲瀷 " align="center" prop="topictype" />
-
-
-
-
-
-
-
+      <el-table-column label=" 鑷ID " align="center" prop="topicid" />
+      <el-table-column label=" 闂嵎ID " align="center" prop="svyid" />
+      <el-table-column label=" 棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖ " align="center" prop="topictype" />
       <el-table-column label=" 棰樼洰 " align="center" prop="topic" />
-
-
-
-
-
-
-
+      <el-table-column label=" 鎺掑簭 " align="center" prop="sort" />
       <el-table-column label=" 鏄惁闅愯棌 " align="center" prop="ishide">
-
-
-
-
-
-
-
         <template slot-scope="scope">
-
-
-
-
-
-
-
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.ishide" />
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.ishide"/>
         </template>
       </el-table-column>
-      <el-table-column label=" 褰掑睘鏈烘瀯 " align="center" prop="orgid" />
+      <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
       <el-table-column label=" 鍒涘缓鏃堕棿 " align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -271,71 +99,101 @@
       </el-table-column>
       <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['smartor:svytopic:edit']">
-
-
-
-
-
-
-
-            淇敼</el-button>
-
-
-
-
-
-
-
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['smartor:svytopic:remove']">鍒犻櫎</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:svytopic:edit']"
+          >淇敼</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:svytopic:remove']"
+          >鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
-
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 娣诲姞鎴栦慨鏀归棶鍗烽鐩璇濇 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row><el-col :span="8">
-            <el-form-item label=" 棰樼洰缂栧彿" prop="topiccode">
-              <el-input v-model="form.topiccode" placeholder="璇疯緭鍏� 棰樼洰缂栧彿 " />
-            </el-form-item> </el-col><el-col :span="8">
-            <el-form-item label=" 棰樼洰绫诲瀷 " prop="topictype">
-              <el-select v-model="form.topictype" placeholder="璇烽�夋嫨">
-                <el-option label="鍗曢��" value="1"></el-option>
-                <el-option label="澶氶��" value="2"></el-option>
-                <el-option label="濉┖" value="3"></el-option>
-              </el-select>
-            </el-form-item> </el-col>
-          <el-col :span="8"><el-form-item label=" 鏄惁蹇呭~ " prop="ismandatory">
-              <el-select v-model="form.ismandatory" placeholder="璇烽�夋嫨 鏄惁蹇呭~ ">
-                <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
-                  :value="parseInt(dict.value)"></el-option>
-              </el-select>
-            </el-form-item></el-col></el-row><el-row>
-          <el-form-item label=" 棰樼洰 " prop="topic">
-            <el-input v-model="form.topic" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-          </el-form-item></el-row>
-        <el-row><el-form-item label=" 褰掑睘鏈烘瀯 " prop="orgid">
-            <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
-          </el-form-item></el-row> <el-row><el-col :span="8">
-            <el-form-item label=" 鏄惁闅愯棌 " prop="ishide">
-              <el-select v-model="form.ishide" placeholder="璇烽�夋嫨 鏄惁闅愯棌 ">
-                <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
-                  :value="parseInt(dict.value)"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col><el-col :span="8">
-            <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
-              <el-select v-model="form.delFlag" placeholder="璇烽�夋嫨 鍒犻櫎鏍囪 ">
-                <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
-              </el-select>
-            </el-form-item></el-col></el-row>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label=" 鑰佺増鏈琁D " prop="oldid">
+          <el-input v-model="form.oldid" placeholder="璇疯緭鍏� 鑰佺増鏈琁D " />
+        </el-form-item>
+        <el-form-item label=" 闂嵎ID " prop="svyid">
+          <el-input v-model="form.svyid" placeholder="璇疯緭鍏� 闂嵎ID " />
+        </el-form-item>
+        <el-form-item label=" 棰樼洰Code " prop="topiccode">
+          <el-input v-model="form.topiccode" placeholder="璇疯緭鍏� 棰樼洰Code " />
+        </el-form-item>
+        <el-form-item label=" 棰樼洰 " prop="topic">
+          <el-input v-model="form.topic" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+        </el-form-item>
+        <el-form-item label=" 鎺掑簭 " prop="sort">
+          <el-input v-model="form.sort" placeholder="璇疯緭鍏� 鎺掑簭 " />
+        </el-form-item>
+        <el-form-item label=" 鏄惁蹇呭~ " prop="ismandatory">
+          <el-select v-model="form.ismandatory" placeholder="璇烽�夋嫨 鏄惁蹇呭~ ">
+            <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label=" 鏄惁闅愯棌 " prop="ishide">
+          <el-select v-model="form.ishide" placeholder="璇烽�夋嫨 鏄惁闅愯棌 ">
+            <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+          <el-select v-model="form.delFlag" placeholder="璇烽�夋嫨 鍒犻櫎鏍囪 ">
+            <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
+          <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+        </el-form-item>
+        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
+          <el-select v-model="form.isupload" placeholder="璇烽�夋嫨 涓婁紶鏍囪 ">
+            <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
+          <el-date-picker clearable
+            v-model="form.uploadTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
+          </el-date-picker>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -448,7 +306,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.topicid)
-      this.single = selection.length !== 1
+      this.single = selection.length!==1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -490,12 +348,12 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const topicids = row.topicid || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎闂嵎棰樼洰缂栧彿涓�"' + topicids + '"鐨勬暟鎹」锛�').then(function () {
+      this.$modal.confirm('鏄惁纭鍒犻櫎闂嵎棰樼洰缂栧彿涓�"' + topicids + '"鐨勬暟鎹」锛�').then(function() {
         return delSvytopic(topicids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => { });
+      }).catch(() => {});
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/smartor/svytopicoption/index.vue b/ruoyi-ui/src/views/smartor/svytopicoption/index.vue
index 278718a..e927599 100644
--- a/ruoyi-ui/src/views/smartor/svytopicoption/index.vue
+++ b/ruoyi-ui/src/views/smartor/svytopicoption/index.vue
@@ -1,181 +1,12 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label=" 棰樼洰ID " prop="topicid">
-        <el-input
-          v-model="queryParams.topicid"
-          placeholder="璇疯緭鍏� 棰樼洰ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label=" 閫夐」鍐呭 " prop="optioncontent">
+        <el-input v-model="queryParams.optioncontent" placeholder="璇疯緭鍏� 閫夐」鍐呭 " clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label=" 闂嵎ID " prop="svyid">
-        <el-input
-          v-model="queryParams.svyid"
-          placeholder="璇疯緭鍏� 闂嵎ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 閫夐」Code " prop="optioncode">
-        <el-input
-          v-model="queryParams.optioncode"
-          placeholder="璇疯緭鍏� 閫夐」Code "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄惁瀛樺湪鏄庣粏 " prop="isexistdetail">
-        <el-input
-          v-model="queryParams.isexistdetail"
-          placeholder="璇疯緭鍏� 鏄惁瀛樺湪鏄庣粏 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄庣粏鏄惁蹇呭~ " prop="detailismandatory">
-        <el-input
-          v-model="queryParams.detailismandatory"
-          placeholder="璇疯緭鍏� 鏄庣粏鏄惁蹇呭~ "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄惁寮傚父椤圭洰 " prop="isexceptionitem">
-        <el-input
-          v-model="queryParams.isexceptionitem"
-          placeholder="璇疯緭鍏� 鏄惁寮傚父椤圭洰 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄惁璺熻繘 " prop="istrack">
-        <el-input
-          v-model="queryParams.istrack"
-          placeholder="璇疯緭鍏� 鏄惁璺熻繘 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鍒嗘暟 " prop="score">
-        <el-input
-          v-model="queryParams.score"
-          placeholder="璇疯緭鍏� 鍒嗘暟 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鎻愮ず " prop="prompt">
-        <el-input
-          v-model="queryParams.prompt"
-          placeholder="璇疯緭鍏� 鎻愮ず "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 璺宠浆 " prop="jump">
-        <el-input
-          v-model="queryParams.jump"
-          placeholder="璇疯緭鍏� 璺宠浆 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鐖堕�夐」ID " prop="parentoptionid">
-        <el-input
-          v-model="queryParams.parentoptionid"
-          placeholder="璇疯緭鍏� 鐖堕�夐」ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄惁浜掓枼 " prop="ismutex">
-        <el-input
-          v-model="queryParams.ismutex"
-          placeholder="璇疯緭鍏� 鏄惁浜掓枼 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 楠岃瘉瑙勫垯 " prop="verifyrule">
-        <el-input
-          v-model="queryParams.verifyrule"
-          placeholder="璇疯緭鍏� 楠岃瘉瑙勫垯 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鎺掑簭 " prop="sort">
-        <el-input
-          v-model="queryParams.sort"
-          placeholder="璇疯緭鍏� 鎺掑簭 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏄惁闄愬埗鑼冨洿 " prop="isrange">
-        <el-input
-          v-model="queryParams.isrange"
-          placeholder="璇疯緭鍏� 鏄惁闄愬埗鑼冨洿 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏈�灏忚寖鍥� " prop="minrange">
-        <el-input
-          v-model="queryParams.minrange"
-          placeholder="璇疯緭鍏� 鏈�灏忚寖鍥� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏈�澶ц寖鍥� " prop="maxrange">
-        <el-input
-          v-model="queryParams.maxrange"
-          placeholder="璇疯緭鍏� 鏈�澶ц寖鍥� "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鑼冨洿闀垮害;鐢ㄤ簬灏忔暟淇濈暀浣嶆暟 " prop="rangelength">
-        <el-input
-          v-model="queryParams.rangelength"
-          placeholder="璇疯緭鍏� 鑼冨洿闀垮害;鐢ㄤ簬灏忔暟淇濈暀浣嶆暟 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-        <el-input
-          v-model="queryParams.orgid"
-          placeholder="璇疯緭鍏� 鏈烘瀯ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁竴鐗堟湰ID " prop="oldid">
-        <el-input
-          v-model="queryParams.oldid"
-          placeholder="璇疯緭鍏� 涓婁竴鐗堟湰ID "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-        <el-input
-          v-model="queryParams.isupload"
-          placeholder="璇疯緭鍏� 涓婁紶鏍囪 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-        <el-date-picker clearable
-          v-model="queryParams.uploadTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-        </el-date-picker>
+      <el-form-item label=" 褰掑鏈烘瀯 " prop="orgid">
+        <el-input v-model="queryParams.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -185,190 +16,128 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['smartor:svytopicoption:add']"
-        >鏂板</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['smartor:svytopicoption:add']">鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['smartor:svytopicoption:edit']"
-        >淇敼</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['smartor:svytopicoption:edit']">淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['smartor:svytopicoption:remove']"
-        >鍒犻櫎</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['smartor:svytopicoption:remove']">鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['smartor:svytopicoption:export']"
-        >瀵煎嚭</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['smartor:svytopicoption:export']">瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="svytopicoptionList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label=" 鑷ID " align="center" prop="optionid" />
-      <el-table-column label=" 棰樼洰ID " align="center" prop="topicid" />
-      <el-table-column label=" 闂嵎ID " align="center" prop="svyid" />
-      <el-table-column label=" 棰樼洰绫诲瀷 " align="center" prop="topictype" />
-      <el-table-column label=" 閫夐」Code " align="center" prop="optioncode" />
-      <el-table-column label=" 閫夐」鍐呭 " align="center" prop="optioncontent" />
-      <el-table-column label=" 鏄惁瀛樺湪鏄庣粏 " align="center" prop="isexistdetail" />
-      <el-table-column label=" 鏄庣粏鏄惁蹇呭~ " align="center" prop="detailismandatory" />
-      <el-table-column label=" 鏄惁寮傚父椤圭洰 " align="center" prop="isexceptionitem" />
-      <el-table-column label=" 鏄惁璺熻繘 " align="center" prop="istrack" />
-      <el-table-column label=" 鍒嗘暟 " align="center" prop="score" />
-      <el-table-column label=" 鎻愮ず " align="center" prop="prompt" />
-      <el-table-column label=" 璺宠浆 " align="center" prop="jump" />
-      <el-table-column label=" 鐖堕�夐」ID " align="center" prop="parentoptionid" />
-      <el-table-column label=" 鏄惁浜掓枼 " align="center" prop="ismutex" />
-      <el-table-column label=" 楠岃瘉瑙勫垯 " align="center" prop="verifyrule" />
-      <el-table-column label=" 鎺掑簭 " align="center" prop="sort" />
-      <el-table-column label=" 楠岃瘉绫诲瀷;0.涓嶉獙璇� 1.鏁存暟 2.灏忔暟 3.鎵嬫満鍙� 4.韬唤璇� 5.鏃ユ湡 " align="center" prop="verificationtype" />
-      <el-table-column label=" 鏄惁闄愬埗鑼冨洿 " align="center" prop="isrange" />
-      <el-table-column label=" 鏈�灏忚寖鍥� " align="center" prop="minrange" />
-      <el-table-column label=" 鏈�澶ц寖鍥� " align="center" prop="maxrange" />
-      <el-table-column label=" 鑼冨洿闀垮害;鐢ㄤ簬灏忔暟淇濈暀浣嶆暟 " align="center" prop="rangelength" />
-      <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid" />
-      <el-table-column label=" 涓婁竴鐗堟湰ID " align="center" prop="oldid" />
-      <el-table-column label=" 涓婁紶鏍囪 " align="center" prop="isupload" />
-      <el-table-column label=" 涓婁紶鏃堕棿 " align="center" prop="uploadTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label=" 棰樼洰绫诲瀷 " width="150" align="center" prop="topictype" />
+      <el-table-column label=" 閫夐」鍐呭 " width="200" align="center" prop="optioncontent" />
+      <el-table-column label=" 鎻愮ず " width="200" align="center" prop="prompt" />
+      <el-table-column label=" 鍒嗘暟 " width="55" align="center" prop="score" />
+      <el-table-column label=" 楠岃瘉瑙勫垯 " width="250" align="center" prop="verifyrule" />
+      <el-table-column label=" 鏄惁瀛樺湪鏄庣粏 " width="150" align="center" prop="isexistdetail" />
+      <el-table-column label=" 褰掑睘鏈烘瀯 " width="200" align="center" prop="orgid" />
       <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['smartor:svytopicoption:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['smartor:svytopicoption:remove']"
-          >鍒犻櫎</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['smartor:svytopicoption:edit']">淇敼</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['smartor:svytopicoption:remove']">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 娣诲姞鎴栦慨鏀归棶鍗烽棶棰橀�夐」瀵硅瘽妗� -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label=" 棰樼洰ID " prop="topicid">
-          <el-input v-model="form.topicid" placeholder="璇疯緭鍏� 棰樼洰ID " />
-        </el-form-item>
-        <el-form-item label=" 闂嵎ID " prop="svyid">
-          <el-input v-model="form.svyid" placeholder="璇疯緭鍏� 闂嵎ID " />
-        </el-form-item>
-        <el-form-item label=" 閫夐」Code " prop="optioncode">
-          <el-input v-model="form.optioncode" placeholder="璇疯緭鍏� 閫夐」Code " />
-        </el-form-item>
-        <el-form-item label=" 閫夐」鍐呭 ">
-          <editor v-model="form.optioncontent" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label=" 鏄惁瀛樺湪鏄庣粏 " prop="isexistdetail">
-          <el-input v-model="form.isexistdetail" placeholder="璇疯緭鍏� 鏄惁瀛樺湪鏄庣粏 " />
-        </el-form-item>
-        <el-form-item label=" 鏄庣粏鏄惁蹇呭~ " prop="detailismandatory">
-          <el-input v-model="form.detailismandatory" placeholder="璇疯緭鍏� 鏄庣粏鏄惁蹇呭~ " />
-        </el-form-item>
-        <el-form-item label=" 鏄惁寮傚父椤圭洰 " prop="isexceptionitem">
-          <el-input v-model="form.isexceptionitem" placeholder="璇疯緭鍏� 鏄惁寮傚父椤圭洰 " />
-        </el-form-item>
-        <el-form-item label=" 鏄惁璺熻繘 " prop="istrack">
-          <el-input v-model="form.istrack" placeholder="璇疯緭鍏� 鏄惁璺熻繘 " />
-        </el-form-item>
-        <el-form-item label=" 鍒嗘暟 " prop="score">
-          <el-input v-model="form.score" placeholder="璇疯緭鍏� 鍒嗘暟 " />
-        </el-form-item>
-        <el-form-item label=" 鎻愮ず " prop="prompt">
-          <el-input v-model="form.prompt" placeholder="璇疯緭鍏� 鎻愮ず " />
-        </el-form-item>
-        <el-form-item label=" 璺宠浆 " prop="jump">
-          <el-input v-model="form.jump" placeholder="璇疯緭鍏� 璺宠浆 " />
-        </el-form-item>
-        <el-form-item label=" 鐖堕�夐」ID " prop="parentoptionid">
-          <el-input v-model="form.parentoptionid" placeholder="璇疯緭鍏� 鐖堕�夐」ID " />
-        </el-form-item>
-        <el-form-item label=" 鏄惁浜掓枼 " prop="ismutex">
-          <el-input v-model="form.ismutex" placeholder="璇疯緭鍏� 鏄惁浜掓枼 " />
-        </el-form-item>
-        <el-form-item label=" 楠岃瘉瑙勫垯 " prop="verifyrule">
-          <el-input v-model="form.verifyrule" placeholder="璇疯緭鍏� 楠岃瘉瑙勫垯 " />
-        </el-form-item>
-        <el-form-item label=" 鎺掑簭 " prop="sort">
-          <el-input v-model="form.sort" placeholder="璇疯緭鍏� 鎺掑簭 " />
-        </el-form-item>
-        <el-form-item label=" 鏄惁闄愬埗鑼冨洿 " prop="isrange">
-          <el-input v-model="form.isrange" placeholder="璇疯緭鍏� 鏄惁闄愬埗鑼冨洿 " />
-        </el-form-item>
-        <el-form-item label=" 鏈�灏忚寖鍥� " prop="minrange">
-          <el-input v-model="form.minrange" placeholder="璇疯緭鍏� 鏈�灏忚寖鍥� " />
-        </el-form-item>
-        <el-form-item label=" 鏈�澶ц寖鍥� " prop="maxrange">
-          <el-input v-model="form.maxrange" placeholder="璇疯緭鍏� 鏈�澶ц寖鍥� " />
-        </el-form-item>
-        <el-form-item label=" 鑼冨洿闀垮害;鐢ㄤ簬灏忔暟淇濈暀浣嶆暟 " prop="rangelength">
-          <el-input v-model="form.rangelength" placeholder="璇疯緭鍏� 鑼冨洿闀垮害;鐢ㄤ簬灏忔暟淇濈暀浣嶆暟 " />
-        </el-form-item>
-        <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-          <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
-        </el-form-item>
-        <el-form-item label=" 涓婁竴鐗堟湰ID " prop="oldid">
-          <el-input v-model="form.oldid" placeholder="璇疯緭鍏� 涓婁竴鐗堟湰ID " />
-        </el-form-item>
-        <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-          <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
-        </el-form-item>
-        <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-          <el-date-picker clearable
-            v-model="form.uploadTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-          </el-date-picker>
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="6"><el-form-item label=" 棰樼洰ID " prop="topicid">
+              <el-input v-model="form.topicid" placeholder="璇疯緭鍏� 棰樼洰ID " />
+            </el-form-item></el-col>
+          <el-col :span="6"><el-form-item label=" 闂嵎ID " prop="svyid">
+              <el-input v-model="form.svyid" placeholder="璇疯緭鍏� 闂嵎ID " />
+            </el-form-item></el-col>
+          <el-col :span="6"><el-form-item label=" 閫夐」Code " prop="optioncode">
+              <el-input v-model="form.optioncode" placeholder="璇疯緭鍏� 閫夐」Code " />
+            </el-form-item></el-col>
+          <el-col :span="6"></el-col>
+        </el-row>>
+
+        <el-row>
+          <el-form-item label=" 閫夐」鍐呭 ">
+            <el-input v-model="form.optioncontent" placeholder="璇疯緭鍏� 閫夐」鍐呭 " />
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-col :span="6"><el-form-item label=" 鏄惁瀛樺湪鏄庣粏 " prop="isexistdetail">
+              <el-input v-model="form.isexistdetail" placeholder="璇疯緭鍏� 鏄惁瀛樺湪鏄庣粏 " />
+            </el-form-item></el-col>
+          <el-col :span="6"><el-form-item label=" 鏄庣粏鏄惁蹇呭~ " prop="detailismandatory">
+              <el-input v-model="form.detailismandatory" placeholder="璇疯緭鍏� 鏄庣粏鏄惁蹇呭~ " />
+            </el-form-item></el-col>
+          <el-col :span="6"><el-form-item label=" 鏄惁寮傚父椤圭洰 " prop="isexceptionitem">
+              <el-input v-model="form.isexceptionitem" placeholder="璇疯緭鍏� 鏄惁寮傚父椤圭洰 " />
+            </el-form-item></el-col>
+          <el-col :span="6"><el-form-item label=" 鏄惁璺熻繘 " prop="istrack">
+              <el-input v-model="form.istrack" placeholder="璇疯緭鍏� 鏄惁璺熻繘 " />
+            </el-form-item></el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label=" 鍒嗘暟 " prop="score">
+              <el-input v-model="form.score" placeholder="璇疯緭鍏� 鍒嗘暟 " />
+            </el-form-item></el-col>
+          <el-col :span="6"><el-form-item label=" 鎻愮ず " prop="prompt">
+              <el-input v-model="form.prompt" placeholder="璇疯緭鍏� 鎻愮ず " />
+            </el-form-item></el-col>
+          <el-col :span="6"><el-form-item label=" 璺宠浆 " prop="jump">
+              <el-input v-model="form.jump" placeholder="璇疯緭鍏� 璺宠浆 " />
+            </el-form-item></el-col>
+          <el-col :span="6"><el-form-item label=" 鐖堕�夐」ID " prop="parentoptionid">
+              <el-input v-model="form.parentoptionid" placeholder="璇疯緭鍏� 鐖堕�夐」ID " />
+            </el-form-item></el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6"><el-form-item label=" 鏄惁浜掓枼 " prop="ismutex">
+              <el-input v-model="form.ismutex" placeholder="璇疯緭鍏� 鏄惁浜掓枼 " />
+            </el-form-item></el-col>
+          <el-col :span="6"><el-form-item label=" 楠岃瘉瑙勫垯 " prop="verifyrule">
+              <el-input v-model="form.verifyrule" placeholder="璇疯緭鍏� 楠岃瘉瑙勫垯 " />
+            </el-form-item></el-col>
+          <el-col :span="6"><el-form-item label=" 鎺掑簭 " prop="sort">
+              <el-input v-model="form.sort" placeholder="璇疯緭鍏� 鎺掑簭 " />
+            </el-form-item></el-col>
+          <el-col :span="6"><el-form-item label=" 鏄惁闄愬埗鑼冨洿 " prop="isrange">
+              <el-input v-model="form.isrange" placeholder="璇疯緭鍏� 鏄惁闄愬埗鑼冨洿 " />
+            </el-form-item></el-col>
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="6"><el-form-item label=" 鏈�灏忚寖鍥� " prop="minrange">
+              <el-input v-model="form.minrange" placeholder="璇疯緭鍏� 鏈�灏忚寖鍥� " />
+            </el-form-item></el-col>
+          <el-col :span="6"><el-form-item label=" 鑼冨洿闀垮害;鐢ㄤ簬灏忔暟淇濈暀浣嶆暟 " prop="rangelength">
+              <el-input v-model="form.rangelength" placeholder="璇疯緭鍏� 鑼冨洿闀垮害;鐢ㄤ簬灏忔暟淇濈暀浣嶆暟 " />
+            </el-form-item></el-col>
+          <el-col :span="6"><el-form-item label=" 鑼冨洿闀垮害;鐢ㄤ簬灏忔暟淇濈暀浣嶆暟 " prop="rangelength">
+              <el-input v-model="form.rangelength" placeholder="璇疯緭鍏� 鑼冨洿闀垮害;鐢ㄤ簬灏忔暟淇濈暀浣嶆暟 " />
+            </el-form-item></el-col>
+          <el-col :span="6"><el-form-item label=" 鏈烘瀯ID " prop="orgid">
+              <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
+            </el-form-item></el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -514,7 +283,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.optionid)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -556,12 +325,12 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const optionids = row.optionid || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎闂嵎闂閫夐」缂栧彿涓�"' + optionids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎闂嵎闂閫夐」缂栧彿涓�"' + optionids + '"鐨勬暟鎹」锛�').then(function () {
         return delSvytopicoption(optionids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {

--
Gitblit v1.9.3