瀏覽代碼

feat(组件):

修改bug
tangning 2 年之前
父節點
當前提交
4acba35953

二進制
src/assets/images/header.jpg


+ 0 - 1
src/utils/http/axios/Axios.ts

@@ -290,7 +290,6 @@ export class VAxios {
     conf = beforeRequestHook(conf, opt);
     conf = beforeRequestHook(conf, opt);
     }
     }
     conf.requestOptions = opt;
     conf.requestOptions = opt;
-
     conf = this.supportFormData(conf);
     conf = this.supportFormData(conf);
     return new Promise((resolve, reject) => {
     return new Promise((resolve, reject) => {
       this.axiosInstance
       this.axiosInstance

+ 1 - 4
src/views/account/product/index.vue

@@ -62,10 +62,7 @@
                   (record.payStatus != 1 && record.status - 0 == 0) ||
                   (record.payStatus != 1 && record.status - 0 == 0) ||
                   (record.payStatus != 1 && record.status - 0 == -1),
                   (record.payStatus != 1 && record.status - 0 == -1),
                 ifShow:getCheckPerm('account-productCopy'),
                 ifShow:getCheckPerm('account-productCopy'),
-                popConfirm: {
-                  title: '是否复制?',
-                  confirm: handleCopy.bind(null, record),
-                },
+                onClick: handleCopy.bind(null, record),
               },
               },
               {
               {
                 label: '删除',
                 label: '删除',

+ 2 - 2
src/views/customer/modal/MoveModal.vue

@@ -2,7 +2,7 @@
   <BasicModal
   <BasicModal
     v-bind="$attrs"
     v-bind="$attrs"
     @register="register"
     @register="register"
-    title="新增相机"
+    title="迁移场景"
     @visible-change="handleVisibleChange"
     @visible-change="handleVisibleChange"
     @cancel="resetFields"
     @cancel="resetFields"
     @ok="handleSubmit"
     @ok="handleSubmit"
@@ -57,7 +57,7 @@
 
 
           required: true,
           required: true,
           colProps: {
           colProps: {
-            span: 24,
+            span: 16,
           },
           },
           rules: [
           rules: [
             {
             {

+ 1 - 5
src/views/customer/scene.vue

@@ -49,11 +49,7 @@
                 disabled:!(record.status == 1 || record.status == -2),
                 disabled:!(record.status == 1 || record.status == -2),
                 ifShow:getTypeCheckPerm('customer-scenes-copy'),
                 ifShow:getTypeCheckPerm('customer-scenes-copy'),
                 //icon: 'akar-icons:copy',
                 //icon: 'akar-icons:copy',
-                //onClick: handleCopy.bind(null, record),
-                popConfirm: {
-                  title: '是否复制?',
-                  confirm: handleCopy.bind(null, record),
-                },
+                onClick: handleCopy.bind(null, record),
               },
               },
               {
               {
                 label: '删除',
                 label: '删除',

+ 1 - 0
src/views/device/detailsMoadl.vue

@@ -61,6 +61,7 @@ export default defineComponent({
         field: 'outType',
         field: 'outType',
         component: 'Select',
         component: 'Select',
         label: '出库类型',
         label: '出库类型',
+        required: true,
         colProps: {
         colProps: {
           span: 18,
           span: 18,
         },
         },

+ 1 - 1
src/views/device/index.vue

@@ -212,7 +212,7 @@
           },
           },
           {
           {
             field: 'ctivated',
             field: 'ctivated',
-            label: '下单时间',
+            label: '激活时间',
             component: 'RangePicker',
             component: 'RangePicker',
             componentProps: {
             componentProps: {
               format: 'YYYY-MM-DD',
               format: 'YYYY-MM-DD',

+ 1 - 4
src/views/productOperation/cameraScene.vue

@@ -47,10 +47,7 @@
                 label: '复制',
                 label: '复制',
                 disabled:!(record.status == 1 || record.status == -2),
                 disabled:!(record.status == 1 || record.status == -2),
                 ifShow:getTypeCheckPerm('scenes-copy'),
                 ifShow:getTypeCheckPerm('scenes-copy'),
-                popConfirm: {
-                  title: '是否复制?',
-                  confirm: handleCopy.bind(null, record),
-                },
+                onClick: handleCopy.bind(null, record),
               },
               },
               {
               {
                 label: '删除',
                 label: '删除',

+ 2 - 2
src/views/productOperation/modal/MoveModal.vue

@@ -2,7 +2,7 @@
   <BasicModal
   <BasicModal
     v-bind="$attrs"
     v-bind="$attrs"
     @register="register"
     @register="register"
-    title="新增相机"
+    title="迁移场景"
     @visible-change="handleVisibleChange"
     @visible-change="handleVisibleChange"
     @cancel="resetFields"
     @cancel="resetFields"
     @ok="handleSubmit"
     @ok="handleSubmit"
@@ -57,7 +57,7 @@
 
 
           required: true,
           required: true,
           colProps: {
           colProps: {
-            span: 24,
+            span: 16,
           },
           },
           rules: [
           rules: [
             {
             {