城阳标签

9 months ago · 880274d306
9 changed files with 139 additions and 140 deletions
--- a/.env.chengyang-prod
+++ b/.env.chengyang-prod
@ -1,6 +1,6 @@
 NODE_ENV=production
 # VUE_APP_API_SERVER =  http://120.27.18.76/api
-VUE_APP_API_SERVER =  http://112.230.202.146:10081/api
+VUE_APP_API_SERVER =  http://119.167.67.163:10081/api
 VUE_APP_BIPASS_API_SERVER = https://epmet-preview.elinkservice.cn/linkdata/linkdata-gateway/route
 VUE_APP_NODE_ENV=preview
 VUE_APP_PUBLIC_PATH=epmet-work-pc
--- a/src/router/index.js
+++ b/src/router/index.js
@ -54,6 +54,16 @@ export const moduleRoutes = {
    isTab: false,
  },
  children: [
+    {
+      path: "suggestionList",
+      props: true,
+      name: "suggestionList",
+      component: () => import("@/views/modules/solicitationSpecial/cpts/suggestionList"),
+        meta: {
+          isTab: true,
+          title: "专题征集列表",
+        },
+      },
    {
      path: "home",
      component: () => import("@/views/modules/home/index"),
@ -178,16 +188,7 @@ export const moduleRoutes = {
            title: "新增居民",
          },
        },
-        {
-          path: "suggestionList",
-          props: true,
-          name: "suggestionList",
-          component: () => import("@/views/modules/solicitationSpecial/cpts/suggestionList"),
-            meta: {
-              isTab: true,
-              title: "专题征集列表",
-            },
-          },
+
          {
            path: "edit-resi",
            props: true,
--- a/src/views/modules/peopleOpinons/cpts/eventDetail.vue
+++ b/src/views/modules/peopleOpinons/cpts/eventDetail.vue
@ -7,19 +7,6 @@
            </h3>
            <div class="m-detail-main">
                <div class="m-info">
-                    <!-- <div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' }]">
-                        <span class="u-info-title-2">所属网格：</span>
-                        <template v-if="!info.gridName">
-                            <el-select v-model.trim="info.gridId" placeholder="请选择" clearable class="cell-width-1">
-                                <el-option v-for="item in gridList" :key="item.value" :label="item.label"
-                                    :value="item.value" @click.native="$emit('handelCLickGridId',item)">
-                                </el-option>
-                            </el-select>
-                        </template>
-                        <template v-else>
-                            <span>{{ info.gridName|| info.agencyName }}</span>
-                        </template>
-                    </div> -->
                    <div :class="[
            'm-info-prop',
            { 'm-info-prop-vis': source === 'visiual' },
@ -27,7 +14,7 @@
                        <span class="u-info-title-2">建议上报时间：</span>
                        <span>{{ info.submitTime }}</span>
                    </div>
-                    <div :class="[
+                    <div v-if="info.typeCode" :class="[
                      'm-info-prop',
                       { 'm-info-prop-vis': source === 'visiual' },
                         ]">
@ -39,50 +26,53 @@
            { 'm-info-prop-vis': source === 'visiual' },
        ]">
                        <span class="u-info-title-2">是否愿意公开：</span>
-                        <template slot-scope="scope">
+                        <!-- <template slot-scope="scope">
                            <span v-if="scope.row.openFlag === 0" style="color: #ff6600;">否</span>
                            <span v-else-if="scope.row.openFlag === 1">是</span>
-                        </template>
-                        <span>{{info.eventContent==1?'是':'否'}}</span>
+                        </template> -->
+                        <span>{{ info.openFlag == 1 ? '是' : '否' }}</span>
                    </div>
                    <div :class="[
            'm-info-prop',
            { 'm-info-prop-vis': source === 'visiual' },
        ]">
-                        <span class="u-info-title-2">意见标题：</span>
+                        <span class="u-info-title-2">建议主题：</span>
                        <span>{{ info.subjectTitle }}</span>
                    </div>
                    <div :class="[
            'm-info-prop',
            { 'm-info-prop-vis': source === 'visiual' },
        ]">
-                        <span class="u-info-title-2">意见内容:</span>
+                        <span class="u-info-title-2">建议内容:</span>
                        <span>{{ info.eventContent }}</span>
                    </div>
-                    <div :class="[
+                    <div v-if="info.fileList" :class="[
            'm-info-prop',
            { 'm-info-prop-vis': source === 'visiual' },
        ]">
                        <span class="u-info-title-2">意见文档:</span>
