feat: 优化场景列表的表达式优化

src/components/vue3cron/vue3cron.vue

@@ -1,8 +1,8 @@
 
 <template>
   <div class="vue3-cron-div">
-    <el-button class="language" type="text" >
-  </el-button>
+    <el-button class="language" type="text">
+    </el-button>
     <el-tabs type="border-card">
       <el-tab-pane>
         <template #label>
@@ -25,7 +25,7 @@
               <el-select size="small" multiple v-model="state.second.specificSpecific">
                 <el-option v-for="(val, index) in 60" :key="index" :value="val - 1">{{
                   val - 1
-                }}</el-option>
+                  }}</el-option>
               </el-select>
             </el-radio>
           </el-row>
@@ -60,7 +60,7 @@
               <el-select size="small" multiple v-model="state.minute.specificSpecific">
                 <el-option v-for="(val, index) in 60" :key="index" :value="val - 1">{{
                   val - 1
-                }}</el-option>
+                  }}</el-option>
               </el-select>
             </el-radio>
           </el-row>
@@ -95,7 +95,7 @@
               <el-select size="small" multiple v-model="state.hour.specificSpecific">
                 <el-option v-for="(val, index) in 24" :key="index" :value="val - 1">{{
                   val - 1
-                }}</el-option>
+                  }}</el-option>
               </el-select>
             </el-radio>
           </el-row>
@@ -217,7 +217,7 @@
           </el-row>
         </div>
       </el-tab-pane>
-      <el-tab-pane>
+      <!-- <el-tab-pane>
         <template #label>
           <span><i class="el-icon-date"></i> {{ state.text.Year.name }}</span>
         </template>
@@ -247,14 +247,14 @@
             </el-radio>
           </el-row>
         </div>
-      </el-tab-pane>
+      </el-tab-pane> -->
     </el-tabs>
     <div class="bottom">
       <div class="value" style="margin: 10px;">
         <span> cron预览: </span>
         <el-tag type="primary">
           {{ state.cron }}
-        </el-tag> <span>{秒数} {分钟} {小时} {日期} {月份} {?} {年份}</span>
+        </el-tag> <span>{秒数} {分钟} {小时} {日期} {月份} {?}</span>
       </div>
       <div class="buttonDiv" style="text-align: right;">
         <el-button type="primary" size="mini" @click.stop="handleChange">{{ state.text.Save }}</el-button>
@@ -329,14 +329,14 @@ export default defineComponent({
         rangeEnd: 0,
         specificSpecific: []
       },
-      year: {
-        cronEvery: '1',
-        incrementStart: 2017,
-        incrementIncrement: 1,
-        rangeStart: 0,
-        rangeEnd: 0,
-        specificSpecific: []
-      },
+      // year: {
+      //   cronEvery: '1',
+      //   incrementStart: 2017,
+      //   incrementIncrement: 1,
+      //   rangeStart: 0,
+      //   rangeEnd: 0,
+      //   specificSpecific: []
+      // },
       output: {
         second: '',
         minute: '',
@@ -344,7 +344,7 @@ export default defineComponent({
         day: '',
         month: '',
         Week: '',
-        year: ''
+        // year: ''
       },
       text: computed(() => Language[state.language || 'cn']),
       secondsText: computed(() => {
@@ -504,32 +504,32 @@ export default defineComponent({
         }
         return months;
       }),
-      yearsText: computed(() => {
-        let years = '';
-        let cronEvery = state.year.cronEvery;
-        switch (cronEvery.toString()) {
-          case '1':
-            years = '*';
-            break;
-          case '2':
-            years = state.year.incrementStart + '/' + state.year.incrementIncrement;
-            break;
-          case '3':
-            state.year.specificSpecific.map(val => {
-              years += val + ',';
-            });
-            years = years.slice(0, -1);
-            break;
-          case '4':
-            years = state.year.rangeStart + '-' + state.year.rangeEnd;
-            break;
-        }
-        return years;
-      }),
+      // yearsText: computed(() => {
+      //   let years = '';
+      //   let cronEvery = state.year.cronEvery;
+      //   switch (cronEvery.toString()) {
+      //     case '1':
+      //       years = '*';
+      //       break;
+      //     case '2':
+      //       years = state.year.incrementStart + '/' + state.year.incrementIncrement;
+      //       break;
+      //     case '3':
+      //       state.year.specificSpecific.map(val => {
+      //         years += val + ',';
+      //       });
+      //       years = years.slice(0, -1);
+      //       break;
+      //     case '4':
+      //       years = state.year.rangeStart + '-' + state.year.rangeEnd;
+      //       break;
+      //   }
+      //   return years;
+      // }),
       cron: computed(() => {
 
         let cron = `${state.secondsText || '*'} ${state.minutesText || '*'} ${state.hoursText || '*'} ${state.daysText || '*'
-          } ${state.monthsText || '*'} ${state.weeksText || '?'} ${state.yearsText || '*'}`;
+          } ${state.monthsText || '*'} ${state.weeksText || '?'}`;
 
         return cron
       })

src/views/iot/device/instance/component/excel.vue

@@ -209,13 +209,11 @@ export default defineComponent({
   }
 
   .upload-box {
-
+    margin: 0 12px;
     // height: 24px;
     ::v-deep(.el-upload) {
       vertical-align: top;
     }
-
-    margin: 0 12px;
   }
 }
 </style>

src/views/iot/scene/manage/index.vue

@@ -60,7 +60,7 @@
 						<el-button size="small" text type="warning" v-auth="'edit'" @click="addOrEdit(scope.row)">编辑</el-button>
 						<el-button size="small" text type="success" @click="onActionStatus(scope.row)" v-if="scope.row.status == 0" v-auth="'startOrStop'">启用</el-button>
 						<el-button size="small" text type="primary" @click="onActionStatus(scope.row)" v-if="scope.row.status > 0" v-auth="'startOrStop'">停用</el-button>
-						<el-button size="small" text type="danger" @click="run(scope.row)" v-if="scope.row.status > 0 && scope.row.sceneType == 'manual'" v-auth="'startOrStop'">手动触发</el-button>
+						<el-button size="small" text type="danger" @click="run(scope.row)" v-if="scope.row.status > 0 && scope.row.sceneType == 'manual'" v-auth="'startOrStop'">执行</el-button>
 						<el-button size="small" text type="info" v-auth="'del'" @click="del(scope.row)">删除</el-button>
 					</template>
 				</el-table-column>