1

src/views/operate/components/case/addModal.vue

@@ -73,7 +73,7 @@
           component: 'Input',
           label: '副标题',
           componentProps: {
-            maxlength: 50,
+            maxlength: 100,
           },
           colProps: {
             span: 22,

src/views/productOperation/cameraScene.vue

@@ -12,7 +12,11 @@
       </a-tabs>
     </template>
     <div class="desc-wrap-BasicTable">
-      <BasicTable @register="registerTable" ref="tableRef">
+      <BasicTable
+        @register="registerTable"
+        ref="tableRef"
+        :rowSelection="tableType == 3 ? false : rowSelection"
+      >
         <template #toolbar>
           <a-button type="primary" @click="handleMoveAll"> 批量迁移</a-button>
         </template>
@@ -53,7 +57,7 @@
               },
               {
                 label: '优先级',
-                ifShow: getTypeCheckPerm('scenes-move') && record.statusString == -4,
+                ifShow: getTypeCheckPerm('scenes-move') && record.status == -4,
                 onClick: handlePriority.bind(null, record),
               },
               {
@@ -72,7 +76,8 @@
               {
                 label: '重算',
                 disabled: record.status == 0 || (record.status == -2 && record.payStatus != 1),
-                ifShow: getTypeCheckPerm('scenes-recalculate') && tableType != 3,
+                ifShow:
+                  getTypeCheckPerm('scenes-recalculate') && tableType != 3 && record.status != -4,
                 popConfirm: {
                   title: '是否重算？',
                   confirm: handleReset.bind(null, record),
@@ -113,7 +118,11 @@
       :okButtonProps="{ disabled: canDownload }"
     />
     <MoveModal @update="reload" @register="registerMoveModal" />
-    <priorityMoadl @update="reload" @register="registerPriority" />
+    <priorityMoadl
+      @clearSelected="clearSelectedRowKeys"
+      @update="reload"
+      @register="registerPriority"
+    />
   </PageWrapper>
 </template>
 <script lang="ts">
@@ -177,7 +186,9 @@
       const loading = ref(false);
       const tableRef = ref<Nullable<TableActionType>>(null);
       const tableType = ref<Number>(0); //0看看 、1看见、2深时
-
+      const rowSelection = ref({
+        type: 'checkbox',
+      });
       const searchFormSs: Partial<FormProps> = {
         labelWidth: 100,
         autoSubmitOnEnter: true,
@@ -193,11 +204,14 @@
       const [registerPriority, { openModal: openPriorityModal }] = useModal();
       const [registerDownModal, { openModal: openDownModal }] = useModal();
       const [registerMoveModal, { openModal: openMoveModal }] = useModal();
-      const [registerTable, { reload, setColumns, getSelectRowKeys, clearSelectedRowKeys }] = useTable({
+      const [
+        registerTable,
+        { setProps, reload, setColumns, getSelectRowKeys, clearSelectedRowKeys },
+      ] = useTable({
         api: operateSceneList,
         title: `场景列表`,
         columns: getColumns(false),
-        rowSelection: { type: 'checkbox' },
+        // rowSelection: { type: 'checkbox' },
         searchInfo: { type: tableType },
         useSearchForm: true,
         formConfig: searchFormSs,
@@ -231,7 +245,7 @@
       function changeTable(val: string) {
         tableType.value = val;
         setColumns(getColumns(val == 2));
-        clearSelectedRowKeys()
+        clearSelectedRowKeys();
         reload();
       }
       function handlePriority(record) {
@@ -239,7 +253,7 @@
       }
       function handleMoveAll() {
         let numList = getSelectRowKeys() || [];
-        if(numList.length == 0){
+        if (numList.length == 0) {
           return createMessage.error('请选择批量迁移的场景');
         }
         openMoveModal(true, {
@@ -352,7 +366,9 @@
           message.success({
             content: '操作成功',
           });
-          reload();
+          setTimeout(() => {
+            reload();
+          }, 500);
         });
       }
       function getTypeCheckPerm(val) {
@@ -384,6 +400,8 @@
         downloadOption,
         cancelDownload,
         getTypeCheckPerm,
+        rowSelection,
+        clearSelectedRowKeys,
       };
     },
   });

src/views/productOperation/modal/priorityMoadl.vue

@@ -4,6 +4,7 @@
     @register="register"
     title="优先级设置"
     @ok="handleSubmit"
+    :width="600"
     :height="300"
     :min-height="0"
   >
@@ -31,7 +32,7 @@
     props: {
       userData: { type: Object },
     },
-    emits: ['update', 'register'],
+    emits: ['update', 'register', 'clearSelected'],
     setup(props, { emit }) {
       const modelRef = ref({
         num: '',
@@ -66,9 +67,16 @@
           componentProps: {
             placeholder: '请输入相机SN码',
             maxLength: 15,
-            api: mqQueueConfigList,
+            api: async function (params) {
+              const res = (await mqQueueConfigList(params)) as any as TreeNode[];
+              return res.map(ele => {
+                let remark = ele.remark.replace('${openScalingTime}', ele.openScalingTime);
+                remark = remark.replace('${scalingThreshold}', ele.scalingThreshold);
+                return {...ele, name: remark}
+              });
+            },
             // numberToString: true,
-            labelField: 'remark',
+            labelField: 'name',
             valueField: 'id',
             immediate: true,
             params: {
@@ -117,6 +125,7 @@
           resetFields();
           createMessage.success('优先级设置成功。');
           emit('update');
+          emit('clearSelected');
         } catch (error) {
           console.log('not passing', error);
         }

src/views/productOperation/viewKankan.vue

@@ -121,7 +121,11 @@
       :okButtonProps="{ disabled: canDownload }"
     />
     <MoveModal @update="reload" @register="registerMoveModal" />
-    <priorityMoadl @update="reload" @register="registerPriority" />
+    <priorityMoadl
+      @clearSelected="clearSelectedRowKeys"
+      @update="reload"
+      @register="registerPriority"
+    />
   </PageWrapper>
 </template>
 <script lang="ts">
@@ -409,6 +413,7 @@
         cancelDownload,
         handleColdStorage,
         handleCopy,
+        clearSelectedRowKeys,
       };
     },
   });