宫格收藏

src/views/department/MyFile.vue

@@ -245,7 +245,7 @@
 
                                 </el-table>
                                 <PlaceGridFolder v-else @folderClick="folderClick" :folderList="folderList" :restName="restName"
-                                    :collectFolder="collectFolder" @setScroll="setScroll" @folderRClick="folderRClick" :getAllTop="getAllTop" @folderBack="folderBack"  :thisFolder="thisFolder" :impDirId="impDirId">
+                                    :collectFolder="collectFolder" @collectByStar="collectByStar" @delCollect="delCollect" @setScroll="setScroll" @folderRClick="folderRClick" :getAllTop="getAllTop" @folderBack="folderBack"  :thisFolder="thisFolder" :impDirId="impDirId">
                                 </PlaceGridFolder>
                             </el-collapse-item>
                         </el-collapse>
@@ -313,7 +313,7 @@
                                     </el-table-column>
                                 </el-table>
                                 <PalaceGridFile v-else :fileHeight="fileHeight" @showFile="showFile" :getAllTop="getAllTop" @navBack="navBack"
-                                    @lastBB="lastBB" @setScroll="setScroll" @handleRowClick="handleRowClick" @onlineCase="onlineCase" @shareBack="shareBack"  :thisFolder="thisFolder" :fileList="fileList"></PalaceGridFile>
+                                    @lastBB="lastBB"  @collectByStar="collectByStar" @delCollect="delCollect" @setScroll="setScroll" @handleRowClick="handleRowClick" @onlineCase="onlineCase" @shareBack="shareBack"  :thisFolder="thisFolder" :fileList="fileList"></PalaceGridFile>
                             </el-collapse-item>
                         </el-collapse>
                         <div :class="{'setCli':!noMenuItem}" v-if="cliCC" :style="{ left: xz + 'px', top: yz -100 + 'px' }">
@@ -1171,7 +1171,7 @@ export default {
             }
         }
         function onSuccess(files, val) {
-            fileBig.value = files.file.size
+            fileBig.value = files.file.size + fileBig.value
             fileArr.value.push(files.file)
         }
         //关闭文件上传

src/views/department/components/PalaceGridFile.vue

@@ -19,6 +19,12 @@
                             :content="item.fileName"
                         ><p class="nameName" style="cursor: pointer;">{{ item.fileName }}</p></el-tooltip>
                     </div>
+                    <div class="stars">
+                            <el-icon v-if="item.isFavorite == 'N'" @click.stop="starFolder(item,true)" style="margin-right: 7px;">
+                            <Star />
+                        </el-icon>
+                        <img v-else @click.stop="delStarFolder(item,true)" src="@/assets/images/yellowstar.png" alt="">
+                    </div>
                 </div>
             </template>
             <div class="setCli" v-if="cliCC" :style="{ left: xz + 'px', top: (yz - 330) + 'px' }">
