代码修改

src/api/product/productImageRecord.js

@@ -0,0 +1,50 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/pl-product/productImageRecord/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/pl-product/productImageRecord/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/pl-product/productImageRecord/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/pl-product/productImageRecord/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/pl-product/productImageRecord/submit',
+    method: 'post',
+    data: row
+  })
+}
+

src/config/website.js

@@ -5,7 +5,7 @@ export default {
   title: 'saber',
   logo: 'S',
   key: 'saber', //配置主键,目前用于存储
-  indexTitle: 'Saber Admin',
+  indexTitle: '数智化生产线管理平台',
   clientId: 'saber', // 客户端id
   clientSecret: 'saber_secret', // 客户端密钥
   tenantMode: true, // 是否开启租户模式

src/lang/en.js

@@ -1,5 +1,5 @@
 export default {
-  title: 'Saber Admin',
+  title: '数智化生产线管理平台',
   logoutTip: 'Exit the system, do you want to continue?',
   submitText: 'submit',
   cancelText: 'cancel',

src/lang/zh.js

@@ -1,5 +1,5 @@
 export default {
-  title: 'Saber企业管理平台',
+  title: '数智化生产线管理平台',
   logoutTip: '退出系统, 是否继续?',
   submitText: '确定',
   cancelText: '取消',
@@ -78,7 +78,7 @@ export default {
   },
   login: {
     title: '登录 ',
-    info: 'BladeX 企业级开发平台',
+    info: '数智化生产线管理平台',
     tenantId: '请输入租户ID',
     username: '请输入账号',
     password: '请输入密码',

src/option/product/product.js

@@ -1,3 +1,4 @@
+import { setStore, getStore } from '@/utils/store';
 export default {
   height:'auto',
   calcHeight: 30,
@@ -9,6 +10,7 @@ export default {
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
+  labelWidth:160,
   columnBtn:false,
   addBtn:false,
   editBtn:false,
@@ -35,18 +37,36 @@ export default {
     {
       label: "所属工厂",
       prop: "factoryId",
-      type: "input",
+      search: getStore({ name: 'userInfo' }).user_category==1,
+      hide: getStore({ name: 'userInfo' }).user_category!=1,
+      display: getStore({ name: 'userInfo' }).user_category==1,
+      type: "tree",
+      dicUrl: "/api/pl-factory/factory/select",
+      props: {
+        label: "name",
+        value: "id",
+      },
     },
     {
       label: "所属客户",
       prop: "clientId",
       type: "input",
       search: true,
+      type: "tree",
+      dicUrl: "/api/pl-client/client/select",
+      props: {
+        label: "name",
+        value: "id",
+      },
     },
     {
       label: "批次id",
       prop: "batchId",
       type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
     },
     {
       label: "批次号",
@@ -59,6 +79,10 @@ export default {
       prop: "productModelId",
       type: "select",
       hide: true,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
     },
     {
       label: "产品名称",
@@ -78,16 +102,26 @@ export default {
       viewDisplay: false,
       search: true,
     },
+    {
+      label: "二维码编号",
+      prop: "qrCode",
+      type: "input",
+      search: true,
+    },
     {
       label: "正面图片",
       prop: "frontImg",
-      type: "input",
+      type: 'upload',
+      listType: 'picture-img',
+      dataType:"String",
       hide: true,
     },
     {
       label: "背面图片",
       prop: "backImg",
-      type: "input",
+      type: 'upload',
+      listType: 'picture-img',
+      dataType:"String",
       hide: true,
     },
     {
@@ -95,11 +129,6 @@ export default {
       prop: "scanDate",
       type: "input",
     },
-    {
-      label: "二维码编号",
-      prop: "qrCode",
-      type: "input",
-    },
     {
       label: "水冷",
       prop: "waterCooling",
@@ -115,11 +144,11 @@ export default {
       prop: "orderNo",
       type: "input",
     },
-    {
-      label: "出货批次",
-      prop: "shipmentBatch",
-      type: "input",
-    },
+    // {
+    //   label: "出货批次",
+    //   prop: "shipmentBatch",
+    //   type: "input",
+    // },
     {
       label: "冷板二维码",
       prop: "coldQrCode",
@@ -134,6 +163,17 @@ export default {
       viewDisplay: false,
       hide: true,
     },
+    {
+      label: "状态",
+      prop: "status",
+      addDisplay: false,
+      editDisplay: false,
+      type:"select",
+      dataType:"number",
+      dicUrl:"/blade-system/dict-biz/dictionary?code=order_status",
+      props:{label:"dictValue",value:"dictKey"},
+      search: true,
+    },
     {
       label: "入库时间",
       prop: "inStockDate",
@@ -168,7 +208,6 @@ export default {
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
-      hide: true,
     },
     {
       label: "修改人",
@@ -188,15 +227,6 @@ export default {
       viewDisplay: false,
       hide: true,
     },
-    {
-      label: "状态 1待出库 2维修中 3已出库",
-      prop: "status",
-      type: "input",
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
     {
       label: "是否已删除",
       prop: "isDeleted",

src/option/product/productImageRecord.js

@@ -0,0 +1,110 @@
+export default {
+  height:'auto',
+  calcHeight: 30,
+  tip: false,
+  searchShow: true,
+  searchMenuSpan: 6,
+  border: true,
+  index: true,
+  viewBtn: true,
+  selection: true,
+  menuWidth: 300,
+  column: [
+    {
+      label: "主键",
+      prop: "id",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "租户ID",
+      prop: "tenantId",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "产品id",
+      prop: "productId",
+      type: "input",
+    },
+    {
+      label: "设备id",
+      prop: "equipmentId",
+      type: "input",
+    },
+    {
+      label: "产品图片",
+      prop: "productImage",
+      type: "input",
+    },
+    {
+      label: "创建人",
+      prop: "createUser",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "创建部门",
+      prop: "createDept",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "创建时间",
+      prop: "createTime",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "修改人",
+      prop: "updateUser",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "修改时间",
+      prop: "updateTime",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "状态",
+      prop: "status",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "是否已删除",
+      prop: "isDeleted",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+  ]
+}

src/option/productBatch/product.js

@@ -0,0 +1,81 @@
+import { setStore, getStore } from '@/utils/store';
+export default {
+  columnBtn:false,
+  sortable: false,
+  addBtn: false,
+  editBtn: false,
+  addRowBtn: false,
+  cellBtn: false,
+  cancelBtn: false,
+  deleteBtn: false,
+  menuWidth: 100,
+  menu: false,
+  column: [
+    {
+      label: "产品二维码",
+      prop: "qrCode",
+      type: "input",
+      cell: true,
+      rules: [{
+        required: true,
+        message: "请填写产品二维码",
+        trigger: "blur"
+      }]
+    },
+    {
+      label: "水冷",
+      prop: "waterCooling",
+      type: "input",
+      cell: true,
+      rules: [{
+        required: true,
+        message: "请填写水冷",
+        trigger: "blur"
+      }]
+    },
+    {
+      label: "气密",
+      prop: "airtight",
+      type: "input",
+      cell: true,
+      rules: [{
+        required: true,
+        message: "请填写气密",
+        trigger: "blur"
+      }]
+    },
+    {
+      label: "订单号",
+      prop: "orderNo",
+      type: "input",
+      cell: true,
+      rules: [{
+        required: true,
+        message: "请填写订单号",
+        trigger: "blur"
+      }]
+    },
+    // {
+    //   label: "出货批次",
+    //   prop: "shipmentBatch",
+    //   type: "input",
+    //   cell: true,
+    //   rules: [{
+    //     required: true,
+    //     message: "请填写出货批次",
+    //     trigger: "blur"
+    //   }]
+    // },
+    {
+      label: "冷板二维码",
+      prop: "coldQrCode",
+      type: "input",
+      cell: true,
+      rules: [{
+        required: true,
+        message: "请填写冷板二维码",
+        trigger: "blur"
+      }]
+    },
+  ]
+}

src/option/productBatch/productBatch.js

@@ -1,3 +1,4 @@
+import { setStore, getStore } from '@/utils/store';
 export default {
   height:'auto',
   calcHeight: 30,
@@ -10,6 +11,8 @@ export default {
   selection: true,
   dialogClickModal: false,
   columnBtn:false,
+  editBtn:false,
+  delBtn:false,
   column: [
     {
       label: "主键",
@@ -32,30 +35,66 @@ export default {
     {
       label: "所属工厂",
       prop: "factoryId",
-      type: "input",
+      search: getStore({ name: 'userInfo' }).user_category==1,
+      hide: getStore({ name: 'userInfo' }).user_category!=1,
+      display: getStore({ name: 'userInfo' }).user_category==1,
+      type: "tree",
+      dicUrl: "/api/pl-factory/factory/select",
+      props: {
+        label: "name",
+        value: "id",
+      },
+      rules: [{
+        required: true,
+        message: "请选择所属工厂",
+        trigger: "blur"
+      }]
     },
     {
       label: "批次号",
       prop: "batchNo",
       type: "input",
       search: true,
+      addDisplay: false,
+      editDisplay: false,
     },
     {
-      label: "产品型号id",
+      label: "产品型号",
       prop: "productModelId",
       type: "input",
+      search: true,
+      type: "tree",
+      dicUrl: "/api/pl-productModel/productModel/select",
+      props: {
+        label: "productName",
+        value: "id",
+      },
+      // typeformat (item, label, value) {
+      //   return `${item.productName}-${item.productModel}`
+      // },
+      rules: [{
+        required: true,
+        message: "请选择产品型号",
+        trigger: "blur"
+      }]
     },
     {
       label: "产品名称",
       prop: "productName",
       type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
       search: true,
     },
     {
       label: "产品型号",
       prop: "productModel",
       type: "input",
-      search: true,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
     },
     {
       label: "创建人",
@@ -118,6 +157,12 @@ export default {
       editDisplay: false,
       viewDisplay: false,
       hide: true,
-    },
+    }, {
+      labelWidth: 0,
+      label: '',
+      prop: 'details',
+      span: 24,
+      hide: true
+    }
   ]
 }

src/option/productModel/productModel.js

@@ -37,6 +37,7 @@ export default {
       hide: getStore({ name: 'userInfo' }).user_category!=1,
       display: getStore({ name: 'userInfo' }).user_category==1,
       type: "tree",
+      cascader: [getStore({ name: 'userInfo' }).user_category==1?'clientId':''],
       dicUrl: "/api/pl-factory/factory/select",
       props: {
         label: "name",
@@ -49,7 +50,7 @@ export default {
       type: "input",
       search: true,
       type: "tree",
-      dicUrl: "/api/pl-client/client/select",
+      dicUrl: "/api/pl-client/client/select?factoryId={{factoryId}}",
       props: {
         label: "name",
         value: "id",
@@ -71,6 +72,14 @@ export default {
       label: "规格",
       prop: "productSpec",
       type: "input",
+      rules: [
+        {
+          required: true,
+          message: '请输入规格4位数字',
+          trigger: 'click',
+        },
+        { min: 4, max: 4, message: "请输入4位数字", trigger: "blur" }
+      ],
     },
     {
       label: "创建人",

src/option/productRework/productRework.js

@@ -1,3 +1,4 @@
+import { setStore, getStore } from '@/utils/store';
 export default {
   height:'auto',
   calcHeight: 30,
@@ -9,7 +10,11 @@ export default {
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
+  labelWidth:160,
   columnBtn:false,
+  addBtn:false,
+  editBtn:false,
+  delBtn:false,
   column: [
     {
       label: "主键",
@@ -32,12 +37,21 @@ export default {
     {
       label: "所属工厂",
       prop: "factoryId",
-      type: "input",
+      search: getStore({ name: 'userInfo' }).user_category==1,
+      hide: getStore({ name: 'userInfo' }).user_category!=1,
+      display: getStore({ name: 'userInfo' }).user_category==1,
+      type: "tree",
+      dicUrl: "/api/pl-factory/factory/select",
+      props: {
+        label: "name",
+        value: "id",
+      },
     },
     {
       label: "产品id",
       prop: "productId",
       type: "input",
+      hide: true,
     },
     {
       label: "产品二维码",
@@ -49,6 +63,7 @@ export default {
       label: "产品型号id",
       prop: "productModelId",
       type: "input",
+      hide: true,
     },
     {
       label: "产品名称",
@@ -62,18 +77,61 @@ export default {
       type: "input",
       search: true,
     },
+    {
+      label: "报修图片",
+      prop: "repairsImgs",
+      dataType: 'string',
+      type: 'upload',
+      hide: true,
+      fileType:'img',//img/video/audio
+      tip: '只能上传jpg/png图片',
+      listType: 'picture-img',
+      span:24
+    },
     {
       label: "维修时间",
       prop: "reworkDate",
       type: "input",
+    },
+    {
+      label: "维修人",
+      prop: "reworkPersonName",
+      type: "input",
+      hide: true,
+    },
+    {
+      label: "维修图片",
+      prop: "reworkImgs",
+      dataType: 'string',
+      type: 'upload',
       hide: true,
+      fileType:'img',//img/video/audio
+      tip: '只能上传jpg/png图片',
+      listType: 'picture-img',
+      span:24
     },
     {
-      label: "维修完成时间",
-      prop: "reworkSucceedDate",
+      label: "审核时间",
+      prop: "auditDate",
+      type: "input",
+    },
+    {
+      label: "审核人",
+      prop: "auditPersonName",
       type: "input",
       hide: true,
     },
+    {
+      label: "状态",
+      prop: "status",
+      addDisplay: false,
+      editDisplay: false,
+      type:"select",
+      dataType:"number",
+      dicUrl:"/blade-system/dict-biz/dictionary?code=repair_status",
+      props:{label:"dictValue",value:"dictKey"},
+      search: true,
+    },
     {
       label: "创建人",
       prop: "createUser",
@@ -98,9 +156,6 @@ export default {
       type: "input",
       addDisplay: false,
       editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-      search: true,
     },
     {
       label: "修改人",
@@ -120,15 +175,6 @@ export default {
       viewDisplay: false,
       hide: true,
     },
-    {
-      label: "状态 1待维修 2已维修 维修成功",
-      prop: "status",
-      type: "input",
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      search: true,
-    },
     {
       label: "是否已删除",
       prop: "isDeleted",

src/page/login/index.vue

@@ -6,7 +6,7 @@
           {{ time }}
         </div>
         <p class="title">{{ $t('login.info') }}</p>
-        <div style="font-size: 15px">
+        <!-- <div style="font-size: 15px">
           <span>----------------------------------------------</span>
           <br />
           <span>管理租户编号：000000</span>
@@ -26,24 +26,24 @@
           <span>租户管理员账号: admin / admin</span>
           <br />
           <span>----------------------------------------------</span>
-        </div>
-        <!--<img class="img" src="/img/logo.png" alt="">-->
+        </div> -->
+        <img class="img" src="/img/logo.png" alt="">
       </div>
       <div class="login-border">
         <div class="login-main">
           <h4 class="login-title">
-            {{ $t('login.title') }}{{ website.title }}
+            {{ $t('login.title') }}
             <top-lang></top-lang>
           </h4>
           <userLogin v-if="activeName === 'user'"></userLogin>
           <codeLogin v-else-if="activeName === 'code'"></codeLogin>
           <thirdLogin v-else-if="activeName === 'third'"></thirdLogin>
-          <div class="login-menu">
+          <!-- <div class="login-menu">
             <a href="#" @click.stop="activeName = 'user'">{{ $t('login.userLogin') }}</a>
-            <!--<a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>-->
+            <a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>
             <a href="#" @click.stop="activeName = 'third'">{{ $t('login.thirdLogin') }}</a>
             <a :href="website.ssoUrl + website.redirectUri">{{ $t('login.ssoLogin') }}</a>
-          </div>
+          </div> -->
         </div>
       </div>
     </div>

src/views/client/client.vue

@@ -156,7 +156,7 @@
             name,
         } = this.query;
         let values = {
-            name_: name,
+            name: name,
         };
         this.$confirm("是否导出数据?", "提示", {
           confirmButtonText: "确定",
@@ -212,7 +212,7 @@
         } = this.query;
 
         let values = {
-          name_: name,
+          name: name,
         };
 
         getList(page.currentPage, page.pageSize, values).then(res => {

src/views/equipment/equipment.vue

@@ -156,9 +156,9 @@
             macAddress,
         } = this.query;
         let values = {
-            eqName_: eqName,
-            eqSn_: eqSn,
-            macAddress_: macAddress,
+            eqName: eqName,
+            eqSn: eqSn,
+            macAddress: macAddress,
         };
         this.$confirm("是否导出数据?", "提示", {
           confirmButtonText: "确定",
@@ -216,9 +216,9 @@
         } = this.query;
 
         let values = {
-          eqName_: eqName,
-          eqSn_: eqSn,
-          macAddress_: macAddress,
+          eqName: eqName,
+          eqSn: eqSn,
+          macAddress: macAddress,
         };
 
         getList(page.currentPage, page.pageSize, values).then(res => {

src/views/factory/factory.vue

@@ -155,8 +155,8 @@
             code,
         } = this.query;
         let values = {
-            name_: name,
-            code_: code,
+            name: name,
+            code: code,
         };
         this.$confirm("是否导出数据?", "提示", {
           confirmButtonText: "确定",
@@ -213,8 +213,8 @@
         } = this.query;
 
         let values = {
-          name_: name,
-          code_: code,
+          name: name,
+          code: code,
         };
 
         getList(page.currentPage, page.pageSize, values).then(res => {

src/views/product/product.vue

@@ -157,10 +157,10 @@
             productModel,
         } = this.query;
         let values = {
-            clientId_: clientId,
-            batchNo_: batchNo,
-            productName_: productName,
-            productModel_: productModel,
+            clientId: clientId,
+            batchNo: batchNo,
+            productName: productName,
+            productModel: productModel,
         };
         this.$confirm("是否导出数据?", "提示", {
           confirmButtonText: "确定",
@@ -216,16 +216,18 @@
           batchNo,
           productName,
           productModel,
+          status,
         } = this.query;
 
         let values = {
-          clientId_: clientId,
-          batchNo_: batchNo,
-          productName_: productName,
-          productModel_: productModel,
+          clientId: clientId,
+          batchNo: batchNo,
+          productName: productName,
+          productModel: productModel,
+          status:status,
         };
 
-        getList(page.currentPage, page.pageSize, values).then(res => {
+        getList(page.currentPage, page.pageSize, this.query).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;

src/views/productBatch/productBatch.vue

@@ -20,17 +20,40 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template #menu-left>
-        <el-button type="danger"
+        <!-- <el-button type="danger"
                    icon="el-icon-delete"
                    plain
                    v-if="permission.productBatch_delete"
                    @click="handleDelete">删 除
-        </el-button>
-        <el-button type="warning"
+        </el-button> -->
+        <!-- <el-button type="warning"
                    plain
                    icon="el-icon-download"
                    @click="handleExport">导 出
-        </el-button>
+        </el-button> -->
+      </template>
+      <template #details-form>
+        <avue-crud :option="optionSub" ref="detailCrud"
+                  :data="form.details">
+                  <!-- <template slot-scope="{row,index}" slot="menu">
+                    <el-button v-if="row.$cellEdit"
+                              text
+                              icon="el-icon-cancel"
+                              type="primary"
+                              @click="rowDelSub(index)">删除</el-button>
+                  </template>
+                  <template slot-scope="{row}" slot="tradeTotalPriceForm">
+                    <span>{{(row.tradeUnitPrice * row.tradeNum)? (row.tradeUnitPrice * row.tradeNum).toFixed(2):0 }}</span>
+                  </template> -->
+
+                  <!-- <template slot-scope="{row,index}" slot="productIdForm">
+                    <el-button v-if="row.$cellEdit"
+                              text
+                              icon="el-icon-cancel"
+                              type="primary"
+                              @click="rowDelSub(index)">删除</el-button>
+                  </template> -->
+        </avue-crud>
       </template>
     </avue-crud>
   </basic-container>
@@ -39,6 +62,7 @@
 <script>
   import {getList, getDetail, add, update, remove} from "@/api/productBatch/productBatch";
   import option from "@/option/productBatch/productBatch";
+  import optionSub from "@/option/productBatch/product.js";
   import {mapGetters} from "vuex";
   import {exportBlob} from "@/api/common";
   import {getToken} from '@/utils/auth';
@@ -61,7 +85,8 @@
         },
         selectionList: [],
         option: option,
-        data: []
+        data: [],
+        optionSub: optionSub
       };
     },
     computed: {
@@ -84,17 +109,24 @@
     },
     methods: {
       rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
+        this.$refs.detailCrud.$refs.cellForm.validate((valid) => {
+          if (valid) {
+            add(row).then(() => {
+              this.onLoad(this.page);
+              this.$message({
+                type: "success",
+                message: "操作成功!"
+              });
+              done();
+            }, error => {
+              loading();
+              window.console.log(error);
+           });
+          } else {
+            loading();
+            return false;
+          }
+        })
       },
       rowUpdate(row, index, done, loading) {
         update(row).then(() => {
@@ -178,6 +210,11 @@
             this.form = res.data.data;
           });
         }
+        if (["add"].includes(type)) {
+          if(!this.form.details){
+            this.form.details = [{"$cellEdit":true},{"$cellEdit":true},{"$cellEdit":true},{"$cellEdit":true},{"$cellEdit":true},{"$cellEdit":true},{"$cellEdit":true}]
+          }
+        }
         done();
       },
       searchReset() {

src/views/productModel/productModel.vue

@@ -156,9 +156,9 @@
             productModel,
         } = this.query;
         let values = {
-            clientId_: clientId,
-            productName_: productName,
-            productModel_: productModel,
+            clientId: clientId,
+            productName: productName,
+            productModel: productModel,
         };
         this.$confirm("是否导出数据?", "提示", {
           confirmButtonText: "确定",
@@ -216,9 +216,9 @@
         } = this.query;
 
         let values = {
-          clientId_: clientId,
-          productName_: productName,
-          productModel_: productModel,
+          clientId: clientId,
+          productName: productName,
+          productModel: productModel,
         };
 
         getList(page.currentPage, page.pageSize, values).then(res => {

src/views/productRework/productRework.vue

@@ -20,7 +20,7 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template #menu-left>
-        <el-button type="danger"
+        <!-- <el-button type="danger"
                    icon="el-icon-delete"
                    plain
                    v-if="permission.productRework_delete"
@@ -30,7 +30,7 @@
                    plain
                    icon="el-icon-download"
                    @click="handleExport">导 出
-        </el-button>
+        </el-button> -->
       </template>
     </avue-crud>
   </basic-container>

src/views/wel/index.vue

@@ -5,7 +5,7 @@
         <third-register></third-register>
       </el-col>
 
-      <el-col :span="24">
+      <!-- <el-col :span="24">
         <basic-container>
           <p style="text-align: center">
             <img src="https://img.shields.io/badge/Release-V3.2.0-green.svg" alt="Downloads" />
@@ -29,8 +29,8 @@
             </a>
           </p>
         </basic-container>
-      </el-col>
-      <el-col :span="16">
+      </el-col> -->
+      <!-- <el-col :span="16">
         <basic-container>
           <el-collapse v-model="activeNames" @change="handleChange">
             <el-collapse-item title="欢迎使用Saber" name="1">
@@ -138,8 +138,8 @@
             </el-collapse-item>
           </el-collapse>
         </basic-container>
-      </el-col>
-      <el-col :span="8">
+      </el-col> -->
+      <!-- <el-col :span="8">
         <el-col :span="24">
           <basic-container>
             <div class="el-font-size">
@@ -974,8 +974,8 @@
               </el-collapse-item>
             </el-collapse>
           </basic-container>
-        </el-col>
-      </el-col>
+        </el-col> -->
+      <!-- </el-col> -->
     </el-row>
   </div>
 </template>

vite.config.js

@@ -9,7 +9,7 @@ export default ({ mode, command }) => {
   return defineConfig({
     base: VITE_APP_BASE,
     server: {
-      port: 2888,
+      port: 1888,
       proxy: {
         '/api': {
           target: 'http://localhost',