Przeglądaj źródła

Merge branch 'v3' of ssh://94.191.59.107:10222/houwenfeng/cloudfile-ui into v3

“yueshang” 2 lat temu
rodzic
commit
b7bee03de1
3 zmienionych plików z 262 dodań i 284 usunięć
  1. 211 214
      index.html
  2. 1 0
      src/components/OnlyOffice/index.vue
  3. 50 70
      src/views/biz/expansion/index.vue

+ 211 - 214
index.html

@@ -1,220 +1,217 @@
 <!DOCTYPE html>
 <html>
 
-<head>
-	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-	<meta name="renderer" content="webkit">
-	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-	<link rel="icon" href="/favicon.ico">
-	<title>若依管理系统</title>
-	<!--引入onlyoffice组件-->
-	<!-- <script type="text/javascript" src="http://192.168.188.188:19531/web-apps/apps/api/documents/api.js" charset="utf-8"
-		async></script> -->
-	<script type="text/javascript" src="http://192.168.1.28:19531/web-apps/apps/api/documents/api.js" charset="utf-8"
-		async></script>
-	<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
-	<style>
-		html,
-		body,
-		#app {
-			height: 100%;
-			margin: 0px;
-			padding: 0px;
-		}
-
-		.chromeframe {
-			margin: 0.2em 0;
-			background: #ccc;
-			color: #000;
-			padding: 0.2em 0;
-		}
-
-		#loader-wrapper {
-			position: fixed;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100%;
-			z-index: 999999;
-		}
-
-		#loader {
-			display: block;
-			position: relative;
-			left: 50%;
-			top: 50%;
-			width: 150px;
-			height: 150px;
-			margin: -75px 0 0 -75px;
-			border-radius: 50%;
-			border: 3px solid transparent;
-			border-top-color: #FFF;
-			-webkit-animation: spin 2s linear infinite;
-			-ms-animation: spin 2s linear infinite;
-			-moz-animation: spin 2s linear infinite;
-			-o-animation: spin 2s linear infinite;
-			animation: spin 2s linear infinite;
-			z-index: 1001;
-		}
-
-		#loader:before {
-			content: "";
-			position: absolute;
-			top: 5px;
-			left: 5px;
-			right: 5px;
-			bottom: 5px;
-			border-radius: 50%;
-			border: 3px solid transparent;
-			border-top-color: #FFF;
-			-webkit-animation: spin 3s linear infinite;
-			-moz-animation: spin 3s linear infinite;
-			-o-animation: spin 3s linear infinite;
-			-ms-animation: spin 3s linear infinite;
-			animation: spin 3s linear infinite;
-		}
-
-		#loader:after {
-			content: "";
-			position: absolute;
-			top: 15px;
-			left: 15px;
-			right: 15px;
-			bottom: 15px;
-			border-radius: 50%;
-			border: 3px solid transparent;
-			border-top-color: #FFF;
-			-moz-animation: spin 1.5s linear infinite;
-			-o-animation: spin 1.5s linear infinite;
-			-ms-animation: spin 1.5s linear infinite;
-			-webkit-animation: spin 1.5s linear infinite;
-			animation: spin 1.5s linear infinite;
-		}
-
-
-		@-webkit-keyframes spin {
-			0% {
-				-webkit-transform: rotate(0deg);
-				-ms-transform: rotate(0deg);
-				transform: rotate(0deg);
-			}
-
-			100% {
-				-webkit-transform: rotate(360deg);
-				-ms-transform: rotate(360deg);
-				transform: rotate(360deg);
-			}
-		}
-
-		@keyframes spin {
-			0% {
-				-webkit-transform: rotate(0deg);
-				-ms-transform: rotate(0deg);
-				transform: rotate(0deg);
-			}
-
-			100% {
-				-webkit-transform: rotate(360deg);
-				-ms-transform: rotate(360deg);
-				transform: rotate(360deg);
-			}
-		}
-
-
-		#loader-wrapper .loader-section {
-			position: fixed;
-			top: 0;
-			width: 51%;
-			height: 100%;
-			background: #7171C6;
-			z-index: 1000;
-			-webkit-transform: translateX(0);
-			-ms-transform: translateX(0);
-			transform: translateX(0);
-		}
-
-		#loader-wrapper .loader-section.section-left {
-			left: 0;
-		}
-
-		#loader-wrapper .loader-section.section-right {
-			right: 0;
-		}
-
-
-		.loaded #loader-wrapper .loader-section.section-left {
-			-webkit-transform: translateX(-100%);
-			-ms-transform: translateX(-100%);
-			transform: translateX(-100%);
-			-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-			transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-		}
-
-		.loaded #loader-wrapper .loader-section.section-right {
-			-webkit-transform: translateX(100%);
-			-ms-transform: translateX(100%);
-			transform: translateX(100%);
-			-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-			transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-		}
-
-		.loaded #loader {
-			opacity: 0;
-			-webkit-transition: all 0.3s ease-out;
-			transition: all 0.3s ease-out;
-		}
-
-		.loaded #loader-wrapper {
-			visibility: hidden;
-			-webkit-transform: translateY(-100%);
-			-ms-transform: translateY(-100%);
-			transform: translateY(-100%);
-			-webkit-transition: all 0.3s 1s ease-out;
-			transition: all 0.3s 1s ease-out;
-		}
-
-		.no-js #loader-wrapper {
-			display: none;
-		}
-
-		.no-js h1 {
-			color: #222222;
-		}
-
-		#loader-wrapper .load_title {
-			font-family: 'Open Sans';
-			color: #FFF;
-			font-size: 19px;
-			width: 100%;
-			text-align: center;
-			z-index: 9999999999999;
-			position: absolute;
-			top: 60%;
-			opacity: 1;
-			line-height: 30px;
-		}
-
-		#loader-wrapper .load_title span {
-			font-weight: normal;
-			font-style: italic;
-			font-size: 13px;
-			color: #FFF;
-			opacity: 0.5;
-		}
-	</style>
-</head>
-
-<body>
-	<div id="app">
-		<div id="loader-wrapper">
-			<div id="loader"></div>
-			<div class="loader-section section-left"></div>
-			<div class="loader-section section-right"></div>
-			<div class="load_title">正在加载系统资源,请耐心等待</div>
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+		<meta name="renderer" content="webkit">
+		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+		<link rel="icon" href="/favicon.ico">
+		<title>若依管理系统</title>
+		<!--引入onlyoffice组件-->
+		<script type="text/javascript" src="http://192.168.1.28:19531/web-apps/apps/api/documents/api.js" charset="utf-8" async></script>
+		<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
+		<style>
+			html,
+			body,
+			#app {
+				height: 100%;
+				margin: 0px;
+				padding: 0px;
+			}
+
+			.chromeframe {
+				margin: 0.2em 0;
+				background: #ccc;
+				color: #000;
+				padding: 0.2em 0;
+			}
+
+			#loader-wrapper {
+				position: fixed;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 100%;
+				z-index: 999999;
+			}
+
+			#loader {
+				display: block;
+				position: relative;
+				left: 50%;
+				top: 50%;
+				width: 150px;
+				height: 150px;
+				margin: -75px 0 0 -75px;
+				border-radius: 50%;
+				border: 3px solid transparent;
+				border-top-color: #FFF;
+				-webkit-animation: spin 2s linear infinite;
+				-ms-animation: spin 2s linear infinite;
+				-moz-animation: spin 2s linear infinite;
+				-o-animation: spin 2s linear infinite;
+				animation: spin 2s linear infinite;
+				z-index: 1001;
+			}
+
+			#loader:before {
+				content: "";
+				position: absolute;
+				top: 5px;
+				left: 5px;
+				right: 5px;
+				bottom: 5px;
+				border-radius: 50%;
+				border: 3px solid transparent;
+				border-top-color: #FFF;
+				-webkit-animation: spin 3s linear infinite;
+				-moz-animation: spin 3s linear infinite;
+				-o-animation: spin 3s linear infinite;
+				-ms-animation: spin 3s linear infinite;
+				animation: spin 3s linear infinite;
+			}
+
+			#loader:after {
+				content: "";
+				position: absolute;
+				top: 15px;
+				left: 15px;
+				right: 15px;
+				bottom: 15px;
+				border-radius: 50%;
+				border: 3px solid transparent;
+				border-top-color: #FFF;
+				-moz-animation: spin 1.5s linear infinite;
+				-o-animation: spin 1.5s linear infinite;
+				-ms-animation: spin 1.5s linear infinite;
+				-webkit-animation: spin 1.5s linear infinite;
+				animation: spin 1.5s linear infinite;
+			}
+
+
+			@-webkit-keyframes spin {
+				0% {
+					-webkit-transform: rotate(0deg);
+					-ms-transform: rotate(0deg);
+					transform: rotate(0deg);
+				}
+
+				100% {
+					-webkit-transform: rotate(360deg);
+					-ms-transform: rotate(360deg);
+					transform: rotate(360deg);
+				}
+			}
+
+			@keyframes spin {
+				0% {
+					-webkit-transform: rotate(0deg);
+					-ms-transform: rotate(0deg);
+					transform: rotate(0deg);
+				}
+
+				100% {
+					-webkit-transform: rotate(360deg);
+					-ms-transform: rotate(360deg);
+					transform: rotate(360deg);
+				}
+			}
+
+
+			#loader-wrapper .loader-section {
+				position: fixed;
+				top: 0;
+				width: 51%;
+				height: 100%;
+				background: #7171C6;
+				z-index: 1000;
+				-webkit-transform: translateX(0);
+				-ms-transform: translateX(0);
+				transform: translateX(0);
+			}
+
+			#loader-wrapper .loader-section.section-left {
+				left: 0;
+			}
+
+			#loader-wrapper .loader-section.section-right {
+				right: 0;
+			}
+
+
+			.loaded #loader-wrapper .loader-section.section-left {
+				-webkit-transform: translateX(-100%);
+				-ms-transform: translateX(-100%);
+				transform: translateX(-100%);
+				-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+				transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+			}
+
+			.loaded #loader-wrapper .loader-section.section-right {
+				-webkit-transform: translateX(100%);
+				-ms-transform: translateX(100%);
+				transform: translateX(100%);
+				-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+				transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+			}
+
+			.loaded #loader {
+				opacity: 0;
+				-webkit-transition: all 0.3s ease-out;
+				transition: all 0.3s ease-out;
+			}
+
+			.loaded #loader-wrapper {
+				visibility: hidden;
+				-webkit-transform: translateY(-100%);
+				-ms-transform: translateY(-100%);
+				transform: translateY(-100%);
+				-webkit-transition: all 0.3s 1s ease-out;
+				transition: all 0.3s 1s ease-out;
+			}
+
+			.no-js #loader-wrapper {
+				display: none;
+			}
+
+			.no-js h1 {
+				color: #222222;
+			}
+
+			#loader-wrapper .load_title {
+				font-family: 'Open Sans';
+				color: #FFF;
+				font-size: 19px;
+				width: 100%;
+				text-align: center;
+				z-index: 9999999999999;
+				position: absolute;
+				top: 60%;
+				opacity: 1;
+				line-height: 30px;
+			}
+
+			#loader-wrapper .load_title span {
+				font-weight: normal;
+				font-style: italic;
+				font-size: 13px;
+				color: #FFF;
+				opacity: 0.5;
+			}
+		</style>
+	</head>
+
+	<body>
+		<div id="app">
+			<div id="loader-wrapper">
+				<div id="loader"></div>
+				<div class="loader-section section-left"></div>
+				<div class="loader-section section-right"></div>
+				<div class="load_title">正在加载系统资源,请耐心等待</div>
+			</div>
 		</div>
