9 månader sedan · 41f6714653
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
 
				 <html lang="en">
			
 
				   <head>
			
 
				     <meta charset="UTF-8" />
			
 
				-    <link rel="icon" href="/favicon.ico" />
			
 
				+    <link rel="icon" href="/public/logo.jpg" />
			
 
				     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
			
 
				     <meta
			
 
				       name="description"
			
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 
				 {
			
 
				-  "name": "综合管控采集平台",
			
 
				+  "name": "质量分析系统",
			
 
				   "version": "1.0.0",
			
 
				   "private": true,
			
 
				   "type": "module",
			
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/logo.jpg
+++ b/public/logo.jpg
--- a/src/assets/icons/fullscreen-exit.svg
+++ b/src/assets/icons/fullscreen-exit.svg
@@ -0,0 +1 @@
 
				+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M18 7h4v2h-6V3h2v4zM8 9H2V7h4V3h2v6zm10 8v4h-2v-6h6v2h-4zM8 15v6H6v-4H2v-2h6z"/></svg>
			
--- a/src/assets/icons/fullscreen.svg
+++ b/src/assets/icons/fullscreen.svg
@@ -0,0 +1 @@
 
				+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M8 3v2H4v4H2V3h6zM2 21v-6h2v4h4v2H2zm20 0h-6v-2h4v-4h2v6zm0-12h-2V5h-4V3h6v6z"/></svg>
			
--- a/src/assets/images/qs.jpg
+++ b/src/assets/images/qs.jpg
--- a/src/assets/logo.jpg
+++ b/src/assets/logo.jpg
--- a/src/assets/logo.png
+++ b/src/assets/logo.png
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -40,11 +40,11 @@
 
				     </el-dropdown>
			
 
				 
			
 
				     <!-- 设置 -->
			
 
				-    <template v-if="defaultSettings.showSettings">
			
 
				+    <!-- <template v-if="defaultSettings.showSettings">
			
 
				       <div class="setting-item" @click="settingStore.settingsVisible = true">
			
 
				         <svg-icon icon-class="setting" />
			
 
				       </div>
			
 
				-    </template>
			
 
				+    </template> -->
			
 
				   </div>
			
 
				 </template>
			
 
				 <script setup lang="ts">
			
--- a/src/layout/components/Sidebar/components/SidebarLogo.vue
+++ b/src/layout/components/Sidebar/components/SidebarLogo.vue
@@ -26,7 +26,7 @@ defineProps({
 
				   },
			
 
				 });
			
 
				 
			
 
				-const logo = ref(new URL(`../../../../assets/logo.png`, import.meta.url).href);
			
 
				+const logo = ref(new URL(`../../../../assets/logo.jpg`, import.meta.url).href);
			
 
				 </script>
			
 
				 
			
 
				 <style lang="scss" scoped>
			
--- a/src/views/analysis/spc/index.vue
+++ b/src/views/analysis/spc/index.vue
@@ -69,6 +69,7 @@
 
				         :limit="currentOption.limit"
			
 
				         :pageSizes="currentOption.pageSizes"
			
 
				         v-model:page="currentOption.page"
			
 
				+        v-model:limit="currentOption.limit"
			
 
				         @pagination="getData"
			
 
				       />
			
 
				     </div>
			
@@ -165,7 +166,7 @@ const currentOption = reactive({
 
				   total: 0,
			
 
				   page: 1,
			
 
				   limit: 10,
			
 
				-  pageSizes: [10, 20, 40],
			
 
				+  pageSizes: [10],
			
 
				 });
			
 
				 const showStatus = ref(true);
			
 
				 const tableData = ref([]);
			
--- a/src/views/analysis/spcRules/index.vue
+++ b/src/views/analysis/spcRules/index.vue
@@ -46,6 +46,8 @@
 
				             :limit="currentOption.limit"
			
 
				             :pageSizes="currentOption.pageSizes"
			
 
				             v-model:page="currentOption.page"
			
 
				+            v-model:limit="currentOption.limit"
			
 
				+            @pagination="getData"
			
 
				           />
			
 
				         </div>
			
 
				       </div>
			
@@ -467,7 +469,7 @@ const currentOption = reactive({
 
				   total: 0,
			
 
				   page: 1,
			
 
				   limit: 10,
			
 
				-  pageSizes: [10, 20],
			
 
				+  pageSizes: [10],
			
 
				 });
			
 
				 const itemContent = ref("");
			
 
				 const setContent = () => {
			
@@ -545,6 +547,7 @@ const addSubmit = async () => {
 
				   });
			
 
				   if (code == "200") {
			
 
				     ElMessage.success("操作成功");
			
 
				+    getData();
			
 
				   }
			
 
				 };
			
 
				 const getData = async () => {
		`@@ -0,0 +1 @@`
		`+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M18 7h4v2h-6V3h2v4zM8 9H2V7h4V3h2v6zm10 8v4h-2v-6h6v2h-4zM8 15v6H6v-4H2v-2h6z"/></svg>`