package.json

@@ -3,7 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
+    
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
     "build": "vue-cli-service build"
   },
   "dependencies": {

src/api/index.js

@@ -91,6 +91,14 @@ export function cooperatorProductList(pageNum,pageSize){
             pageSize:pageSize,
         });
 }
+export function getCooperatorByModel(pageNum,pageSize,modelNo){
+    return request.post('/cooperator_product/getCooperatorByModel',
+        {
+            pageNum:pageNum,
+            pageSize:pageSize,
+            modelNo:modelNo,
+        });
+}
 export function findCooperatorProductFieldByNum(productNum){
     return request({
         url: '/cooperator_product/findCooperatorProductFieldByNum/'+ productNum,
@@ -211,10 +219,12 @@ export function fieldInfo(){
     return request.get('/model/getField');
 }
 
-export function modelInfo(){
-    return request.get('/model/getUserModel');
+export function modelInfo(pageNum,pageSize){
+    return request.post('/model/getUserModel',{
+        pageNum:pageNum,
+        pageSize:pageSize,
+    });
 }
-
 export function modelSubmit(model_data){
     return request.post('/model/addModel',{
         modeldata:model_data

src/router/index.js

@@ -492,7 +492,7 @@ var routes = [{
             },
             {
                 path: '/modelEdit',
-                name: '首页',
+                name: '编辑模型',
                 component: () => import('../views/system/modelEdit.vue'),
                 meta: {
                     keepAlive: false,
@@ -500,6 +500,16 @@ var routes = [{
                     menu: 'userinfo'
                 }
             },
+            {
+                path: '/modelModify',
+                name: '修改模型信息',
+                component: () => import('../views/system/modelModify.vue'),
+                meta: {
+                    keepAlive: false,
+                    show: true,
+                    menu: 'userinfo'
+                }
+            },
             {
                 path: '/fieldTemplateEdit',
                 name: '编辑字段模板',

src/test.jar

@@ -0,0 +1 @@
+123

src/test1.jar

@@ -0,0 +1 @@
+123123

src/views/system/businessAnalysis.vue

@@ -32,50 +32,50 @@
         <div class="line-between-divs"></div>
 
         <el-table :data="businessShowData.slice((currentPage-1)*pagesize,currentPage*pagesize)" style="width: 100%;" @row-click="onButtonClick" stripe>
-          <el-table-column align="center" label="申请编号" width="240">
+          <el-table-column align="center" label="申请编号" >
             <template v-slot="{row}">
               <span>{{ row.businessNum}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="客户名称" width="150">
+          <el-table-column align="center" label="客户名称">
             <template v-slot="{row}">
               <span>{{ row.customerName}}</span>
             </template>
           </el-table-column>
 
 
-          <el-table-column align="center" label="合作方" width="150">
+          <el-table-column align="center" label="合作方" >
             <template v-slot="{row}">
               <span>{{ row.cooperatorName}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="产品名称" width="150">
+          <el-table-column align="center" label="产品名称">
             <template v-slot="{row}">
               <span>{{ row.productName}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="证件号码" width="180">
+          <el-table-column align="center" label="证件号码">
             <template v-slot="{row}">
               <span>{{ row.certificateNum}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="流程状态" width="150">
+          <el-table-column align="center" label="流程状态" >
             <template v-slot="{row}">
               <span>{{ row.status}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="申请时间" width="180">
+          <el-table-column align="center" label="申请时间" >
             <template v-slot="{row}">
               <span>{{ row.createTime}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="经办人员" width="122">
+          <el-table-column align="center" label="经办人员" >
             <template v-slot="{row}">
               <span>自动</span>
             </template>

src/views/system/businessFail.vue

@@ -32,50 +32,50 @@
         <div class="line-between-divs"></div>
 
         <el-table :data="businessShowData.slice((currentPage-1)*pagesize,currentPage*pagesize)" style="width: 100%;" @row-click="onButtonClick" stripe>
-          <el-table-column align="center" label="申请编号" width="240">
+          <el-table-column align="center" label="申请编号">
             <template v-slot="{row}">
               <span>{{ row.businessNum}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="客户名称" width="150">
+          <el-table-column align="center" label="客户名称" >
             <template v-slot="{row}">
               <span>{{ row.customerName}}</span>
             </template>
           </el-table-column>
 
 
-          <el-table-column align="center" label="合作方" width="150">
+          <el-table-column align="center" label="合作方" >
             <template v-slot="{row}">
               <span>{{ row.cooperatorName}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="产品名称" width="150">
+          <el-table-column align="center" label="产品名称">
             <template v-slot="{row}">
               <span>{{ row.productName}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="证件号码" width="180">
+          <el-table-column align="center" label="证件号码">
             <template v-slot="{row}">
               <span>{{ row.certificateNum}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="流程状态" width="150">
+          <el-table-column align="center" label="流程状态" >
             <template v-slot="{row}">
               <span>{{ row.status}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="申请时间" width="180">
+          <el-table-column align="center" label="申请时间" >
             <template v-slot="{row}">
               <span>{{ row.createTime}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="经办人员" width="122">
+          <el-table-column align="center" label="经办人员" >
             <template v-slot="{row}">
               <span>自动</span>
             </template>

src/views/system/businesstodo.vue

@@ -36,50 +36,50 @@
         <div class="line-between-divs"></div>
 
         <el-table :data="businessShowData.slice((currentPage-1)*pagesize,currentPage*pagesize)" style="width: 100%;" @row-click="onButtonClick" stripe>
-          <el-table-column align="center" label="申请编号" width="240">
+          <el-table-column align="center" label="申请编号" >
             <template v-slot="{row}">
               <span>{{ row.businessNum}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="客户名称" width="150">
+          <el-table-column align="center" label="客户名称" >
             <template v-slot="{row}">
               <span>{{ row.customerName}}</span>
             </template>
           </el-table-column>
 
 
-          <el-table-column align="center" label="合作方" width="150">
+          <el-table-column align="center" label="合作方" >
             <template v-slot="{row}">
               <span>{{ row.cooperatorName}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="产品名称" width="150">
+          <el-table-column align="center" label="产品名称" >
             <template v-slot="{row}">
               <span>{{ row.productName}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="证件号码" width="180">
+          <el-table-column align="center" label="证件号码" >
             <template v-slot="{row}">
               <span>{{ row.certificateNum}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="流程状态" width="150">
+          <el-table-column align="center" label="流程状态" >
             <template v-slot="{row}">
               <span>{{ row.status}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="申请时间" width="180">
+          <el-table-column align="center" label="申请时间" >
             <template v-slot="{row}">
               <span>{{ row.createTime}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="经办人员" width="122">
+          <el-table-column align="center" label="经办人员" >
             <template v-slot="{row}">
               <span>自动</span>
             </template>

src/views/system/cooperatorInfo.vue

@@ -57,9 +57,8 @@
                             @current-change="handleCurrentChange"
                             :current-page="currentPage"
                             :page-size="pagesize"
-                             :page-sizes="[5,10,15]"
-
-                             layout="total,jumper,prev, pager, next,sizes"
+                            :page-sizes="[5,10,15]"
+                            layout="total,jumper,prev, pager, next,sizes"
                             :total=totalSize>
               </el-pagination>
             </div>

src/views/system/fieldDerive.vue

@@ -33,59 +33,59 @@
           </el-tab-pane>
           <el-tab-pane label="衍生字段" name="second">
             <el-table :data="fieldDeriveShow" style="width: 100%;" stripe>
-              <el-table-column align="center" label="编号" width="100">
+              <el-table-column align="center" label="编号" >
                 <template v-slot="{row}">
                   <span>{{ row.fieldNo}}</span>
                 </template>
               </el-table-column>
 
 
-              <el-table-column align="center" label="字段名称（中文）" width="140">
+              <el-table-column align="center" label="字段名称（中文）">
                 <template v-slot="{row}">
                   <span>{{ row.nameZh}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="字段名称（英文）" width="140">
+              <el-table-column align="center" label="字段名称（英文）">
                 <template v-slot="{row}">
                   <span>{{ row.name}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="提取逻辑" width="100">
+              <el-table-column align="center" label="提取逻辑" >
                 <template v-slot="{row}">
                   <span>{{ row.fetchLogic}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="类型" width="100">
+              <el-table-column align="center" label="类型" >
                 <template v-slot="{row}">
                   <span>{{ row.type}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="字段状态" width="100">
+              <el-table-column align="center" label="字段状态" >
                 <template v-slot="{row}">
                   <span>{{ row.status}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="创建者" width="100">
+              <el-table-column align="center" label="创建者" >
                 <template v-slot="{row}">
                   <span>{{ row.createBy}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="创建时间" width="150">
+              <el-table-column align="center" label="创建时间" >
                 <template v-slot="{row}">
                   <span>{{ row.createTime}}</span>
                 </template>
               </el-table-column>
 
-                  <el-table-column align="center" label="操作" width="150">
+                  <el-table-column align="center" label="操作" >
                     <template v-slot="{row}">
-                      <el-button size="mini" type="primary" @click="edit(row)">编辑</el-button>
-                      <el-button size="mini" type="danger" @click="fieldDelete(row)">删除</el-button>
+                      <el-button size="mini" type="primary" @click.stop="edit(row)">编辑</el-button>
+                      <el-button size="mini" type="danger" @click.stop="fieldDelete(row)">删除</el-button>
 
                 </template>
               </el-table-column>

src/views/system/fieldInfo.vue

@@ -29,50 +29,50 @@
         <el-tabs v-model="activeName2"  @tab-click="handleClick2" stretch>
           <el-tab-pane label="基础字段"  name="first">
             <el-table :data="fieldBaseShow" style="width: 100%;" stripe>
-              <el-table-column align="center" label="编号" width="100">
+              <el-table-column align="center" label="编号" >
                 <template v-slot="{row}">
                   <span>{{ row.fieldNo}}</span>
                 </template>
               </el-table-column>
 
 
-              <el-table-column align="center" label="字段名称（中文）" width="140">
+              <el-table-column align="center" label="字段名称（中文）" >
                 <template v-slot="{row}">
                   <span>{{ row.nameZh}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="字段名称（英文）" width="140">
+              <el-table-column align="center" label="字段名称（英文）" >
                 <template v-slot="{row}">
                   <span>{{ row.name}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="提取逻辑" width="100">
+              <el-table-column align="center" label="提取逻辑" >
                 <template v-slot="{row}">
                   <span>{{ row.fetchLogic}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="类型" width="100">
+              <el-table-column align="center" label="类型">
                 <template v-slot="{row}">
                   <span>{{ row.type}}</span>
                 </template>
               </el-table-column>
 
-                  <el-table-column prop="state" label="状态" width="100">
+                  <el-table-column prop="state" label="状态" >
                     <template slot-scope="scope">
                       {{ scope.row.state ? '已启用' : '已禁用' }}
                     </template>
                   </el-table-column>
 
-              <el-table-column align="center" label="创建者" width="100">
+              <el-table-column align="center" label="创建者" >
                 <template v-slot="{row}">
                   <span>{{ row.createBy}}</span>
                 </template>
               </el-table-column>
 
-                  <el-table-column align="center" label="创建时间" width="200">
+                  <el-table-column align="center" label="创建时间">
                     <template v-slot="{row}">
                       <span>{{ row.createTime}}</span>
                     </template>
@@ -93,56 +93,56 @@
               </el-tab-pane>
           <el-tab-pane label="衍生字段" name="second">
             <el-table :data="fieldDeriveShow" style="width: 100%;" stripe>
-              <el-table-column align="center" label="编号" width="100">
+              <el-table-column align="center" label="编号" >
                 <template v-slot="{row}">
                   <span>{{ row.fieldNo}}</span>
                 </template>
               </el-table-column>
 
 
-              <el-table-column align="center" label="字段名称（中文）" width="140">
+              <el-table-column align="center" label="字段名称（中文）">
                 <template v-slot="{row}">
                   <span>{{ row.nameZh}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="字段名称（英文）" width="140">
+              <el-table-column align="center" label="字段名称（英文）" >
                 <template v-slot="{row}">
                   <span>{{ row.name}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="提取逻辑" width="100">
+              <el-table-column align="center" label="提取逻辑" >
                 <template v-slot="{row}">
                   <span>{{ row.fetchLogic}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="类型" width="100">
+              <el-table-column align="center" label="类型" >
                 <template v-slot="{row}">
                   <span>{{ row.type}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="字段状态" width="100">
+              <el-table-column align="center" label="字段状态" >
                 <template v-slot="{row}">
                   <span>{{ row.status}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="创建者" width="100">
+              <el-table-column align="center" label="创建者" >
                 <template v-slot="{row}">
                   <span>{{ row.createBy}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="创建时间" width="150">
+              <el-table-column align="center" label="创建时间">
                 <template v-slot="{row}">
                   <span>{{ row.createTime}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="操作" width="150">
+              <el-table-column align="center" label="操作" >
                 <template v-slot="{row}">
                   <el-button size="mini" type="primary" @click="edit(row)">编辑</el-button>
                   <el-button size="mini" type="danger" @click="delete(row.id)">删除</el-button>

src/views/system/fieldTemplate.vue

@@ -31,40 +31,40 @@
         <el-tabs v-model="activeName2"   stretch>
           <el-tab-pane label="字段表模板"  name="first">
             <el-table :data="templateDataShow" style="width: 100%;" stripe>
-              <el-table-column align="center" label="字段表编号" width="200">
+              <el-table-column align="center" label="字段表编号">
                 <template v-slot="{row}">
                   <span>{{ row.templateNo}}</span>
                 </template>
               </el-table-column>
 
 
-              <el-table-column align="center" label="字段表名称" width="200">
+              <el-table-column align="center" label="字段表名称">
                 <template v-slot="{row}">
                   <span>{{ row.templateName}}</span>
                 </template>
               </el-table-column>
 
 
-              <el-table-column align="center" label="字段表状态" width="170">
+              <el-table-column align="center" label="字段表状态">
                 <template v-slot="{row}">
 
                   <span>{{ row.state ? '已启用' : '已停用' }}</span>
                 </template>
               </el-table-column>
 
-                  <el-table-column align="center" label="创建者" width="140">
+                  <el-table-column align="center" label="创建者" >
                     <template v-slot="{row}">
                       <span>{{ row.createBy}}</span>
                     </template>
                   </el-table-column>
 
-              <el-table-column align="center" label="创建时间" width="170">
+              <el-table-column align="center" label="创建时间" >
                 <template v-slot="{row}">
                   <span>{{ row.createTime}}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column align="center" label="操作" width="170">
+              <el-table-column align="center" label="操作" >
                 <template v-slot="{row}">
                   <el-button size="mini" type="primary" @click="fieldTemplateEdit(row)">编辑</el-button>
                   <el-button size="mini" type="danger" @click="templateDelete(row)">删除</el-button>

src/views/system/modelEdit.vue

@@ -326,9 +326,10 @@ export default {
                 return;
             } else {
                 this.modelState = "已上线";
+                this.$message.success("模型上线成功");
                 request.post('/model/changeState',
                     {
-                        modelid: this.modelNo,
+                        modelid: this.modelId,
                         modelstate: "已上线"
                     });
             }
@@ -344,9 +345,10 @@ export default {
             } else {
                 this.modelState = "暂停使用";
                 console.log(this.modelNo)
+                this.$message.success("模型暂停成功");
                 request.post('/model/changeState',
                     {
-                        modelid: this.modelNo,
+                        modelid: this.modelId,
                         modelstate: "暂停使用"
                     });
             }
@@ -413,7 +415,7 @@ export default {
             }
 
             if (this.inputValue !== '' || myfile.files.length > 0) {
-                this.$alert("修改成功");
+                // this.$alert("修改成功");
                 this.closeDialog(); // 关闭窗口
             }
 

src/views/system/modelInfo.vue

@@ -82,32 +82,32 @@
             </el-table-column>
         </el-table>
         
-        <el-pagination
+        <div class="yema">
+          <el-pagination background
                         @size-change="handleSizeChange"
                         @current-change="handleCurrentChange"
                         :current-page="currentPage"
-                        :page-sizes="[10, 20, 30, 40]"
-                        :page-size="pageSize"
-                        layout="total,jumper,prev, pager, next,sizes"
-                        :total="totalRows"
-                    ></el-pagination>
+                        :page-size="pagesize"
+                         :page-sizes="[5,10,15]"
+
+                         layout="total,jumper,prev, pager, next,sizes"
+                        :total=totalSize >
+          </el-pagination>
+        </div>
         <div class = "bottom-bar" style="margin-top: 20px" >
                 <el-button round type="primary" size="medium" style="position: absolute; left: 55%;" @click="returnLink" >返回</el-button>
         </div>
         </el-main>
         
       </el-container>
-            
-      <div class="yema">
-  
-  </div>
     </div>
   </template>
   
   <script>
   
   import {
-    cooperatorProductList
+    cooperatorProductList,
+    getCooperatorByModel
   } from '@/api/index.js'
   import store from "@/store";
   import request from '@/utils/request.js'
@@ -120,15 +120,15 @@
     components: {},
     data() {
       return {
-        // cooperatorName : this.$route.query.cooperatorName,
+        activeKey: 0,
+        currentPage: 1,
+        pagesize:10,
+        totalSize:'',
         modelNo:this.$route.query.modelNo,
         modelName:this.$route.query.modelName,
         filePath:this.$route.query.filePath,
         cooperatorProductData: [],
-        cooperatorProductShowData: [],
-        currentPage:1,
-        pageSize:10,
-        totalRows:0
+        cooperatorProductShowData:[],
       }
     },
     watch: {},
@@ -138,55 +138,51 @@
     beforeMount() {},
     mounted() 
     {
-        cooperatorProductList(this.currentPage,this.pagesize).then((res) => {
-                if (res.data.cooperator_Product_List) {
-                    this.cooperatorProductData = res.data.cooperator_Product_List;
-                    console.log(this.cooperatorProductData);
-                    this.cooperatorProductData=this.cooperatorProductData.filter(item => {
-                        const modelIdMatch = item.modelId==this.$route.query.modelNo;
-                        console.log(item);
-                        console.log(this.$route.query.modelNo);
-                        // return true;
-                        return modelIdMatch;
-                    });
-                    this.loadData();
-                }
-                
-            }
+        getCooperatorByModel(this.currentPage,this.pagesize,this.modelNo).then(
+          res=>
+          {
+            this.cooperatorProductData=res.data.cooperator_Product_List.list;
+            this.cooperatorProductShowData = this.cooperatorProductData;
+            var j = parseInt(res.data.cooperator_Product_List.total);
+            this.totalSize = j;
+          }
         );
     },
     beforeUpdate() {},
     updated() {},
     destroyed() {},
     methods: {
-      loadData() {
-            // 模拟异步请求数据
-            setTimeout(() => {
-                // 根据当前页码和每页显示的数据条数计算起始索引和结束索引
-                const startIndex = (this.currentPage - 1) * this.pageSize;
-                const endIndex = startIndex + this.pageSize;
-                // 截取指定范围的数据
-                const data = this.cooperatorProductData.slice(startIndex, endIndex);
-                this.cooperatorProductShowData = data;
-                this.totalRows = this.cooperatorProductData.length;
-            }, 500);
-        },
+      handleCurrentChange:function(currentPage){
+        this.currentPage=currentPage;
+        getCooperatorByModel(this.currentPage,this.pagesize,this.modelNo).then(
+            res=>
+            {
+              this.cooperatorProductData=res.data.cooperator_Product_List.list;
+              this.cooperatorProductShowData = this.cooperatorProductData
+
+              // console.log(this.cooperatorShowData[0].cooperatorName)
+            }
+          )
+      },
+      handleSizeChange:function(size){
+        this.pagesize=size;
+        getCooperatorByModel(this.currentPage,this.pagesize,this.modelNo).then(
+            res=>
+            {
+              this.cooperatorProductData=res.data.cooperator_Product_List.list;
+              this.cooperatorProductShowData = this.cooperatorProductData
+
+              // console.log(this.cooperatorShowData[0].cooperatorName)
+            }
+        )
+      },
+
       returnLink()
       {
         //指定跳转地址
         this.$router.push('/userinfo');
       },
-      handleSizeChange(size) {
-            // 每页显示的数据条数发生变化时触发
-            this.pageSize = size;
-            this.currentPage = 1; // 重置当前页码为第一页
-            this.loadData();
-        },
-        handleCurrentChange(page) {
-            // 当前页码发生变化时触发
-            this.currentPage = page;
-            this.loadData();
-        },
+
     },
     fillter: {},
   }

src/views/system/modelModify.vue

@@ -161,7 +161,7 @@ export default {
                 return;
             }
 
-            this.$message.success('修改成功');
+            // this.$message.success('修改成功');
             this.$router.push({
                 path: '/modelEdit',
                 query: {

src/views/system/otherModel.vue

@@ -120,10 +120,6 @@ export default {
                     key: 3,
                     label: "http服务"
                 },
-                {
-                    key: 4,
-                    label: "空模型"
-                },
             ],
         }
     },

src/views/system/userinfo.vue

@@ -42,63 +42,52 @@
             <div class="line-between-divs"></div>
                 <div class="model_table">
                     <el-table class="info-table" :data="modelShowData" @row-click="showDetail" stripe border style="width: 100%">
-                        <el-table-column align="center" label="模型名称" :width="200">
+                        <el-table-column align="center" label="模型名称" >
                             <template v-slot="{row}">
                                                         <span
                                                         >{{ row.modelName }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column align="center" label="模型编号" :width="150">
+                        <el-table-column align="center" label="模型编号"  >
                             <template v-slot="{row}">
                                 <span>{{ row.modelNo }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column align="center" label="状态" :width="120">
+                        <el-table-column align="center" label="状态"  >
                             <template v-slot="{row}">
                                 <span>{{ row.status }}</span>
                             </template>
                         </el-table-column>
 
-                        <el-table-column align="center" label="模型类型" :width="200">
+                        <el-table-column align="center" label="模型类型"  >
                             <template v-slot="{row}">
                                 <span>{{ type_list[row.modelType] }}</span>
                             </template>
                         </el-table-column>
 
-                        <el-table-column align="center" label="创建时间" :width="250">
+                        <el-table-column align="center"  prop="date" label="创建时间"  >
                             <template v-slot="{row}">
                                 <span>{{ row.createTime }}</span>
                             </template>
                         </el-table-column>
 
-                        <el-table-column align="center" label="操作" :width="150">
+                        <el-table-column align="center" label="操作" >
                             <template slot-scope="scope">
-                                <el-button
-                                        type="text"
-
-                                        class="red"
-                                        @click.stop="edit(scope, scope.row)"
-                                >编辑
-                                </el-button>
-                                <el-button
-                                        type="text"
-                                        class="red"
-                                        @click.stop="modelDelet(scope, scope.row)"
-                                >删除
-                                </el-button>
+                                <el-button size="mini" type="primary" @click.stop="edit(scope, scope.row)">编辑</el-button>
+                                <el-button size="mini" type="danger" @click.stop="modelDelet(scope, scope.row)">删除</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
 
                     <el-pagination background
-                        @size-change="handleSizeChange"
-                        @current-change="handleCurrentChange"
-                        :current-page="currentPage"
-                        :page-sizes="[10, 20, 30, 40]"
-                        :page-size="pageSize"
-                        layout="total,jumper,prev, pager, next,sizes"
-                        :total="totalRows"
-                    ></el-pagination>
+                            @size-change="handleSizeChange"
+                            @current-change="handleCurrentChange"
+                            :current-page="currentPage"
+                            :page-size="pagesize"
+                            :page-sizes="[5,10,15]"
+                            layout="total,jumper,prev, pager, next,sizes"
+                            :total=totalSize>
+              </el-pagination>
 
                 </div>
                 <el-dialog
@@ -133,16 +122,16 @@ export default {
     name: "userinfo",
     data() {
         return {
-            userName: "",
-            nickName: "",
-            fieldState: "",
-            fieldData: {},
-            fieldExist: false,
+            activeKey: 0,
+            currentPage: 1,
+            pagesize:10,
             modelShowData: [],
             modelData: [],
-            cooperatorProductData: [],
-            cooperatorProductShowData: [],
-            modelExist: false,
+            // userName: "",
+            // nickName: "",
+            // fieldState: "",
+            // fieldData: {},
+            // fieldExist: false,
             type_list: [
                 "自定义模型",
                 "jar模型",
@@ -168,83 +157,49 @@ export default {
 
             selectedItem: null,
             rowToDelete:null,
-
-            currentPage:1,
-            pageSize:10,
-            totalRows:0,
+            totalSize:'',
             dialogVisible:false
 
         }
     },
     mounted() {
-        userInfo().then((res) => {
-            this.nickName = res.data.nickName;
-            this.userName = res.data.userName;
-            // console.log( res.data);
-
-        });
-        // fieldInfo().then((res)=>{
-        //   if(res.data.fieldData)
-        //   {
-        //       this.fieldExist=true;
-        //       this.fieldData = JSON.parse(res.data.fieldData);
-        //       console.log(res.data);
-        //       this.fieldState=res.data.fieldState;
-        //   }
-        //
+        // userInfo().then((res) => {
+        //     this.nickName = res.data.nickName;
+        //     this.userName = res.data.userName;
         // });
-
-        modelInfo().then((res) => {
-                if (res.data.modelData) {
-                    this.modelExist = true;
-                    this.modelData = res.data.modelData;
-                    this.loadData();
-                    // this.modelShowData = this.modelData;
-                }
-            }
-        );
-
-        cooperatorProductList(this.currentPage,this.pagesize).then((res) => {
-                if (res.data.cooperator_Product_List) {
-                    this.cooperatorProductData = res.data.cooperator_Product_List;
-                    console.log(this.cooperatorProductData);
-                }
-            }
-        );
+        modelInfo(this.currentPage,this.pagesize).then(res=>
+        {   
+            console.log(this.pageSize);
+            this.modelData = res.data.modelData.list;
+            this.modelShowData = this.modelData;
+            var j = parseInt(res.data.modelData.total);
+            this.totalSize = j;
+            // console.log(this.modelShowData[0]);
+        })
     },
     methods: {
-        loadData() {
-            // 模拟异步请求数据
-            setTimeout(() => {
-                // 根据当前页码和每页显示的数据条数计算起始索引和结束索引
-                const startIndex = (this.currentPage - 1) * this.pageSize;
-                const endIndex = startIndex + this.pageSize;
-                // 截取指定范围的数据
-                const data = this.modelData.slice(startIndex, endIndex);
-                this.modelShowData = data;
-                this.totalRows = this.modelData.length;
-            }, 500);
+        handleCurrentChange:function(currentPage) {
+            // 当前页码发生变化时触发
+            this.currentPage=currentPage;
+            modelInfo(this.currentPage,this.pagesize).then(res=>
+                {
+                    this.modelData = res.data.modelData.list;
+                    this.modelShowData = this.modelData;
+                }
+            ) 
         },
-        handleSizeChange(size) {
+        handleSizeChange:function(size){
             // 每页显示的数据条数发生变化时触发
             this.pageSize = size;
-            this.currentPage = 1; // 重置当前页码为第一页
-            this.loadData();
-        },
-        handleCurrentChange(page) {
-            // 当前页码发生变化时触发
-            this.currentPage = page;
-            this.loadData();
+            modelInfo(this.currentPage,this.pagesize).then(res=>
+                {
+                    this.modelData = res.data.modelData.list;
+                    this.modelShowData = this.modelData;
+                }
+            ) 
         },
         showDetail(row) {
             this.selectedItem = row;
-            this.cooperatorProductShowData=this.cooperatorProductData.filter(item => {
-                const modelIdMatch = item.modelId==row.modelNo;
-                console.log(item);
-                console.log(row.modelNo);
-                // return true;
-                return modelIdMatch;
-            });
             this.$router.push({
                 path: '/modelInfo',
                 query: {