y595705120 3 gadi atpakaļ
vecāks
revīzija
385ea999f3

+ 7 - 18
src/pages/data/data.js

@@ -31,7 +31,7 @@ const departs = [{
   },
   {
     "department_id": "59",
-    "department": "图审"
+    "department": "图审中心"
   },
   {
     "department_id": "61",
@@ -89,23 +89,12 @@ const departs = [{
 
 export default {
   departs,
-  categorys: [{
-      "id": "law",
-      "value": "法律法规"
-    },
-    {
-      "id": "mechanism",
-      "value": "机制类"
-    },
-    {
-      "id": "result",
-      "value": "成果类"
-    },
-    {
-      "id": "other",
-      "value": "其他"
-    }
-  ],
+  categorys: {
+    laws: "法律法规",
+    mechanism: "机制制度类",
+    result: "基础性成果类",
+    other: "其他"
+  },
   owners: {
     0: '无权限',
     1: '经办人',

+ 15 - 4
src/pages/other/apply-list.vue

@@ -61,9 +61,11 @@
 
 
         <el-pagination
-          :current-page="1"
-          :page-size="10"
+          :current-page="page"
+          :page-size="pageSize"
           :page-sizes="[10, 30, 50, 100]"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
           :style="{float:'center',padding:'20px'}"
           :total="total"
           layout="total, sizes, prev, pager, next, jumper"
@@ -105,7 +107,7 @@ export default {
       list: data.departs,
       total: 0,
       page:1,
-      size: 20,
+      pageSize: 10,
       searchDepartId: "",
       restaurants: [],
       state3: '',
@@ -130,6 +132,14 @@ export default {
     toDatetime
   },
   methods: {
+    handleSizeChange(size){
+      this.pageSize = size
+      this.getApplyArticalList()
+    },
+    handleCurrentChange(page){
+      this.page = page
+      this.getApplyArticalList()
+    },
     applyDoc( row, index ){
       this.dialogFormVisible = true
       row.index = index
@@ -157,7 +167,8 @@ export default {
 
     },
     getApplyArticalList() {
-      getApplyArticalList( {} ).then( res=>{
+      let {page,pageSize} = this
+      getApplyArticalList( {page,pageSize}  ).then( res=>{
         this.restaurants = res.data.list
         this.total = res.data.total
         console.log("getHotArticalList", res)

+ 3 - 4
src/pages/other/components/IArtical.vue

@@ -17,7 +17,7 @@
 
         <span @click="downloadFile(o)"  style="color: #606266;" >
            <span class="oneline" >
-               【{{o.isOpen?'公':'私'}}】 {{ (index+1)}} 、 {{o.title|filterTitle}}
+               【{{o.isOpen?'公':'私'}}】 {{o.title|filterTitle}}
            </span>
         </span>
 
@@ -30,7 +30,7 @@
 </template>
 
 <script>
-
+  import data  from '@/pages/data/data.js'
   export default {
     props: {
       department: {
@@ -52,7 +52,7 @@
     },
     data() {
       return {
-        categorys:{'laws':'法律法规', 'mechanism':'机制类','result':'成果类', 'other':'其他类', 'more':'更多'}
+        categorys:data.categorys
       };
     },
     filters:{
@@ -65,7 +65,6 @@
       }
     },
     methods: {
-
       handleOpenMore( type ){
         this.$emit("more", type)
       },

+ 1 - 1
src/pages/other/file-add.vue

@@ -20,7 +20,7 @@
          <el-form-item label="所属分类" class="mt20" prop="category">
              <el-select v-model="info.category" collapse-tags placeholder="请选择"  clearable>
                <el-option v-for="(item,index) in categorys"
-               :value="item.value" :key="index" :label="item.value"></el-option>
+               :value="index" :key="index" :label="item"></el-option>
              </el-select>
          </el-form-item>
 

+ 2 - 1
src/pages/other/file-info.vue

@@ -23,7 +23,7 @@
 
             <el-col :span="12">
               <el-form-item label="文件分类">
-                  <span class="pl10 nowrap span-tit">{{info.category }}</span>
+                  <span class="pl10 nowrap span-tit">{{categorys[info.category] }}</span>
               </el-form-item>
             </el-col>
 
@@ -111,6 +111,7 @@
         apply_list: [],
         isLike: 0,
         owners: data.owners,
+        categorys:data.categorys,
         info: {}
       }
     },

+ 1 - 1
src/pages/other/file-manage.vue

@@ -161,7 +161,7 @@ export default {
     },
     handleOpenMore(type){
       console.log("handleOpenMore", this)
-      let query = {category:this.categorys[type], departmentId: this.selectDepartId}
+      let query = {category:type, departmentId: this.selectDepartId}
       let path = '/file-search'
       this.$router.push( {path, query})
     }

+ 17 - 3
src/pages/other/file-search.vue

@@ -22,7 +22,7 @@
               <el-form-item label="选择分类">
                 <el-select v-model="searchInfo.category" collapse-tags placeholder="请选择"  clearable>
                   <el-option v-for="(item,index) in categorys"
-                  :value="item.value" :key="index" :label="item.value"></el-option>
+                  :value="index" :key="index" :label="item"></el-option>
                 </el-select>
               </el-form-item>
 
@@ -48,6 +48,9 @@
             </el-table-column>
 
             <el-table-column label="分类" min-width="50" prop="category">
+              <template v-slot="{row}">
+                <span> {{categorys[row.category]}}</span>
+              </template>
             </el-table-column>
 
 
@@ -68,11 +71,14 @@
           </el-table>
 
           <el-pagination
-            :current-page="1"
-            :page-size="10"
+            :current-page="page"
+            :page-size="pageSize"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
             :page-sizes="[10, 30, 50, 100]"
             :style="{float:'center',padding:'20px'}"
             :total="total"
+
             layout="total, sizes, prev, pager, next, jumper"
           ></el-pagination>
         </el-card>
@@ -135,6 +141,14 @@ export default {
     this.searchInfo.department = department.department||''
   },
   methods: {
+    handleSizeChange(size){
+      this.pageSize = size
+      this.getArticalList()
+    },
+    handleCurrentChange(page){
+      this.page = page
+      this.getArticalList()
+    },
     selectDepartment(item){
       this.departmentId = +item.department_id
       localStorage.setItem("@departmentId", this.departmentId)

+ 14 - 3
src/pages/other/my-file.vue

@@ -61,9 +61,11 @@
 
 
           <el-pagination
-            :current-page="1"
-            :page-size="10"
+            :current-page="page"
+            :page-size="pageSize"
             :page-sizes="[10, 30, 50, 100]"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
             :style="{float:'center',padding:'20px'}"
             :total="total"
             layout="total, sizes, prev, pager, next, jumper"
@@ -140,8 +142,17 @@ export default {
       this.getArticalList()
       // 切换文件列表
     },
+    handleSizeChange(size){
+      this.pageSize = size
+      this.getArticalList()
+    },
+    handleCurrentChange(page){
+      this.page = page
+      this.getArticalList()
+    },
     getArticalList(){
-      let param = {page:this.page,pageSize: this.pageSize, keyword: this.searchInfo.keyword}
+      let {page,pageSize} = this
+      let param = {page,pageSize, keyword: this.searchInfo.keyword}
       this.listApi( param ).then( res=>{
         if( res.code == 200){
           this.list = res.data.list||[]

+ 16 - 4
src/pages/other/reply-list.vue

@@ -46,10 +46,12 @@
 
 
         <el-pagination
-          :current-page="1"
-          :page-size="10"
+          :current-page="page"
+          :page-size="pageSize"
           :page-sizes="[10, 30, 50, 100]"
           :style="{float:'center',padding:'20px'}"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
           :total="total"
           layout="total, sizes, prev, pager, next, jumper"
         ></el-pagination>
@@ -92,7 +94,7 @@ export default {
       list: data.departs,
       total: 0,
       page:1,
-      size: 20,
+      pageSize: 10,
       searchDepartId: "",
       restaurants: [],
       state3: '',
@@ -117,6 +119,14 @@ export default {
     toDatetime
   },
   methods: {
+    handleSizeChange(size){
+      this.pageSize = size
+      this.getReplyArticalList()
+    },
+    handleCurrentChange(page){
+      this.page = page
+      this.getReplyArticalList()
+    },
     applyDoc( row ){
       this.dialogFormVisible = true
       this.form = row
@@ -136,7 +146,9 @@ export default {
       })
     },
     getReplyArticalList() {
-      getReplyArticalList( {} ).then( res=>{
+      let {page,pageSize} = this
+      let param = {pageSize, page}
+      getReplyArticalList( param).then( res=>{
         this.restaurants = res.data.list
         this.total = res.data.total
         console.log("getHotArticalList", res)

+ 5 - 4
vue.config.js

@@ -1,7 +1,8 @@
 'use strict'
 const path = require('path')
 const defaultSettings = require('./src/settings.js')
-
+const HOST = "http://smoa.ndjsxh.cn:8888"
+// const HOST = "http://localhost:8889"
 function resolve(dir) {
   return path.join(__dirname, dir)
 }
@@ -38,17 +39,17 @@ module.exports = {
     },
     proxy: {
       '/runtime': {
-        target: 'http://localhost:8889',
+        target: HOST,
         changeOrigin: true,
         // pathRewrite: { '^/rental': '' },
       },
 	   '/api': {
-        target: 'http://localhost:8889',
+        target: HOST,
         changeOrigin: true,
 	    // pathRewrite: { '^/rental': '' },
 	   },
       '/upload': {
-        target: 'http://localhost:8889',
+        target: HOST,
         changeOrigin: true,
         // pathRewrite: { '^/rental': '' },
       }