-                        <el-button v-if="info.fileList.length!=0" size="small"  type="primary" @click="onClickDown(info.fileList)">下载文件</el-button>
-                        <!-- <span>{{ info.eventContent }}</span> -->
-                         <!-- <div v-for="(item1,index) in info.fileList">
-                            <div>{{item1[index]}}111111</div>
-                            <div>111111</div>
-                         </div> -->
+                        <!-- <el-button size="small" type="primary" @click="onClickDown(info.fileList)">下载文件</el-button> -->
+                        <section  class="uploadList">
+                    <div v-for="(file,index) in info.fileList" :key="index" :file="file"
+                        :style="{cursor:pageType === 'check'? 'no-drop':'pointer'}" >
+                        <span>{{ file }}</span>
+                        <span type="text" @click="onClickDown(file)" >下载</span>
+                    </div>
+                </section>
+                  
                    </div>
                    <div :class="[
            'm-info-prop',
            { 'm-info-prop-vis': source === 'visiual' },
        ]">
-                        <span class="u-info-title-2">建议人：</span>
+                        <span class="u-info-title-2">建议人姓名：</span>
                        <span>{{ info.name }}</span>
                    </div>
                    <div :class="[
            'm-info-prop',
            { 'm-info-prop-vis': source === 'visiual' },
        ]">
-                        <span class="u-info-title-2">联系电话：</span>
+                        <span class="u-info-title-2">建议人电话：</span>
                        <span>{{ info.mobile }}</span>
                    </div>
                    <div :class="[
