Merge branch 'develop/0.0.2(样式修改)' into test

LICENSE

@@ -1,20 +1 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 RuoYi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright © 2018-2024 Shenzhen Airsmart Technology Co.,Ltd. All Rights Reserved.

src/assets/styles/ruoyi.scss

@@ -1,6 +1,6 @@
  /**
  * 通用css样式布局处理
- * Copyright (c) 2019 ruoyi
+ * Copyright © 2018-2024 Shenzhen Airsmart Technology Co.,Ltd. All Rights Reserved.
  */
 
  /** 基础通用 **/

src/components/GanttChart/index.vue

@@ -23,13 +23,13 @@
       <div class="line" />
     </div>
     <div class="grid">
-      <draggable class="label_box" v-model="data.list" group="componentGroup" item-key="item"
-        chosen-class="chosenClass">
+      <draggable class="label_box" v-model="data.list" group="componentGroup" item-key="item" chosen-class="chosenClass"
+        filter=".item">
         <template #item="{ element, index }">
           <div :style="{
         display: getDisplay(element), top: getTop(element), left: getLeft(element),
         height: getHeight(element), width: getWidth(element)
-      }" :class="[element.status === 0 ? 'grid-item' : 'grid-item-disabled']">
+      }" :class="['item', element.status === 0 ? 'grid-item' : 'grid-item-disabled']">
             <el-popover placement="right" width="300px" popper-class="popper" :popper-style="popperStyle"
               :hide-after="0" trigger="click">
               <div class="title">
@@ -177,7 +177,7 @@ watch(() => props.date, (val) => {
 const getDelete = (row) => {
   let name = row.name ? row.name : row.takeName
   proxy.$modal.confirm(`是否删除预设名称为：${name}的数据?`).then(() => {
-    if (props.type === 'setting') { 
+    if (props.type === 'setting') {
       removeSetting({ id: row.id }).then(res => {
         if (res.code === 0) {
           proxy.$modal.msgSuccess('删除成功！')

src/directive/common/copyText.js

@@ -1,6 +1,6 @@
 /**
 * v-copyText 复制文本内容
-* Copyright (c) 2022 ruoyi
+* Copyright © 2018-2024 Shenzhen Airsmart Technology Co.,Ltd. All Rights Reserved.
 */
 
 export default {

src/directive/permission/hasPermi.js

@@ -1,6 +1,6 @@
  /**
  * v-hasPermi 操作权限处理
- * Copyright (c) 2019 ruoyi
+ * Copyright © 2018-2024 Shenzhen Airsmart Technology Co.,Ltd. All Rights Reserved.
  */
  
 import useUserStore from '@/store/modules/user'

src/directive/permission/hasRole.js

@@ -1,6 +1,6 @@
  /**
  * v-hasRole 角色权限处理
- * Copyright (c) 2019 ruoyi
+ * Copyright © 2018-2024 Shenzhen Airsmart Technology Co.,Ltd. All Rights Reserved.
  */
  
 import useUserStore from '@/store/modules/user'

src/utils/ruoyi.js

@@ -2,7 +2,7 @@
 
 /**
  * 通用js方法封装处理
- * Copyright (c) 2019 ruoyi
+ * Copyright © 2018-2024 Shenzhen Airsmart Technology Co.,Ltd. All Rights Reserved.
  */
 
 // 日期格式化

src/views/login.vue

@@ -35,7 +35,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2024 Shenzhen Airsmart Technology Co.,Ltd. All Rights Reserved.</span>
     </div>
   </div>
 </template>

src/views/register.vue

@@ -40,7 +40,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-register-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2024 Shenzhen Airsmart Technology Co.,Ltd. All Rights Reserved.</span>
     </div>
   </div>
 </template>

src/views/scene/presets/index.vue

@@ -9,16 +9,19 @@
         </template>
       </el-input>
       <draggable class="contentList" v-model="data.tableData" item-key="id" chosenClass="chosenClass" data-id="content"
-        :group="{ name: 'componentGroup', pull: 'clone', put: false }" :sort="false" @end="onEnd" forceFallback
-        v-loading="loading">
+        :group="{ name: 'componentGroup', pull: 'clone', put: false }" :sort="false" filter=".auditStatus" @end="onEnd"
+        forceFallback v-loading="loading">
         <template #item="{ element, index }">
-          <div class="item" @click="getDialog(element.takeId)">
-            <el-icon class="close" size="18" @click.stop="getDelete(element)"
+          <div :class="['item', element.auditStatus === 0 ? 'auditStatus' : '']" @click="getDialog(element)">
+            <el-icon v-if="element.auditStatus === 2" class="close" size="18" @click.stop="getDelete(element)"
               v-hasPermi="['scene:presets:deleteScene']">
               <CircleClose />
             </el-icon>
             <img src="@/assets/icons/svg/file.svg" width="50" height="50" />
-            <span style="margin-top: 10px">{{ element.takeName }}</span>
+            <span style="margin-top: 10px">
+              {{ element.takeName }}
+            </span>
+            <span v-if="element.auditStatus === 0">(待审核)</span>
           </div>
         </template>
       </draggable>
@@ -104,6 +107,11 @@ function getSearch() {
   getList()
 }
 
+// 拖拽前
+const onMove = () => {
+
+}
+
 // 拖拽结束
 function onEnd(params) {
   if (checkPermi(['scene:presets:add'])) {
@@ -122,12 +130,14 @@ const dialogVisible = ref(false)
 // 弹窗标题
 const title = ref('')
 // 打开弹窗
-function getDialog(id) {
-  if (checkPermi(['scene:presets:editScene'])) {
-    dialogVisible.value = true
-    title.value = '新增'
-    if (id) {
-      getDetail(id)
+function getDialog(row) {
+  if (row.auditStatus === 2) {
+    if (checkPermi(['scene:presets:editScene'])) {
+      dialogVisible.value = true
+      title.value = '新增'
+      if (row.takeId) {
+        getDetail(row.takeId)
+      }
     }
   }
 }