From af1f597ddfe832106a03d51df36021dced11f9dc Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 21 三月 2023 16:04:51 +0800
Subject: [PATCH] yxh

---
 ruoyi-ui/src/smartor/dataobject/dw_svytopic_maint.vue       |   78 ++++++---------
 ruoyi-ui/src/smartor/dataobject/dw_svytopicoption_maint.vue |  152 ++++++++++++------------------
 ruoyi-ui/src/views/smartor/svytopic/maint.vue               |   24 ++--
 3 files changed, 106 insertions(+), 148 deletions(-)

diff --git a/ruoyi-ui/src/smartor/dataobject/dw_svytopic_maint.vue b/ruoyi-ui/src/smartor/dataobject/dw_svytopic_maint.vue
index 35e84d2..88ad3b1 100644
--- a/ruoyi-ui/src/smartor/dataobject/dw_svytopic_maint.vue
+++ b/ruoyi-ui/src/smartor/dataobject/dw_svytopic_maint.vue
@@ -1,53 +1,35 @@
 <template>
   <div>
     <!-- 娣诲姞鎴栦慨鏀归棶鍗烽鐩璇濇 -->
-    <el-form ref="form" :model="form" size="small" :inline="true" :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 ref="form" :model="form" size="small" :rules="rules" label-width="120px">
+      <el-row>
+        <el-col :span="6"><el-form-item label=" 涓婚缂栧彿 " prop="topiccode">
+            <el-input v-model="form.topiccode" 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="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-col :span="6"><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-row>
+      <el-row>
+        <el-col :span="12"><el-form-item label=" 涓婚鍐呭 " prop="topic">
+            <el-input v-model="form.topic" placeholder="璇疯緭鍏ヤ富棰樺唴瀹�" />
+          </el-form-item></el-col>
+        <el-col :span="12"><el-form-item label=" 鎵�灞為櫌鍖� " prop="orgid">
+            <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鎵�灞為櫌鍖� " />
+          </el-form-item></el-col>
+      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="submitForm">淇� 瀛�</el-button>
@@ -104,7 +86,7 @@
       };
       this.resetForm("form");
     },
-     /** 淇敼鎸夐挳鎿嶄綔 */
+    /** 淇敼鎸夐挳鎿嶄綔 */
     Retrieve(topicid) {
       this.reset();
       getSvytopic(topicid).then(response => {
diff --git a/ruoyi-ui/src/smartor/dataobject/dw_svytopicoption_maint.vue b/ruoyi-ui/src/smartor/dataobject/dw_svytopicoption_maint.vue
index 8a47602..3457a7a 100644
--- a/ruoyi-ui/src/smartor/dataobject/dw_svytopicoption_maint.vue
+++ b/ruoyi-ui/src/smartor/dataobject/dw_svytopicoption_maint.vue
@@ -1,93 +1,66 @@
 <template>
-    <div>
-  <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=" 111棰樼洰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">
+  <div>
+    <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=" 閫夐」缂栧彿 " prop="optioncode">
+              <el-input v-model="form.optioncode" placeholder="璇疯緭鍏� 閫夐」缂栧彿 " />
+            </el-form-item></el-col><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="score">
+              <el-input v-model="form.score" placeholder="璇疯緭鍏� 鍒嗘暟 " />
+            </el-form-item></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-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>
-      <el-button @click="cancel">鍙� 娑�</el-button>
-    </div>
-  </el-dialog>
-</div>
+          </el-form-item></el-row>
+        <el-row>
+          <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="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-col :span="6"><el-form-item label=" 鏄惁浜掓枼 " prop="ismutex">
+              <el-input v-model="form.ismutex" placeholder="璇疯緭鍏� 鏄惁浜掓枼 " />
+            </el-form-item></el-col>
+        </el-row>
+        <el-row>
+          <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="isrange">
+              <el-input v-model="form.isrange" placeholder="璇疯緭鍏� 鏄惁闄愬埗鑼冨洿 " />
+            </el-form-item></el-col><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-row>
+        <el-row>
+          <el-form-item label=" 鎵�灞為櫌鍖� " prop="orgid">
+            <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鎵�灞為櫌鍖� " />
+          </el-form-item>
+        </el-row>
+      </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>
@@ -170,8 +143,7 @@
           this.form = response.data;
           this.title = "淇敼闂嵎闂閫夐」";
         });
-      }else
-      {
+      } else {
         this.title = "鏂板闂嵎闂閫夐」";
       }
     },
diff --git a/ruoyi-ui/src/views/smartor/svytopic/maint.vue b/ruoyi-ui/src/views/smartor/svytopic/maint.vue
index b1d00b7..9860055 100644
--- a/ruoyi-ui/src/views/smartor/svytopic/maint.vue
+++ b/ruoyi-ui/src/views/smartor/svytopic/maint.vue
@@ -1,20 +1,24 @@
 <template>
-    <div class="app-container">
-    <dw_base ref="base"/>
-    <dw_detail ref="detail"/>
+  <div class="app-container" style="background: #f3f3f3;">
+    <div style="padding:20px; background:#fff; ">
+      <dw_base ref="base" />
     </div>
+    <div style="padding:20px; background:#fff; margin-top:20px;">
+      <dw_detail ref="detail" />
+    </div>
+  </div>
 </template>
 <script>
- import { listSvytopic, getSvytopic, delSvytopic, addSvytopic, updateSvytopic } from "@/api/smartor/svytopic";
- import dw_base from "@/smartor/dataobject/dw_svytopic_maint.vue";
- import dw_detail from  "@/smartor/dataobject/dw_svytopicoption_list.vue";
+import { listSvytopic, getSvytopic, delSvytopic, addSvytopic, updateSvytopic } from "@/api/smartor/svytopic";
+import dw_base from "@/smartor/dataobject/dw_svytopic_maint.vue";
+import dw_detail from "@/smartor/dataobject/dw_svytopicoption_list.vue";
 
 export default {
   name: "SvytopicMaint",
   dicts: ['sys_yes_no'],
   data() {
     return {
-        topicid:null,
+      topicid: null,
     }
   },
   components:
@@ -23,13 +27,13 @@
     dw_detail: dw_detail
   },
   created() {
-    
+
   },
   mounted() {
     const topicId = this.$route.params && this.$route.params.topicId
     //const topicId = 1
-    this.$refs["base"].Retrieve(topicId) 
-    this.$refs["detail"].getList(topicId) 
+    this.$refs["base"].Retrieve(topicId)
+    this.$refs["detail"].getList(topicId)
   }
 }
 </script>
\ No newline at end of file

--
Gitblit v1.9.3