@ -312,10 +302,12 @@ export default {
            }
        },
        onClickDown(data) {
-            data.forEach((item) => {
-                console.log(item,"奥特玛");
-                window.open(item, '_blank');
-            });
+                        console.log(data, "奥特玛");
+            // data.forEach((item) => {
+    
+            // });
+            
+                window.open(data, '_blank');
        },
        async loadGrid() {
            const url = "/gov/org/customergrid/gridoption";
--- a/src/views/modules/peopleOpinons/opinionsDaily.vue
+++ b/src/views/modules/peopleOpinons/opinionsDaily.vue
@ -17,17 +17,17 @@
                            </el-select>
                
                        </el-form-item> -->
-                        <el-form-item label="意见标题" prop="subjectTitle">
+                        <el-form-item label="建议主题" prop="subjectTitle">
                            <el-input v-model.trim="formData.subjectTitle" class="u-item-width-normal" size="small"
                                clearable placeholder="请输入">
                            </el-input>
                        </el-form-item>
-                        <el-form-item label="提交人姓名" prop="name">
+                        <el-form-item label="建议人姓名" prop="name">
                            <el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable
                                placeholder="请输入">
                            </el-input>
                        </el-form-item>
-                        <el-form-item label="报件人电话" prop="mobile">
+                        <el-form-item label="建议人电话" prop="mobile">
                            <el-input v-model.trim="formData.mobile" class="u-item-width-normal" size="small" clearable
                                placeholder="请输入">
                            </el-input>
@ -87,26 +87,13 @@
                    <!-- <el-table-column prop="typeCode" label="征集领域" min-width="140" align="center"
                        :show-overflow-tooltip="true" /> -->

-                    <el-table-column prop="subjectTitle" label="意见标题" align="center" :show-overflow-tooltip="true">
+                    <el-table-column prop="subjectTitle" label="建议主题" align="center" :show-overflow-tooltip="true">
                    </el-table-column>
-                    <el-table-column prop="eventContent" label="意见内容" align="center" :show-overflow-tooltip="true">
+                    <el-table-column prop="eventContent" label="建议内容" align="center" :show-overflow-tooltip="true">
                    </el-table-column>
-                    <el-table-column prop="name" label="提交人" align="center" :show-overflow-tooltip="true">
+                    <el-table-column prop="name" label="建议人姓名" align="center" :show-overflow-tooltip="true">
                    </el-table-column>
-                    <el-table-column prop="mobile" align="center" width="110" label="提交人电话">
-                        <!-- <template slot-scope="scope">
-                            <el-button
-                                v-if="scope.row.reportUserId !== null && scope.row.reportUserId !== ''"
-                                @click="handleLook(scope.row)"
-                                type="text"
-                                size="small"
-                            >
-                                {{ scope.row.phone }}
-                            </el-button>
-                            <span v-else>
-                                {{ scope.row.phone }}
-                            </span>
-                        </template> -->
+                    <el-table-column prop="mobile" align="center" width="110" label="建议人电话">
                    </el-table-column>
                    <el-table-column prop="openFlag" align="center" width="110" label="是否愿意公开"
                        :show-overflow-tooltip="true">
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@ -389,13 +389,22 @@ export default {
    mounted() {
        this.user = this.$store.state.user;
        this.agencyId = this.user.agencyId;
-
+        this.getEventSourceTypeDict()
        this.getOrgTreeList()
        this.getGridList()
        this.getTableData();
        this.getCateOptions();
    },
    methods: {
+        getEventSourceTypeDict() {
+            const url = "/sys/dict/data/dictlist"
+            let params = {
+            dictType: 'event_source_type'
+            }
+            requestPost(url, params).then(res => {
+            this.qudaoArray = res.data
+            })
+        },
        handleEventType(val) {
            const nodes = this.$refs.cascaderEvent.getCheckedNodes();
            this.formData.firstIdList = [];
--- a/src/views/modules/shequzhili/eventOld/eventList.vue
+++ b/src/views/modules/shequzhili/eventOld/eventList.vue
@ -38,7 +38,7 @@
                </template>
              </el-cascader> -->
                        </el-form-item>
-                        <el-form-item label="重点问题标注" prop="keyProblem">
+                        <el-form-item label="重点问题标注" prop="keyProblem" label-width="105px">
                            <el-select v-model.trim="formData.keyProblem" placeholder="请选择" size="small" clearable
                                class="u-item-width-normal">
                                <el-option v-for="item in keyProblemList" :key="item.value" :label="item.label"
@ -455,7 +455,7 @@ export default {
            eventId: "",

            searchH: 180,
-
+            qudaoArray:[],
            eventDetailData: {},

            showVoice: false,
@ -492,8 +492,18 @@ export default {
        this.getGridList()
        this.getTableData();
        this.getCateOptions();
+        this.getEventSourceTypeDict()
    },
    methods: {
+               getEventSourceTypeDict() {
+            const url = "/sys/dict/data/dictlist"
+            let params = {
+            dictType: 'event_source_type'
+            }
+            requestPost(url, params).then(res => {
+            this.qudaoArray = res.data
+            })
+        },
        handleEventType(val) {
            const nodes = this.$refs.cascaderEvent.getCheckedNodes();
            this.formData.firstIdList = [];
--- a/src/views/modules/solicitationSpecial/cpts/add.vue
+++ b/src/views/modules/solicitationSpecial/cpts/add.vue
@ -316,9 +316,9 @@ export default {
                subjectContent: [
                    { required: true, message: '征集内容不能为空', trigger: 'blur' }
                ],
-                fileList: [
-                    { required: true, message: '请选择活动照片', trigger: 'blur' }
-                ]
+                // fileList: [
+                //     { required: true, message: '请选择活动照片', trigger: 'blur' }
+                // ]
            }
        },

--- a/src/views/modules/solicitationSpecial/cpts/suggestionList.vue
+++ b/src/views/modules/solicitationSpecial/cpts/suggestionList.vue
@ -17,12 +17,12 @@
                            </el-select>
                
                        </el-form-item> -->
-                        <el-form-item label="意见标题" prop="subjectTitle">
+                        <el-form-item label="建议标题" prop="subjectTitle">
                            <el-input v-model.trim="formData.subjectTitle" class="u-item-width-normal" size="small"
                                clearable placeholder="请输入">
                            </el-input>
                        </el-form-item>
-                        <el-form-item label="提交人姓名" prop="name">
+                        <el-form-item label="建议人姓名" prop="name">
                            <el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable
                                placeholder="请输入">
                            </el-input>
@ -92,11 +92,11 @@
                         </el-table-column> -->
                    <el-table-column prop="subjectTitle" label="所属专题" align="center" :show-overflow-tooltip="true">
                    </el-table-column>
-                    <el-table-column prop="eventContent" label="意见内容" align="center" :show-overflow-tooltip="true">
+                    <el-table-column prop="eventContent" label="建议内容" align="center" :show-overflow-tooltip="true">
                    </el-table-column>
-                    <el-table-column prop="name" label="建议人" align="center" :show-overflow-tooltip="true">
+                    <el-table-column prop="name" label="建议人姓名" align="center" :show-overflow-tooltip="true">
                    </el-table-column>
-                    <el-table-column prop="mobile" align="center" width="110" label="提交人电话">
+                    <el-table-column prop="mobile" align="center" width="110" label="建议人电话">
                        <!-- <template slot-scope="scope">
                            <el-button
                                v-if="scope.row.reportUserId !== null && scope.row.reportUserId !== ''"