Merge branch '2025_0226_fr_topictype' of http://git.bjzxtw.org.cn:3000/zxt/admin_home into 2025_0226_fr_topictype

src/views/news/surveyList.vue

@@ -4,13 +4,13 @@
         <!-- 头部搜索框部分 -->
         <div class="title">
             <el-row>
-                <el-col :span="8" class="left">
+                <el-col :span="11" class="left">
                     <div class="searchBox">
                         <div class="searchTitle">投票名称</div>
                         <el-input v-model="tabbarName" class="input" placeholder="请输入投票名称" :maxlength="10"></el-input>
                     </div>
                 </el-col>
-                <el-col :span="8" class="left">
+                <el-col :span="11" class="left">
                     <div class="searchBox">
                         <div class="searchTitle">投票类型</div>
                         <el-select v-model="typeid" placeholder="请选择投票类型...">
@@ -19,15 +19,17 @@
                         </el-select>
                     </div>
                 </el-col>
-                <el-col :span="8" class="left">
-                    <div class="searchBox">
-                        <div class="searchTitle">是否开启</div>
-                        <el-select v-model="status" placeholder="请选择是否开启...">
-                            <el-option label="是" value="1"></el-option>
-                            <el-option label="否" value="0"></el-option>
-                        </el-select>
-                    </div>
-                </el-col>
+<!-- 
+<el-col :span="8" class="left">
+    <div class="searchBox">
+        <div class="searchTitle">是否开启</div>
+        <el-select v-model="status" placeholder="请选择是否开启...">
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
+        </el-select>
+    </div>
+</el-col>
+-->
                 
             </el-row>
             <el-row>
@@ -45,10 +47,9 @@
             <el-row>
                 <template>
                     <el-table class="my-table" :data="tableData" style="width: 100%">
-                        <el-table-column type="index" :index="indexMethod" label="编号" width="90">
-                        </el-table-column>
-                        <el-table-column prop="survey_name" label="投票名称" width="500">
+                        <el-table-column prop="id" label="编号" width="90">
                         </el-table-column>
+                        <el-table-column prop="survey_name" label="投票名称" width="500"></el-table-column>
                         <el-table-column prop="survey_type" label="投票类型" width="100" >
                             <template slot-scope="scope">
                                 <span v-if="scope.row.survey_type==1">
@@ -59,16 +60,18 @@
                                 </span>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="is_survey" label="是否开启" width="100">
-                            <template slot-scope="scope">
-                                <span v-if="scope.row.is_survey==1">
-                                    是
-                                </span>
-                                <span v-if="scope.row.is_survey==0">
-                                    否
-                                </span>
-                            </template>
-                        </el-table-column>
+                        <!--
+                            <el-table-column prop="is_survey" label="是否开启" width="100">
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.is_survey==1">
+                                        是
+                                    </span>
+                                    <span v-if="scope.row.is_survey==0">
+                                        否
+                                    </span>
+                                </template>
+                            </el-table-column>
+                        -->
                         <el-table-column prop="created_at" label="添加时间" width="">
                         </el-table-column>
                         <el-table-column prop="updated_at" label="修改时间" width="">