修改名称

src/api/portal/GATHER/GATHER.js

@@ -64,9 +64,9 @@ export function getInfoByColl(id) {
 
 
 // 上报
-export function approve(data) {
+export function report(data) {
   return request({
-    url: '/gather/approve/',
+    url: '/gather/report',
     method: 'post',
     data: data
   })
@@ -74,9 +74,9 @@ export function approve(data) {
 
 
 // 提交审核
-export function report(data) {
+export function approve(data) {
   return request({
-    url: '/gather/report/',
+    url: '/gather/approve',
     method: 'post',
     data: data
   })

src/assets/styles/extend.scss

@@ -97,7 +97,7 @@
   background-color: white;
 }
 .se {
-  width: 165px !important;
+  width: 145px !important;
 }
 .mb8 {
   margin-top: -8px;
@@ -154,3 +154,20 @@
 .el-message {
   z-index: 1111111 !important;
 }
+.tips-text {
+	background-color: #f2f9fe;
+	padding: 10px 10px 5px 30px;
+	margin-top: 20px;
+	margin-bottom: 20px;
+	text-align: left;
+	.tit {
+		font-size: 18px;
+		color: #36aafd;
+		line-height: 30px;
+		font-weight: bold;
+	}
+	p {
+		color: #545555;
+		font-size: 15px;
+	}
+}

src/components/TopNav/index.vue

@@ -6,7 +6,7 @@
         <div class="out">
           <div class="int">
             <div class="icon"><svg-icon :icon-class="item.meta.icon" /></div>
-            <div class="desc">{{ item.meta.title }}</div>
+            <div class="desc omit">{{ item.meta.title }}</div>
           </div>
         </div>
       </div>
@@ -181,7 +181,6 @@ export default {
   margin: 0 10px !important;
 }
 .reference {
-  margin-top: -2px;
   .mtt {
     margin-top: -24px;
     font-size: 14px;

src/layout/components/Navbar.vue

@@ -17,11 +17,12 @@
         <header-notice-vue />
       </div>
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
-        
+
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar" />
           <div class="cons">
-            <div class="nickName">{{ user.name }}</div>
+            <div class="nickName">{{ user.nickName }}</div>
+            <div>{{ user.deptName ? user.deptName : '无部门' }}</div>
           </div>
           <i class="el-icon-caret-bottom" />
         </div>
@@ -85,7 +86,7 @@ export default {
     RuoYiDoc
   },
   computed: {
-    ...mapGetters(['sidebar', 'avatar', 'device', 'sidebarRouters']),
+    ...mapGetters(['sidebar', 'avatar', 'device', 'sidebarRouters', 'deptName','nickName']),
     setting: {
       get() {
         return this.$store.state.settings.showSettings;
@@ -237,11 +238,17 @@ export default {
           font-size: 13px;
           margin-top: -4px;
           margin-left: 10px;
-          max-width: 100px;
+          //max-width: 100px;
           color: white;
+          width: auto;
           .nickName {
+            text-align: center;
             height: 10px;
+            margin-top: -7px;
+            margin-bottom: 5px;
+
           }
+          .deptName {}
           .desc {
             margin-top: 7px;
           }

src/store/getters.js

@@ -9,6 +9,8 @@ const getters = {
   avatar: state => state.user.avatar,
   name: state => state.user.name,
   userId: state => state.user.userId,
+  deptName: state => state.user.dept.deptName,
+  nickName: state => state.user.nickName,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,

src/store/modules/user.js

@@ -29,6 +29,12 @@ const user = {
     },
     SET_USERID: (state, userId) => {
       state.userId = userId
+    },
+    SET_DEPTNAME: (state, deptName) => {
+      state.deptName = deptName
+    },
+    SET_NICKNAME: (state, nickName) => {
+      state.nickName = nickName
     }
   },
 
@@ -65,6 +71,8 @@ const user = {
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
           commit('SET_USERID', user.userId)
+          commit('SET_DEPTNAME', user.dept.deptName)
+          commit('SET_NICKNAME', user.nickName)
           resolve(res)
         }).catch(error => {
           reject(error)

src/views/ARTICLE/task/index.vue

@@ -71,10 +71,11 @@ export default {
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
       typeList: [
-        { label: "要闻资讯", value: "1" },
+        { label: "要闻动态", value: "1" },
         { label: "政策法规", value: "2" },
         { label: "通知公告", value: "3" },
         { label: "政策解读", value: "4" },
+        { label: "投资导航", value: "5" },
       ],
       fileList: [],
       BigImgVisible: false,

src/views/GATHER/index.vue

@@ -1,137 +1,53 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="100px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="数据类型" prop="type">
-        <el-select
-          v-model="queryParams.type"
-          placeholder="请选择数据类型"
-          clearable
-          filterable
-        >
-          <el-option
-            v-for="dict in typeList"
-            :key="dict.value + 'typeList'"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.type" placeholder="请选择数据类型" clearable filterable class="se">
+          <el-option v-for="dict in typeList" :key="dict.value + 'typeList'" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="采集状态" prop="collStatus">
-        <el-select
-          v-model="queryParams.collStatus"
-          placeholder="请选择采集状态"
-          clearable
-          filterable
-        >
-          <el-option
-            v-for="dict in collStatus"
-            :key="dict.value + 'collStatus'"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.collStatus" placeholder="请选择采集状态" clearable filterable class="se">
+          <el-option v-for="dict in collStatus" :key="dict.value + 'collStatus'" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="上报状态" prop="reportStatus">
-        <el-select
-          v-model="queryParams.reportStatus"
-          placeholder="请选择上报状态"
-          clearable
-          filterable
-        >
-          <el-option
-            v-for="dict in reportStatus"
-            :key="dict.value + 'reportStatus'"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.reportStatus" placeholder="请选择上报状态" clearable filterable class="se">
+          <el-option v-for="dict in reportStatus" :key="dict.value + 'reportStatus'" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="审核状态" prop="approveStatus">
-        <el-select
-          v-model="queryParams.approveStatus"
-          placeholder="请选择审核状态"
-          clearable
-          filterable
-        >
-          <el-option
-            v-for="dict in approveStatus"
-            :key="dict.value + 'approveStatus'"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.approveStatus" placeholder="请选择审核状态" clearable filterable class="se">
+          <el-option v-for="dict in approveStatus" :key="dict.value + 'approveStatus'" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
+      <el-form-item label="年度" prop="year">
+        <el-date-picker v-model="queryParams.year" type="year" format="yyyy" value-format="yyyy" placeholder="选择年度" class="se"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="月份" prop="month">
+        <el-date-picker v-model="queryParams.month" type="month" format="MM" value-format="MM" placeholder="选择月份" class="se"></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-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="success" plain size="mini" @click="openUpload = true"
-          >导入</el-button
-        >
-
-        <!-- <el-upload
-          :show-file-list="false"
-          :http-request="httprequest"
-          :before-upload="uploadFile"
-          class="upload-demo"
-          action="#"
-          :auto-upload="true"
-          :on-change="handleChange"
-          :file-list="fileList"
-        >
-          <el-button type="success" plain size="mini">导入</el-button>
-        </el-upload> -->
+        <el-button type="success" @click="openUpload = true">导入</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          plain
-          size="mini"
-          @click="handleDownload()"
-          :disabled="radio === '' ? true : false"
-          >下载导入模板</el-button
-        >
+        <el-button @click="handleDownload()" :title="radio === ''?'请先选择下面对应的单位模板':''" :disabled="radio === '' ? true : false">下载导入模板</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      
-      :data="GATHERList"
-      @selection-change="handleSelectionChange"
-      @row-click="showRow"
-    >
+    <el-table :data="GATHERList" @selection-change="handleSelectionChange" @row-click="showRow">
       <!-- @current-change="handleCurrentChange" -->
       <el-table-column label="选择" width="70" center>
         <template scope="scope">
-          <el-radio
-            class="radio"
-            v-model="radio"
-            :label="scope.$index"
-            @change.native="getCurrentRow(scope.row)"
-            >{{ "" }}</el-radio
-          >
+          <el-radio class="radio" v-model="radio" :label="scope.$index" @change.native="getCurrentRow(scope.row)">{{ '' }}</el-radio>
         </template>
       </el-table-column>
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
@@ -146,18 +62,23 @@
           <span v-if="scope.row.type == 1">月报表数据</span>
         </template>
       </el-table-column>
-      <el-table-column label="月份" align="center" prop="month">
+      <el-table-column label="年份" align="center" prop="month" width="90">
+        <template slot-scope="scope">
+          {{ scope.row.year }}
+        </template>
+      </el-table-column>
+      <el-table-column label="月份" align="center" prop="month" width="90">
         <template slot-scope="scope">
           {{ scope.row.month }}
         </template>
       </el-table-column>
-      <el-table-column label="采集状态" align="center" prop="collStatus">
+      <el-table-column label="采集状态" align="center" prop="collStatus" width="110">
         <template slot-scope="scope">
           <span v-if="scope.row.collStatus == 0">未采集</span>
           <span v-if="scope.row.collStatus == 1">已采集</span>
         </template>
       </el-table-column>
-      <el-table-column label="上报状态" align="center" prop="reportStatus">
+      <el-table-column label="上报状态" align="center" prop="reportStatus" width="110">
         <template slot-scope="scope">
           <span v-if="scope.row.reportStatus == 0">未上报</span>
           <span v-if="scope.row.reportStatus == 1">已上报</span>
@@ -171,11 +92,8 @@
           <span v-if="scope.row.approveStatus == 3">审核拒绝</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="上报时间" align="center" prop="createTime" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <!-- <el-button
             style="margin: 0 2px"
@@ -184,177 +102,63 @@
             @click="handleDownload(scope.row)"
             >下载导入模板</el-button
           > -->
-          <el-button
-            style="margin: 0 2px"
-            v-if="scope.row.collStatus == 0"
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            >录入</el-button
-          >
+          <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 0" size="mini" type="text" @click="handleUpdate(scope.row)">录入</el-button>
+          <template v-if="scope.row.reportStatus == 0 && scope.row.collStatus == 1">
+            <el-popconfirm title="确定上报吗？" @confirm="handleReport(scope.row)">
+              <el-button style="margin: 0 2px" size="mini" slot="reference" type="text">上报</el-button>
+            </el-popconfirm>
+          </template>
 
-          <el-popconfirm
-            title="确定上报吗？"
-            @confirm="handleReport(scope.row)"
-          >
-            <el-button
-              style="margin: 0 2px"
-              v-if="scope.row.reportStatus == 0 && scope.row.collStatus == 1"
-              size="mini"
-              slot="reference"
-              type="text"
-              >上报</el-button
-            >
-          </el-popconfirm>
+          <template v-if="scope.row.approveStatus == 0 && scope.row.collStatus == 1">
+            <el-popconfirm title="确定提交吗？" @confirm="handleApprove(scope.row)">
+              <el-button style="margin: 0 2px" size="mini" type="text" slot="reference">提交审核</el-button>
+            </el-popconfirm>
+          </template>
+          <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1" size="mini" type="text" @click="handleDetail(scope.row, 0)">查看</el-button>
 
-          <el-popconfirm
-            title="确定提交吗？"
-            @confirm="handleApprove(scope.row)"
-          >
-            <el-button
-              style="margin: 0 2px"
-              v-if="scope.row.approveStatus == 0 && scope.row.collStatus == 1"
-              size="mini"
-              type="text"
-              slot="reference"
-              >提交审核</el-button
-            >
-          </el-popconfirm>
-          <el-button
-            style="margin: 0 2px"
-            v-if="scope.row.collStatus == 1"
-            size="mini"
-            type="text"
-            @click="handleDetail(scope.row, 0)"
-            >查看</el-button
-          >
-
-          <el-button
-            style="margin: 0 2px"
-            v-if="
-              scope.row.collStatus == 1 &&
-              scope.row.reportStatus == 0 &&
-              scope.row.approveStatus == 0
-            "
-            size="mini"
-            type="text"
-            @click="handleDetail(scope.row, 1)"
-            >修改</el-button
-          >
+          <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1 && scope.row.reportStatus == 0 && scope.row.approveStatus == 0" size="mini" type="text" @click="handleDetail(scope.row, 1)">修改</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
-      center
-      title="导入"
-      :visible.sync="openUpload"
-      width="50%"
-      append-to-body
-    >
-      <el-form
-        ref="uploadForm"
-        :model="uploadForm"
-        :rules="rules"
-        label-width="120px"
-      >
+    <el-dialog title="导入" :visible.sync="openUpload" width="50%" append-to-body>
+      <el-form ref="uploadForm" :model="uploadForm" :rules="rules">
         <el-form-item label="数据类型" prop="type">
-          <el-select
-            v-model="uploadForm.type"
-            placeholder="请选择数据类型"
-            clearable
-            filterable
-          >
-            <el-option
-              v-for="dict in typeList"
-              :key="dict.value + 'typeList'"
-              :label="dict.label"
-              :value="dict.value"
-            />
+          <el-select v-model="uploadForm.type" placeholder="请选择数据类型" clearable filterable>
+            <el-option v-for="dict in typeList" :key="dict.value + 'typeList'" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
-
-        <el-form-item label="文件" prop="linkUrl" v-show="uploadForm.type">
-          <el-upload
-            class="upload-demo"
-            ref="upload"
-            action="#"
-            :http-request="httprequest"
-            :before-upload="uploadFile"
-            :file-list="fileList"
-            :auto-upload="false"
-            :limit="1"
-          >
-            <el-button slot="trigger" size="small" type="primary"
-              >选取文件</el-button
-            >
+        <el-form-item label="选择文件" prop="linkUrl" v-show="uploadForm.type">
+          <el-upload class="upload-demo" ref="upload" action="#" :http-request="httprequest" :before-upload="uploadFile" :file-list="fileList" :auto-upload="false" :limit="1">
+            <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
           </el-upload>
-          <!-- <el-upload
-            :http-request="httprequest"
-            :before-upload="uploadFile"
-            :limit="1"
-            class="upload-demo"
-            action="#"
-            :auto-upload="true"
-            :on-change="handleChange"
-            :file-list="fileList"
-          >
-            <el-button size="small" type="primary">点击上传</el-button>
-          </el-upload> -->
         </el-form-item>
+        <div class="tips-text">
+          <span class="tit">提示</span>
+          <p>1.请先下载对应单位名称模板；</p>
+          <p>2.上传前，请先检查数据的完整性；</p>
+        </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitUpload">导 入</el-button>
         <el-button @click="cancel">取 消</el-button>
-        <!-- <el-button @click="cancel">取 消</el-button> -->
       </div>
     </el-dialog>
 
     <!-- 录入数据采集对话框 -->
-    <el-dialog
-      center
-      :title="title"
-      :visible.sync="open"
-      width="50%"
-      append-to-body
-    >
-      <el-tabs
-        v-if="this.form.type == 0"
-        v-model="activeName"
-        type="border-card"
-        @tab-click="handleClick"
-      >
-        <el-tab-pane
-          v-for="(item, index) in tabList"
-          :key="index + 'tabs'"
-          :label="item.normName"
-          :name="item.normName"
-        >
+    <el-dialog center :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-tabs v-if="this.form.type == 0" v-model="activeName" type="border-card" @tab-click="handleClick">
+        <el-tab-pane v-for="(item, index) in tabList" :key="index + 'tabs'" :label="item.normName" :name="item.normName">
           <el-form :model="form">
             <!-- :rules="rules" ref="form" -->
-            <el-form-item
-              v-for="(listItem, listIndex) in form.feeLists"
-              :key="listItem.normfeeId"
-              :label="listItem.normfeeName"
-              v-if="listItem.normId == item.normId"
-              :required="true"
-            >
+            <el-form-item v-for="(listItem, listIndex) in form.feeLists" :key="listItem.normfeeId" :label="listItem.normfeeName" v-if="listItem.normId == item.normId" :required="true">
               <!-- 这里科研失败！想动态绑定校验规则的 -->
               <!-- :prop="listItem.normfeeId" -->
               <!-- :rules="rules.listItem.normfeeId" -->
-              <el-input
-                v-model="listItem.collCalue"
-                :placeholder="'请输入' + listItem.normfeeName"
-              ></el-input>
+              <el-input v-model="listItem.collCalue" :placeholder="'请输入' + listItem.normfeeName"></el-input>
             </el-form-item>
           </el-form>
 
@@ -373,27 +177,17 @@
           </el-form> -->
         </el-tab-pane>
       </el-tabs>
-
-      <el-form
-        :model="form"
-        v-else-if="this.form.type == 1"
-      >
-        <!-- :rules="rules" ref="form" -->
-        <el-form-item
-          v-for="(listItem, listIndex) in form.feeLists"
-          :key="listItem.normfeeId"
-          :label="listItem.normfeeName"
-          :required="true"
-        >
-          <!-- 这里科研失败！想动态绑定校验规则的 -->
-          <!-- :prop="listItem.normfeeId" -->
-          <!-- :rules="rules.listItem.normfeeId" -->
-          <el-input
-            v-model="listItem.collCalue"
-            :placeholder="'请输入' + listItem.normfeeName"
-          ></el-input>
-        </el-form-item>
-      </el-form>
+      <template v-else-if="this.form.type == 1">
+        <el-form v-for="(listItem, listIndex) in form.feeLists" :model="listItem" :ref="'form' + listIndex" :rules="rules">
+          <!-- :rules="rules" ref="form" -->
+          <el-form-item :key="listItem.normfeeId" :label="listItem.normfeeName" :required="true" prop="collCalue">
+            <!-- 这里科研失败！想动态绑定校验规则的 -->
+            <!-- :prop="listItem.normfeeId" -->
+            <!-- :rules="rules.listItem.normfeeId" -->
+            <el-input v-model="listItem.collCalue" :placeholder="'请输入' + listItem.normfeeName"></el-input>
+          </el-form-item>
+        </el-form>
+      </template>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm('add')">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -402,42 +196,16 @@
     </el-dialog>
 
     <!-- 查看或修改 -->
-    <el-dialog
-      center
-      :title="title"
-      :visible.sync="openDetail"
-      width="50%"
-      append-to-body
-    >
-      <el-tabs
-        v-if="this.form.type == 0"
-        v-model="activeName"
-        type="border-card"
-        @tab-click="handleClick"
-      >
-        <el-tab-pane
-          v-for="(item, index) in tabList"
-          :key="index + 'tabs'"
-          :label="item.normName"
-          :name="item.normName"
-        >
+    <el-dialog center :title="title" :visible.sync="openDetail" width="50%" append-to-body>
+      <el-tabs v-if="this.form.type == 0" v-model="activeName" type="border-card" @tab-click="handleClick">
+        <el-tab-pane v-for="(item, index) in tabList" :key="index + 'tabs'" :label="item.normName" :name="item.normName">
           <el-form :model="form">
             <!-- :rules="rules" ref="form" -->
-            <el-form-item
-              v-for="(listItem, listIndex) in form.feeLists"
-              :key="listItem.normfeeId"
-              :label="listItem.normfeeName"
-              v-if="listItem.normId == item.normId"
-              :required="true"
-            >
+            <el-form-item v-for="(listItem, listIndex) in form.feeLists" :key="listItem.normfeeId" :label="listItem.normfeeName" v-if="listItem.normId == item.normId" :required="true">
               <!-- 这里科研失败！想动态绑定校验规则的 -->
               <!-- :prop="listItem.normfeeId" -->
               <!-- :rules="rules.listItem.normfeeId" -->
-              <el-input
-                :disabled="!edit"
-                v-model="listItem.collCalue"
-                :placeholder="'请输入' + listItem.normfeeName"
-              ></el-input>
+              <el-input :disabled="!edit" v-model="listItem.collCalue" :placeholder="'请输入' + listItem.normfeeName"></el-input>
             </el-form-item>
           </el-form>
 
@@ -457,31 +225,17 @@
         </el-tab-pane>
       </el-tabs>
 
-      <el-form
-        :model="form"
-        v-else-if="this.form.type == 1"
-      >
+      <el-form :model="form" v-else-if="this.form.type == 1">
         <!-- :rules="rules" ref="form" -->
-        <el-form-item
-          v-for="(listItem, listIndex) in form.feeLists"
-          :key="listItem.normfeeId"
-          :label="listItem.normfeeName"
-          :required="true"
-        >
+        <el-form-item v-for="(listItem, listIndex) in form.feeLists" :key="listItem.normfeeId" :label="listItem.normfeeName" :required="true">
           <!-- 这里科研失败！想动态绑定校验规则的 -->
           <!-- :prop="listItem.normfeeId" -->
           <!-- :rules="rules.listItem.normfeeId" -->
-          <el-input
-            :disabled="!edit"
-            v-model="listItem.collCalue"
-            :placeholder="'请输入' + listItem.normfeeName"
-          ></el-input>
+          <el-input :disabled="!edit" v-model="listItem.collCalue" :placeholder="'请输入' + listItem.normfeeName"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm('edit')" v-if="edit"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="submitForm('edit')" v-if="edit">确 定</el-button>
         <el-button type="primary" @click="cancel">返 回</el-button>
       </div>
     </el-dialog>
@@ -489,51 +243,40 @@
 </template>
 
 <script>
-import {
-  listGATHER,
-  getGATHER,
-  delGATHER,
-  addGATHER,
-  updateGATHER,
-  getInfoByColl,
-  approve,
-  report,
-  download,
-  upload,
-} from "@/api/portal/GATHER/GATHER.js";
-import { saveAs } from "file-saver";
-import { getToken } from "@/utils/auth";
-import axios from "axios";
+import { listGATHER, getGATHER, delGATHER, addGATHER, updateGATHER, getInfoByColl, approve, report, download, upload } from '@/api/portal/GATHER/GATHER.js';
+import { saveAs } from 'file-saver';
+import { getToken } from '@/utils/auth';
+import axios from 'axios';
 
 export default {
-  name: "GATHER",
+  name: 'GATHER',
   data() {
     return {
       edit: Boolean, //false 查看  true修改
       tabList: [],
       feeLists: [],
-      activeName: "",
+      activeName: '',
       //数据类型(0=量化指标数据,1=月报表数据)
       typeList: [
-        { label: "量化指标数据", value: "0" },
-        { label: "月报表数据", value: "1" },
+        { label: '量化指标数据', value: '0' },
+        { label: '月报表数据', value: '1' }
       ],
       //采集状态(0=未采集,1=已采集)
       collStatus: [
-        { label: "未采集", value: "0" },
-        { label: "已采集", value: "1" },
+        { label: '未采集', value: '0' },
+        { label: '已采集', value: '1' }
       ],
       //上报状态(0=未上报,=1已上报)
       reportStatus: [
-        { label: "未上报", value: "0" },
-        { label: "已上报", value: "1" },
+        { label: '未上报', value: '0' },
+        { label: '已上报', value: '1' }
       ],
       //审核状态(0=未审核,1审核中,2=审核通过,3=审核拒绝)
       approveStatus: [
-        { label: "未审核", value: "0" },
-        { label: "审核中", value: "1" },
-        { label: "审核通过", value: "2" },
-        { label: "审核拒绝", value: "3" },
+        { label: '未审核', value: '0' },
+        { label: '审核中', value: '1' },
+        { label: '审核通过', value: '2' },
+        { label: '审核拒绝', value: '3' }
       ],
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
@@ -552,7 +295,7 @@ export default {
       // 数据采集表格数据
       GATHERList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       openDetail: false,
@@ -568,30 +311,49 @@ export default {
         delFlag: null,
         deptId: null,
         type: null,
+        year: null,
         month: null,
         collStatus: null,
         reportStatus: null,
         approveStatus: null,
+        orderByColumn: 'create_time',
+        isAsc: 'desc'
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         // id: [{ required: true, message: "$comment不能为空", trigger: "blur" }],
+        collCalue: [
+          { required: true, message: '不能为空', trigger: 'blur' },
+          { trigger: 'blur', validator: this.validator }
+        ]
       },
       //设置文件名字
-      setFileName: "",
-      radio: "",
+      setFileName: '',
+      radio: '',
       rowData: {},
       fileList: [],
       uploadForm: {},
-      openUpload: false,
+      openUpload: false
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    validator(rule, value, callback) {
+      let reg = /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g;
+      if (!reg.test(value)) {
+        callback(new Error('请输入数字'));
+      } else if (value.split('.').length > 2) {
+        callback(new Error('输入正确格式的金额')); //防止输入多个小数点
+      } else if (value.indexOf('.') != -1 && value.split('.')[1].length > 2) {
+        callback(new Error('只能输入两位小数')); //小数点后两位
+      } else {
+        callback();
+      }
+    },
     submitUpload() {
       this.$refs.upload.submit();
     },
@@ -601,7 +363,7 @@ export default {
     },
     handleCurrentChange(val, index) {
       this.currentRow = val;
-      this.$emit("data", val.pkg);
+      this.$emit('data', val.pkg);
     },
     handleChange(file, fileList) {
       this.fileList = fileList.slice(-3);
@@ -616,7 +378,8 @@ export default {
       let formData = new FormData();
       formData.append("file", file);
       formData.append("type", this.uploadForm.type);
-      upload(formData)
+      this.handleFormDataUpload(formData);
+      //upload(formData);
       this.cancel()
       this.openUpload = false
     },
@@ -624,16 +387,14 @@ export default {
     handleDownload() {
       let row = this.rowData;
       axios({
-        url: process.env.VUE_APP_BASE_API + "/gather/download/" + row.id,
-        method: "get",
-        responseType: "blob",
+        url: process.env.VUE_APP_BASE_API + '/gather/download/' + row.id,
+        method: 'get',
+        responseType: 'blob',
         headers: {
-          Authorization: "Bearer " + getToken(),
-        },
-      }).then((res) => {
-        const temp = res.headers["content-disposition"]
-          .split(";")[1]
-          .split("filename=")[1];
+          Authorization: 'Bearer ' + getToken()
+        }
+      }).then(res => {
+        const temp = res.headers['content-disposition'].split(';')[1].split('filename=')[1];
         const fileName = decodeURIComponent(temp);
         const blob = new Blob([res.data]);
         saveAs(blob, fileName);
@@ -642,15 +403,15 @@ export default {
     },
     //上报
     handleReport(data) {
-      report(data).then((res) => {
-        this.$modal.msgSuccess("上报成功");
+      report(data).then(res => {
+        this.$modal.msgSuccess('上报成功');
         this.getList();
       });
     },
     //提交审核
     handleApprove(data) {
-      this.$modal.msgSuccess("提交审核成功");
-      approve(data).then((res) => {
+      approve(data).then(res => {
+        this.$modal.msgSuccess('提交审核成功');
         this.getList();
       });
     },
@@ -659,7 +420,7 @@ export default {
     /** 查询数据采集列表 */
     getList() {
       this.loading = true;
-      listGATHER(this.queryParams).then((response) => {
+      listGATHER(this.queryParams).then(response => {
         this.GATHERList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -680,15 +441,15 @@ export default {
         deptId: null,
         type: null,
         month: null,
-        collStatus: "0",
-        reportStatus: "0",
-        approveStatus: "0",
+        collStatus: '0',
+        reportStatus: '0',
+        approveStatus: '0'
       };
       this.uploadForm = {
-        type: "",
+        type: ''
       };
       this.fileList = [];
-      this.resetForm("form");
+      this.resetForm('form');
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -697,12 +458,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm');
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -711,7 +472,7 @@ export default {
       this.reset();
       this.open = true;
       this.openDetail = true;
-      this.title = "添加数据采集";
+      this.title = '添加数据采集';
     },
     /** 录入按钮操作 */
     handleUpdate(row) {
@@ -719,11 +480,11 @@ export default {
       this.tabList = [];
       this.form = [];
       const id = row.id || this.ids;
-      getInfoByColl(id).then((response) => {
+      getInfoByColl(id).then(response => {
         //深拷贝，而不是拷贝地址
         this.form = JSON.parse(JSON.stringify(response.data));
         this.open = true;
-        this.title = "数据录入";
+        this.title = '数据录入';
         //深拷贝，而不是拷贝地址
         this.tabList = JSON.parse(JSON.stringify(response.data.feeLists));
         let dataList = response.data.feeLists;
@@ -777,11 +538,11 @@ export default {
       this.tabList = [];
       this.form = [];
       const id = row.id || this.ids;
-      getGATHER(id).then((response) => {
+      getGATHER(id).then(response => {
         //深拷贝，而不是拷贝地址
         this.form = JSON.parse(JSON.stringify(response.data));
         this.openDetail = true;
-        this.title = "数据查看";
+        this.title = '数据查看';
         //深拷贝，而不是拷贝地址
         this.tabList = JSON.parse(JSON.stringify(response.data.feeLists));
         let dataList = response.data.feeLists;
@@ -826,30 +587,23 @@ export default {
     /** 提交按钮 */
     submitForm(type) {
       for (const i in this.form.feeLists) {
-        if (
-          this.form.feeLists[i].collCalue == "" ||
-          this.form.feeLists[i].collCalue == null
-        ) {
+        if (this.form.feeLists[i].collCalue == '' || this.form.feeLists[i].collCalue == null) {
           return this.$message({
-            message:
-              this.form.feeLists[i].normName +
-              " - " +
-              this.form.feeLists[i].normfeeName +
-              " 未填写！",
-            type: "warning",
+            message: this.form.feeLists[i].normName + ' - ' + this.form.feeLists[i].normfeeName + ' 未填写！',
+            type: 'warning'
           });
         }
       }
 
-      if (type == "add") {
-        addGATHER(this.form).then((response) => {
-          this.$modal.msgSuccess("录入成功");
+      if (type == 'add') {
+        addGATHER(this.form).then(response => {
+          this.$modal.msgSuccess('录入成功');
           this.open = false;
           this.getList();
         });
-      } else if (type == "edit") {
-        updateGATHER(this.form).then((response) => {
-          this.$modal.msgSuccess("修改成功");
+      } else if (type == 'edit') {
+        updateGATHER(this.form).then(response => {
+          this.$modal.msgSuccess('修改成功');
           this.openDetail = false;
           this.getList();
         });
@@ -865,20 +619,35 @@ export default {
         })
         .then(() => {
           this.getList();
-          this.$modal.msgSuccess("删除成功");
+          this.$modal.msgSuccess('删除成功');
         })
         .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "business/GATHER/export",
+        'business/GATHER/export',
         {
-          ...this.queryParams,
+          ...this.queryParams
         },
         `GATHER_${new Date().getTime()}.xlsx`
       );
     },
-  },
+    /** 上传文件 */
+    handleFormDataUpload(data){
+      upload(data).then((res) => {
+        if(res.code == 200){
+          this.$modal.msgSuccess(res.msg);
+          this.getList();
+        }else {
+          this.$modal.msgError(res.msg);
+        }
+      }).catch(error => {
+          this.$modal.msgError(error);
+          this.cancel()
+          this.openUpload = false
+        });
+    }
+  }
 };
 </script>

src/views/index.vue

@@ -5,56 +5,56 @@
       <iframe allowtransparency="true" frameborder="0" width="180" height="36" scrolling="no" style="padding-top:10px;"
       						src="//tianqi.2345.com/plugin/widget/index.htm?s=3&z=2&t=0&v=0&d=2&bd=0&k=&f=#545555&ltf=#545555&htf=ffffff&q=1&e=1&a=1&c=72036&w=180&h=36&align=center"></iframe>
       </div>
-    <div class="cbox">
-      <div class="ctitle">各保税区综合评分概况</div>
-      <div class="rows">
-        <div class="row">
-          <div class="out">
-            <div class="int">
-              <span class="icon" style="background-color: rgba(37, 97, 239, 1)">&#xe6e0;</span>
-              <div class="num">80</div>
-              <div class="desc">南宁综合保税区</div>
-            </div>
-          </div>
-        </div>
-        <div class="row">
-          <div class="out">
-            <div class="int">
-              <span class="icon" style="background-color: rgba(102, 110, 232, 1)">&#xe6e0;</span>
-              <div class="num">80</div>
-              <div class="desc">钦州综合保税区</div>
-            </div>
-          </div>
-        </div>
-        <div class="row">
-          <div class="out">
-            <div class="int">
-              <span class="icon" style="background-color: rgba(61, 212, 167, 1)">&#xe6e0;</span>
-              <div class="num">80</div>
-              <div class="desc">北海综合保税区</div>
-            </div>
-          </div>
-        </div>
-        <div class="row">
-          <div class="out">
-            <div class="int">
-              <span class="icon" style="background-color: rgba(250, 116, 107, 1)">&#xe6e0;</span>
-              <div class="num">80</div>
-              <div class="desc">凭祥综合保税区</div>
-            </div>
-          </div>
-        </div>
-        <div class="row">
-          <div class="out">
-            <div class="int">
-              <span class="icon" style="background-color: rgba(253, 219, 120, 1)">&#xe6e0;</span>
-              <div class="num">80</div>
-              <div class="desc">梧州综合保税区</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
+<!--    <div class="cbox">-->
+<!--      <div class="ctitle">各保税区综合评分概况</div>-->
+<!--      <div class="rows">-->
+<!--        <div class="row">-->
+<!--          <div class="out">-->
+<!--            <div class="int">-->
+<!--              <span class="icon" style="background-color: rgba(37, 97, 239, 1)">&#xe6e0;</span>-->
+<!--              <div class="num">80</div>-->
+<!--              <div class="desc">南宁综合保税区</div>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--        <div class="row">-->
+<!--          <div class="out">-->
+<!--            <div class="int">-->
+<!--              <span class="icon" style="background-color: rgba(102, 110, 232, 1)">&#xe6e0;</span>-->
+<!--              <div class="num">80</div>-->
+<!--              <div class="desc">钦州综合保税区</div>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--        <div class="row">-->
+<!--          <div class="out">-->
+<!--            <div class="int">-->
+<!--              <span class="icon" style="background-color: rgba(61, 212, 167, 1)">&#xe6e0;</span>-->
+<!--              <div class="num">80</div>-->
+<!--              <div class="desc">北海综合保税区</div>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--        <div class="row">-->
+<!--          <div class="out">-->
+<!--            <div class="int">-->
+<!--              <span class="icon" style="background-color: rgba(250, 116, 107, 1)">&#xe6e0;</span>-->
+<!--              <div class="num">80</div>-->
+<!--              <div class="desc">凭祥综合保税区</div>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--        <div class="row">-->
+<!--          <div class="out">-->
+<!--            <div class="int">-->
+<!--              <span class="icon" style="background-color: rgba(253, 219, 120, 1)">&#xe6e0;</span>-->
+<!--              <div class="num">80</div>-->
+<!--              <div class="desc">梧州综合保税区</div>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </div>-->
     <div class="row" style="width: 40%; float: left; margin-top: 15px">
       <div class="cbox">
         <div class="lable">快捷入口</div>

src/views/news/edit.vue

@@ -38,12 +38,13 @@ export default {
   data() {
     return {
       typeList: [
-        { label: '要闻资讯', value: '1' },
-        { label: '政策法规', value: '2' },
-        { label: '通知公告', value: '3' },
-        { label: '政策解读', value: '4' }
+        { label: '要闻动态', value: 1 },
+        { label: '政策法规', value: 2 },
+        { label: '通知公告', value: 3 },
+        { label: '政策解读', value: 4 },
+        { label: '投资导航', value: 5 }
       ],
-      form: {},
+      form: {type:2},
       rules: {
         title: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
         content: [{ required: true, message: '内容不能为空', trigger: 'blur' }],
@@ -67,9 +68,14 @@ export default {
     }
   },
   mounted() {
+    console.log('asd:' + this.param.type);
+    if (this.param.type) {
+      this.form.type =parseInt(this.param.type);
+    }
     if (this.param.id) {
       getNEWS(this.param.id).then(response => {
         this.form = response.data;
+        this.form.type=parseInt(this.form.type);
         this.form.content = response.data.content.replace(new RegExp('/profile/upload/', 'g'), this.baseUrl + '/profile/upload/');
       });
     }

src/views/news/index.vue

@@ -84,10 +84,11 @@ export default {
   data() {
     return {
       typeList: [
-        { label: '要闻资讯', value: '1' },
+        { label: '要闻动态', value: '1' },
         { label: '政策法规', value: '2' },
         { label: '通知公告', value: '3' },
-        { label: '政策解读', value: '4' }
+        { label: '政策解读', value: '4' },
+        { label: '投资导航', value: '5' }
       ],
       // 根路径
       // 选中数组
@@ -123,6 +124,7 @@ export default {
     };
   },
   created() {
+    this.queryParams.type=this.$route.query.type;
     this.getList();
   },
   methods: {
@@ -186,7 +188,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.iframe({ obj: edit, param: {}, title: '添加网站新闻', width: '1050px', height: '750px' });
+      this.iframe({ obj: edit, param: {type:this.queryParams.type}, title: '添加网站新闻', width: '1050px', height: '750px' });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

src/views/news/task/index.vue

@@ -124,10 +124,11 @@ export default {
            // 根路径
            baseURL: process.env.VUE_APP_BASE_API,
       typeList: [
-        { label: "要闻资讯", value: "1" },
-        { label: "政策法规", value: "2" },
+        { label: "要闻动态", value: "1" },
+        { label: "政策文件", value: "2" },
         { label: "通知公告", value: "3" },
         { label: "政策解读", value: "4" },
+        { label: "投资导航", value: "5" },
       ],
       fileList: [],
       BigImgVisible: false,

src/views/norm/dataSubmission.vue

@@ -24,11 +24,14 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
     <el-table  :data="GIVEList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="报送参数名称" align="center" prop="fname"></el-table-column>
-      <el-table-column label="计量单位" align="center" prop="funit"></el-table-column>
+      <el-table-column label="计量单位" align="center" prop="funit">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.norm_uint" :value="scope.row.funit" />
+        </template>
+      </el-table-column>
       <el-table-column label="分类占比" align="center" prop="normRatio"></el-table-column>
       <el-table-column label="权数" align="center" prop="fnumber"></el-table-column>
       <el-table-column label="是否启用" align="center" prop="status">
@@ -133,8 +136,11 @@ import { listData } from '@/api/system/dict/data';
 import { formatDate } from '@/utils/index';
 export default {
   name: 'GIVE',
+  dicts: ['norm_uint'],
   data() {
+    
     return {
+      listData,
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
       // 遮罩层

src/views/norm/feeindex.vue

@@ -508,19 +508,20 @@ export default {
 
           this.form.normId = this.normId;
           this.form.status = 1;
-          // if (this.form.id != null) {
-          //   updateNORMFEE(this.form).then(response => {
-          //     this.$modal.msgSuccess("修改成功");
-          //     this.open = false;
-          //     this.getList();
-          //   });
-          // } else {
+           if (this.form.id != null) {
+             updateNORMFEE(this.form).then(response => {
+               this.$modal.msgSuccess("修改成功");
+               this.open = false;
+               this.getList();
+             });
+           } else {
           addNORMFEE(this.form).then((response) => {
             this.$modal.msgSuccess("新增成功");
             this.open = false;
             this.getList();
           });
-          // }
+           }
+
         }
       });
     },