@@ -426,6 +432,12 @@ export default {
         const setImg = (type)=>{
            return setIcon(type)
         }
+        const starFolder = (item) => {
+            emit("collectByStar", item,false)
+        }
+        const delStarFolder = (item) => {
+            emit("delCollect", item,false)
+        }
         // 归档
         function goLock() {
             fileCount.lockActor(clickRowId.value).then(res => {
@@ -495,7 +507,9 @@ export default {
             fileNameChange,
             editOnline,
             goLock,
-            setImg
+            setImg,
+            starFolder,
+            delStarFolder
         }
     },
     components: {
@@ -529,6 +543,11 @@ export default {
     width: 104px;
     height: 148px;
     position: relative;
+    .stars{
+        position: absolute;
+        top: 5%;
+        right: 5%;
+    }
 }
 
 .nameName {

src/views/department/components/PlaceGridFolder.vue

@@ -21,6 +21,12 @@
                             :content="item.dirName"
                         ><p class="nameName" style="cursor: pointer;">{{ item.dirName }}</p></el-tooltip>
                         </div>
+                        <div class="stars">
+                             <el-icon v-if="item.isFavorite == 'N'" @click.stop="starFolder(item,true)" style="margin-right: 7px;">
+                                <Star />
+                            </el-icon>
+                            <img v-else @click.stop="delStarFolder(item,true)" src="@/assets/images/yellowstar.png" alt="">
+                        </div>
                     </div>
                 </template>
                 <!-- 右键唤出的菜单 -->
@@ -195,6 +201,12 @@ export default {
             emit("folderClick", item)
            console.log('item', item)
         }
+        const starFolder = (item) => {
+            emit("collectByStar", item,true)
+        }
+        const delStarFolder = (item) => {
+            emit("delCollect", item,true)
+        }
         onMounted(() => {
             // getAllTop()
             window.addEventListener("click", mouseClick, true);
@@ -232,7 +244,9 @@ export default {
             copyFir,
             ordinaryList,
             fileBox,
-            folderList
+            folderList,
+            starFolder,
+            delStarFolder
         }
     },
     components:{
@@ -264,6 +278,11 @@ export default {
     width: 104px;
     height: 148px;
     position: relative;
+    .stars{
+        position: absolute;
+        top: 5%;
+        right: 5%;
+    }
 }
 
 .nameName {

src/views/myfile/MyFile.vue

@@ -264,7 +264,7 @@
                                         </el-table-column>
                                     </el-table>
                                     <PlaceGridFolder v-else @folderClick="folderClick" :folderList="folderList" :restName="restName"
-                                        :collectFolder="collectFolder" @setScroll="setScroll" @folderRClick="folderRClick" :getAllTop="getAllTop" @folderBack="folderBack" :thisFolder="thisFolder">
+                                        :collectFolder="collectFolder" @collectByStar="collectByStar" @delCollect="delCollect" @setScroll="setScroll" @folderRClick="folderRClick" :getAllTop="getAllTop" @folderBack="folderBack" :thisFolder="thisFolder">
                                     </PlaceGridFolder>
                                 </el-collapse-item>
                             </el-collapse>
@@ -331,7 +331,7 @@
                                         </el-table-column>
                                     </el-table>
                                     <PalaceGridFile v-else :fileHeight="fileHeight" :getAllTop="getAllTop" @navBack="navBack"
-                                        @lastBB="lastBB" @setScroll="setScroll" @handleRowClick="handleRowClick" @onlineCase="onlineCase" @shareBack="shareBack" :thisFolder="thisFolder" :fileList="fileList"></PalaceGridFile>
+                                        @lastBB="lastBB"  @collectByStar="collectByStar" @delCollect="delCollect" @setScroll="setScroll" @handleRowClick="handleRowClick" @onlineCase="onlineCase" @shareBack="shareBack" :thisFolder="thisFolder" :fileList="fileList"></PalaceGridFile>
                                 </el-collapse-item>
                             </el-collapse>
                             <div class="setCli" v-if="cliCC" :style="{ left: xz + 'px', top: yz - 260 + 'px' }">
@@ -1277,7 +1277,7 @@ export default {
 
         }
         function onSuccess(files, val) {
-            fileBig.value = files.file.size
+            fileBig.value = files.file.size + fileBig.value
             fileArr.value.push(files.file)
         }
         //关闭文件上传

src/views/myfile/components/PalaceGridFile.vue

@@ -19,6 +19,12 @@
                             :content="item.fileName"
                         ><p class="nameName" style="cursor: pointer;">{{ item.fileName }}</p></el-tooltip>
                     </div>
+                    <div class="stars">
+                            <el-icon v-if="item.isFavorite == 'N'" @click.stop="starFolder(item,true)" style="margin-right: 7px;">
+                            <Star />
+                        </el-icon>
+                        <img v-else @click.stop="delStarFolder(item,true)" src="@/assets/images/yellowstar.png" alt="">
+                    </div>
                 </div>
             </template>
             <div class="setCli" v-if="cliCC" :style="{ left: xz + 'px', top: (yz - 330) + 'px' }">
@@ -436,6 +442,12 @@ export default {
         const setImg = (type)=>{
            return setIcon(type)
         }
+        const starFolder = (item) => {
+            emit("collectByStar", item,false)
+        }
+        const delStarFolder = (item) => {
+            emit("delCollect", item,false)
+        }
         // 归档
         function goLock() {
             fileCount.lockActor(clickRowId.value).then(res => {
@@ -506,7 +518,9 @@ export default {
             editOnline,
             goLock,
             setImg,
-            setScrollFn
+            setScrollFn,
+            starFolder,
+            delStarFolder
         }
     },
     components: {
@@ -542,6 +556,11 @@ export default {
     width: 104px;
     height: 148px;
     position: relative;
+    .stars{
+        position: absolute;
+        top: 5%;
+        right: 5%;
+    }
 }
 
 .nameName {

src/views/myfile/components/PlaceGridFolder.vue

@@ -20,6 +20,12 @@
                             :content="item.dirName"
                         ><p class="nameName" style="cursor: pointer;">{{ item.dirName }}</p></el-tooltip>
                         </div>
+                        <div class="stars">
+                             <el-icon v-if="item.isFavorite == 'N'" @click.stop="starFolder(item,true)" style="margin-right: 7px;">
+                                <Star />
+                            </el-icon>
+                            <img v-else @click.stop="delStarFolder(item,true)" src="@/assets/images/yellowstar.png" alt="">
+                        </div>
                     </div>
                 </template>
                 <!-- 右键唤出的菜单 -->
@@ -172,6 +178,12 @@ export default {
            console.log('item', item)
             emit("folderClick", item)
         }
+        const starFolder = (item) => {
+            emit("collectByStar", item,true)
+        }
+        const delStarFolder = (item) => {
+            emit("delCollect", item,true)
+        }
         const setScrollFn = ()=>{
             // emit('setScroll')
         }
@@ -212,7 +224,9 @@ export default {
             copyFir,
             folderClickGrid,
             folderList,
-            setScrollFn
+            setScrollFn,
+            starFolder,
+            delStarFolder
         }
     },
     components:{
@@ -245,6 +259,11 @@ export default {
     width: 104px;
     height: 148px;
     position: relative;
+    .stars{
+        position: absolute;
+        top: 5%;
+        right: 5%;
+    }
 }
 
 .nameName {

src/views/publicment/MyFile.vue

@@ -243,7 +243,7 @@
 
                                 </el-table>
                                 <PlaceGridFolder v-else  @folderClick="folderClick" :folderList="folderList" :restName="restName"
-                                    :collectFolder="collectFolder"  @setScroll="setScroll" @folderRClick="folderRClick" :getAllTop="getAllTop" @folderBack="folderBack" :thisFolder="thisFolder">
+                                    :collectFolder="collectFolder" @collectByStar="collectByStar" @delCollect="delCollect"  @setScroll="setScroll" @folderRClick="folderRClick" :getAllTop="getAllTop" @folderBack="folderBack" :thisFolder="thisFolder">
                                 </PlaceGridFolder>
                             </el-collapse-item>
                     </el-collapse>
@@ -311,7 +311,7 @@
                                     </el-table-column>
                                 </el-table>
                                 <PalaceGridFile v-else :fileHeight="fileHeight" @showFile="showFile" :getAllTop="getAllTop" @navBack="navBack"
-                                    @lastBB="lastBB" @setScroll="setScroll" @handleRowClick="handleRowClick" @onlineCase="onlineCase" @shareBack="shareBack" :thisFolder="thisFolder" :fileList="fileList"></PalaceGridFile>
+                                    @lastBB="lastBB" @collectByStar="collectByStar" @delCollect="delCollect" @setScroll="setScroll" @handleRowClick="handleRowClick" @onlineCase="onlineCase" @shareBack="shareBack" :thisFolder="thisFolder" :fileList="fileList"></PalaceGridFile>
                             </el-collapse-item>
                         </el-collapse>
                         <div :class="{'setCli':!noMenuItem}" v-if="cliCC" :style="{ left: xz + 'px', top: yz -100 + 'px' }">

src/views/publicment/components/PalaceGridFile.vue

@@ -19,6 +19,12 @@
                             :content="item.fileName"
                         ><p class="nameName" style="cursor: pointer;">{{ item.fileName }}</p></el-tooltip>
                     </div>
+                    <div class="stars">
+                             <el-icon v-if="item.isFavorite == 'N'" @click.stop="starFolder(item,true)" style="margin-right: 7px;">
+                                <Star />
+                            </el-icon>
+                            <img v-else @click.stop="delStarFolder(item,true)" src="@/assets/images/yellowstar.png" alt="">
+                    </div>
                 </div>
             </template>
             <div class="setCli" v-if="cliCC" :style="{ left: xz + 'px', top: (yz - 330) + 'px' }">
@@ -425,6 +431,12 @@ export default {
         const setImg = (type)=>{
            return setIcon(type)
         }
+        const starFolder = (item) => {
+            emit("collectByStar", item,false)
+        }
+        const delStarFolder = (item) => {
+            emit("delCollect", item,false)
+        }
         // 归档
         function goLock() {
             fileCount.lockActor(clickRowId.value).then(res => {
@@ -494,7 +506,9 @@ export default {
             fileNameChange,
             editOnline,
             goLock,
-            setImg
+            setImg,
+            starFolder,
+            delStarFolder
         }
     },
     components: {
@@ -529,6 +543,11 @@ export default {
     width: 104px;
     height: 148px;
     position: relative;
+    .stars{
+        position: absolute;
+        top: 5%;
+        right: 5%;
+    }
 }
 
 .nameName {

src/views/publicment/components/PlaceGridFolder.vue

@@ -21,6 +21,12 @@
                             :content="item.dirName"
                         ><p class="nameName" style="cursor: pointer;">{{ item.dirName }}</p></el-tooltip>
                         </div>
+                        <div class="stars">
+                             <el-icon v-if="item.isFavorite == 'N'" @click.stop="starFolder(item,true)" style="margin-right: 7px;">
+                                <Star />
+                            </el-icon>
+                            <img v-else @click.stop="delStarFolder(item,true)" src="@/assets/images/yellowstar.png" alt="">
+                        </div>
                     </div>
                 </template>
                 <!-- 右键唤出的菜单 -->
@@ -194,6 +200,12 @@ export default {
             emit("folderClick", item)
            console.log('item', item)
         }
+        const starFolder = (item) => {
+            emit("collectByStar", item,true)
+        }
+        const delStarFolder = (item) => {
+            emit("delCollect", item,true)
+        }
         onMounted(() => {
             // getAllTop()
             window.addEventListener("click", mouseClick, true);
@@ -231,7 +243,9 @@ export default {
             copyFir,
             ordinaryList,
             fileBox,
-            folderList
+            folderList,
+            starFolder,
+            delStarFolder
         }
     },
     components:{
@@ -262,6 +276,11 @@ export default {
     width: 104px;
     height: 148px;
     position: relative;
+    .stars{
+        position: absolute;
+        top: 5%;
+        right: 5%;
+    }
 }
 
 .nameName {

src/views/system/alarm/index.vue

@@ -165,30 +165,30 @@
 	  <br/>
 	  <br/>
       短信接收号码：
-      <el-input v-model="cf.phone" style="width: 150px" />
+      <el-input v-model="cf.phone" @input="phoneNumFn" style="width: 150px" />
       <br />
       <br />
       当日同一IP非法访问超过
-      <el-input v-model="cf.ip_times" style="width: 50px" />
+      <el-input v-model="cf.ip_times" type="number" style="width: 50px" />
       次,则发送短信告警。
       <br />
       <br />
       硬盘使用空间超过
-      <el-input v-model="cf.hdd_used" style="width: 50px" />
+      <el-input v-model="cf.hdd_used" type="number" :max="100" :min="0" style="width: 50px" />
       %，发送短信告警。
       <br />
       <br />
       当日连续
-      <el-input v-model="cf.cpu_times" style="width: 50px" />
+      <el-input v-model="cf.cpu_times" type="number" style="width: 50px" />
       个周期,CPU超过
-      <el-input v-model="cf.cpu_used" style="width: 50px" />
+      <el-input v-model="cf.cpu_used" type="number" style="width: 50px" />
       %，发送短信告警。
       <br />
       <br />
       当日连续
-      <el-input v-model="cf.mem_times" style="width: 50px" />
+      <el-input v-model="cf.mem_times" type="number" style="width: 50px" />
       个周期,内存超过
-      <el-input v-model="cf.mem_used" style="width: 50px" />
+      <el-input v-model="cf.mem_used" type="number" style="width: 50px" />
       %，发送短信告警。
     </el-form>
     <template #footer>
@@ -317,7 +317,10 @@ function handleUpdate(row) {
     title.value = '查看系统告警'
   })
 }
-
+const phoneNumFn = (data)=>{
+  const rge = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/
+  console.log('data',data);
+}
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['alarmRef'].validate((valid) => {

src/views/system/user/index.vue

@@ -430,6 +430,7 @@
 				trigger: ["blur", "change"]
 			}],
 			phonenumber: [{
+				required: true,
 				pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
 				message: "请输入正确的手机号码",
 				trigger: "blur"
@@ -584,11 +585,19 @@
 	/** 解密手机号码 */
 	const smPhone = (num)=>{
 		// console.log('num',num);
+		// return num
+		if(!num){
+			// console.log(3);
+			return null
+		}
 		const tonum = num - 0
 		if(typeof tonum === 'number' && !isNaN(tonum)){
+			// console.log(1);
 			return num
 		}
+		// return num
 		if(num){
+			// console.log(2);
 			return decode(num)
 		}
 	}
@@ -658,7 +667,7 @@
 			open.value = true;
 			title.value = "修改用户";
 			form.value.password = "";
-			form.value.phonenumber = smPhone(response.data.phonenumber);
+			form.value.phonenumber = smPhone(response.data.phonenumber)+'';
 		});
 	};