quyx@nextosd.com 5 ヶ月 前
コミット
0534ff622f

+ 15 - 1
src/router/index.js

@@ -132,7 +132,7 @@ export const constantRoutes = [
         redirect: 'noredirect',
         children: [
             {
-                path: 'surveyDetail',
+                path: 'surveyDetail/:surveyId',
                 component: () => import('@/views/fcbi/survey/detail'),
                 name: 'surveyDetail',
                 meta: {title: 'アンケート照会確定', icon: 'user'}
@@ -153,6 +153,20 @@ export const constantRoutes = [
             }
         ]
     },
+    {
+        path: '/surveyAdmin',
+        component: Layout,
+        hidden: true,
+        redirect: 'noredirect',
+        children: [
+            {
+                path: 'surveyForm',
+                component: () => import('@/views/fcbi/survey/form'),
+                name: 'surveyForm',
+                meta: {title: 'アンケートフォーム作成', icon: 'user'}
+            }
+        ]
+    },
 ]
 
 // ダイナミックルート、ユーザー権限に基づいて動的に読み込みます

+ 4 - 2
src/views/fcbi/survey/detail.vue

@@ -287,11 +287,11 @@
 
 <script name="SurveyDetail" setup>
 
-import { getRegionTree, addSurvey } from "@/api/fcbi/survey.js"
+import { getRegionTree, addSurvey} from "@/api/fcbi/survey.js"
 import { reactive, toRefs, ref, watch, onMounted } from 'vue';
 import RegionTree from '../../../components/RegionTree.vue';
 import { ElMessage } from "element-plus";
-import { useRouter } from 'vue-router';
+import {useRoute, useRouter} from 'vue-router';
 import { useSurveyStore } from '@/store/surveyStore'
 
 const { proxy } = getCurrentInstance();
@@ -306,6 +306,8 @@ const error = ref('');
 const regionTree = ref([]);
 const selectedRegions = ref([]);
 const router = useRouter();
+const route= useRoute()
+const surveyId = route.params.surveyId
 
 /**
  * コンポーネントの状態を管理するリアクティブオブジェクト

+ 12 - 3
src/views/fcbi/survey/index.vue

@@ -12,7 +12,7 @@
                   maxlength="128" @keyup.enter="handleQuery"/>
       </el-form-item>
       <el-form-item>
-        <el-button  v-hasPermi="['fcbi:survey:form']" class="append-button">アンケート作成</el-button>
+        <el-button @click="surveyForm"  v-hasPermi="['fcbi:survey:form']" class="append-button">アンケート作成</el-button>
       </el-form-item>
       <el-row v-show="initLoadingCompleted" :gutter="10" class="mb8">
         <el-col :span="11">
@@ -136,10 +136,10 @@
         <el-table-column :show-overflow-tooltip="true" align="left" header-align="center" label="エリア" min-width="100"
                          prop="relatedRegion"
                          width=""/>
-        <el-table-column :show-overflow-tooltip="true" align="left" header-align="center" label="公開期間" min-width="50"
+        <el-table-column :show-overflow-tooltip="true" align="center" header-align="center" label="公開期間" min-width="50"
                          :formatter="formatPublicPeriod"
                          width=""/>
-        <el-table-column :show-overflow-tooltip="true" align="center" header-align="center" label="質問総数" min-width="30"
+        <el-table-column :show-overflow-tooltip="true" align="right" header-align="center" label="質問総数" min-width="30"
                          prop="questionCount"
                          width=""/>
       </el-table-column>
@@ -334,6 +334,15 @@ function resetQuery() {
 const Confirm = (row) => {
   router.push({
     name: 'surveyDetail',
+    params: {
+      surveyId: row.surveyId
+    }
+  });
+};
+
+const surveyForm = () => {
+  router.push({
+    name: 'surveyForm',
   });
 };
 // コンポーネント初期化時に検索を実行

+ 1 - 1
src/views/fcbi/survey/results.vue

@@ -188,7 +188,7 @@ const data = reactive({
   // 検索条件を格納するオブジェクト
   queryParams: {
     pageNum: 1,
-    pageSize: 100,
+    pageSize: 10,
     startYear: '',
     startMonth: '',
     startDay: '',