-	</div>
-	<script type="module" src="/src/main.js"></script>
-</body>
+		<script type="module" src="/src/main.js"></script>
+	</body>
 
 </html>

+ 1 - 0
src/components/OnlyOffice/index.vue

@@ -81,6 +81,7 @@
 							// "hideRightMenu": false,//定义在第一次加载时是显示还是隐藏右侧菜单。 默认值为false
 							//是否显示插件
 							plugins: false,
+							spellcheck: false, //定义在加载编辑器时是否自动打开或关闭拼写检查器。拼写检查器仅适用于文档编辑器和演示文稿编辑器。默认值为true。
 							customer: {
 								//开源版无效,商业版才行
 								address: "My City, 123a-45",

+ 50 - 70
src/views/biz/expansion/index.vue

@@ -9,26 +9,20 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="当前容量" prop="currentCap">
-        <el-input
-          v-model="queryParams.currentCap"
-          placeholder="请输入当前容量"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+      <el-form-item label="扩容状态" prop="expandStatus">
+        <el-select v-model="queryParams.expandStatus" placeholder="请选择扩容状态" clearable>
+          <el-option
+            v-for="dict in expansion_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="申请扩充容量" prop="expandCap">
+      <el-form-item label="申请人" prop="createBy">
         <el-input
-          v-model="queryParams.expandCap"
-          placeholder="请输入申请扩充容量"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="扩容原因" prop="expandReson">
-        <el-input
-          v-model="queryParams.expandReson"
-          placeholder="请输入扩容原因"
+          v-model="queryParams.createBy"
+          placeholder="请输入申请人"
           clearable
           @keyup.enter="handleQuery"
         />
@@ -39,60 +33,22 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['biz:expansion:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['biz:expansion:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['biz:expansion:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['biz:expansion:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
     <el-table v-loading="loading" :data="expansionList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="自增ID" align="center" prop="autoId" />
+      <!-- <el-table-column label="自增ID" align="center" prop="autoId" /> -->
+      <!-- <el-table-column label="空间ID" align="center" prop="spaceId" /> -->
       <el-table-column label="空间名称" align="center" prop="spaceName" />
       <el-table-column label="当前容量" align="center" prop="currentCap" />
       <el-table-column label="申请扩充容量" align="center" prop="expandCap" />
-      <el-table-column label="扩容原因" align="center" prop="expandReson" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="扩容原因" align="center" prop="expandReason" />
+      <el-table-column label="扩容状态" align="center" prop="expandStatus">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <dict-tag :options="expansion_status" :value="scope.row.expandStatus"/>
         </template>
       </el-table-column>
+      <el-table-column label="审核说明" align="center" prop="description" />
+      <el-table-column label="申请人" align="center" prop="createBy" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['biz:expansion:edit']">修改</el-button>
@@ -100,7 +56,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -124,8 +80,23 @@
         <el-form-item label="申请扩充容量" prop="expandCap">
           <el-input v-model="form.expandCap" placeholder="请输入申请扩充容量" />
         </el-form-item>
-        <el-form-item label="扩容原因" prop="expandReson">
-          <el-input v-model="form.expandReson" placeholder="请输入扩容原因" />
+        <el-form-item label="扩容原因" prop="expandReason">
+          <el-input v-model="form.expandReason" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="扩容状态" prop="expandStatus">
+          <el-radio-group v-model="form.expandStatus">
+            <el-radio
+              v-for="dict in expansion_status"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审核说明" prop="description">
+          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="申请人ID" prop="created">
+          <el-input v-model="form.created" placeholder="请输入申请人ID" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -142,9 +113,10 @@
 </template>
 
 <script setup name="Expansion">
-import { listExpansion, getExpansion, delExpansion, addExpansion, updateExpansion } from "@/api/biz/expansion";
+    import {getExpansion, listExpansion} from "@/api/biz/expansion";
 
-const { proxy } = getCurrentInstance();
+    const { proxy } = getCurrentInstance();
+const { expansion_status } = proxy.useDict('expansion_status');
 
 const expansionList = ref([]);
 const open = ref(false);
@@ -161,10 +133,15 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
+    spaceId: null,
     spaceName: null,
     currentCap: null,
     expandCap: null,
-    expandReson: null,
+    expandReason: null,
+    expandStatus: null,
+    description: null,
+    created: null,
+    createBy: null,
   },
   rules: {
   }
@@ -196,7 +173,10 @@ function reset() {
     spaceName: null,
     currentCap: null,
     expandCap: null,
-    expandReson: null,
+    expandReason: null,
+    expandStatus: null,
+    description: null,
+    created: null,
     createBy: null,
     createTime: null,
     updateBy: null,