Browse Source

样式调整

user5 1 year ago
parent
commit
ca5b56222f

+ 2 - 2
datav.html

@@ -15,7 +15,7 @@
   <script src="/datav/cdn/echarts/5.4.0/echarts.min.js"></script>
   <script src="/datav/cdn/echarts-wordcloud.min.js"></script>
   <!-- <script src="./datav/cdn/avue/avue.min.js"></script> -->
-  <title>JeePlus</title>
+  <title>兴光</title>
 </head>
 
 <body>
@@ -65,4 +65,4 @@
   <script type="module" src="/src/datav/main.js"></script>
 </body>
 
-</html>
+</html>

+ 1 - 1
index.html

@@ -8,7 +8,7 @@
 		<meta http-equiv="pragram" content="no-cache">
 		<meta http-equiv="cache-control" content="no-cache, no-store, must-revalidate">
 		<link rel="icon" href="/favicon.ico">
-		<title>JeePlus</title>
+		<title>兴光</title>
 
 	</head>
 	<body>

BIN
public/favicon.ico


+ 122 - 20
src/assets/img/logo.svg

@@ -1,20 +1,122 @@
-<svg width="33" height="33" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <clipPath id="clip0">
-   <rect id="svg_1" x="3.5" y="7" fill="white" height="19" width="26"/>
-  </clipPath>
- </defs>
- <g>
-  <title>background</title>
-  <rect fill="none" id="canvas_background" height="402" width="582" y="-1" x="-1"/>
- </g>
- <g>
-  <title>Layer 1</title>
-  <g stroke="null" id="svg_2" clip-path="url(#clip0)">
-   <path stroke="null" id="svg_3" fill="#12D2AC" d="m5.37754,17.08485l7.37226,-7.54923c1.9665,-2.01364 5.193,-2.0519 7.2066,-0.08545c0.0288,0.02815 0.0573,0.05663 0.0854,0.08545l0.0803,0.08216c1.9828,2.03047 1.9828,5.27227 0,7.30277l-7.3723,7.5492c-1.9664,2.0136 -5.19294,2.0519 -7.20658,0.0854c-0.02882,-0.0281 -0.0573,-0.0566 -0.08545,-0.0854l-0.08023,-0.0822c-1.98286,-2.0304 -1.98286,-5.2723 0,-7.3027z" clip-rule="evenodd" fill-rule="evenodd"/>
-   <path stroke="null" id="svg_4" fill="#307AF2" d="m20.0479,9.53569l7.292,7.46706c2.0275,2.0761 2.0275,5.3909 0,7.467c-1.9664,2.0137 -5.1929,2.0519 -7.2066,0.0855c-0.0288,-0.0282 -0.0573,-0.0566 -0.0854,-0.0855l-7.2921,-7.467c-2.0274,-2.0761 -2.0274,-5.3909 0,-7.46706c1.9665,-2.01364 5.193,-2.0519 7.2066,-0.08545c0.0288,0.02815 0.0573,0.05663 0.0855,0.08545z" clip-rule="evenodd" fill-rule="evenodd"/>
-   <path stroke="null" id="svg_5" fill="#7f00ff" d="m20.239036,21.894629l3.553,3.63827l-7.292,7.4671l-7.29207,-7.4671l3.55307,-3.63827c2.0166,-2.06499 5.3253,-2.10423 7.3903,-0.08763c0.0296,0.02886 0.0588,0.05807 0.0877,0.08763z" clip-rule="evenodd" fill-rule="evenodd"/>
-  </g>
-  <path d="m18.24999,24.824163c-0.166666,0 -0.333332,0 -0.333332,0.166666c0,0.166666 0,0.499996 0,0.833328c0,0.666662 0.094917,1.355492 0.333332,1.999987c0.258596,0.699053 0.576464,1.115564 0.666662,1.333324c0.06378,0.15398 0.102884,0.346016 0.166664,0.499996c0.090199,0.21776 0.166666,0.333332 0.166666,0.499996l0.166666,0l0,0" id="svg_6" fill-opacity="null" stroke-opacity="null" stroke-width="null" stroke="null" fill="none"/>
- </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="200px" height="200px" viewBox="0 0 200 200" enable-background="new 0 0 200 200" xml:space="preserve">  <image id="image0" width="200" height="200" x="0" y="0"
+    href="data:image/png;base64,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" />
+</svg>

+ 5 - 4
src/components/userSelect/UserSelectDialog.vue

@@ -232,11 +232,11 @@ export default {
 	},
 	methods: {
 		//打开赋值
-		open(data) {
+		async open(data) {
 			this.value = data || [];
 			this.selected = JSON.parse(JSON.stringify(data || []));
 			this.dialogVisible = true;
-			this.getGroup();
+			await this.getGroup();
 			this.getUser();
 		},
 		//获取组织
@@ -248,9 +248,10 @@ export default {
 			// })
 			var res = await officeService.treeData({ tenantId: this.tenantId });
 			this.showGrouploading = false;
-			var allNode = { id: "", type: "1", name: "所有" };
-			res.unshift(allNode);
+			// var allNode = { id: "", type: "1", name: "所有" };
+			// res.unshift(allNode);
 			this.group = res;
+			this.searchForm.companyDTO.id = this.group[0].id;
 		},
 		//获取用户
 		async getUser() {

+ 1 - 1
src/config/index.js

@@ -1,6 +1,6 @@
 const DEFAULT_CONFIG = {
 	// APP NAME
-	APP_NAME: "JeePlus微服务平台",
+	APP_NAME: "兴光微服务平台",
 	//首页地址
 	DASHBOARD_URL: "/dashboard/index",
 

+ 5 - 5
src/views/common/UpLoadComponentV3.1.vue

@@ -43,7 +43,7 @@
           </template>
         </el-table-column>
         <el-table-column label="创建人" prop="createBy.name" align="center"></el-table-column>
-        <el-table-column label="创建时间" prop="createDate" align="center"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" align="center"></el-table-column>
         <el-table-column label="文件大小" prop="size" align="center">
           <template #default="scope">
             {{getSize(scope.row.size)}}
@@ -321,8 +321,8 @@
         }
         for await (let item of fileList) {
           await this.ossService.getFileSizeByUrl(item.url).then((data) => {
-            item.lsUrl = data.data.url
-            item.size = data.data.size
+            item.lsUrl = data.url
+            item.size = data.size
             this.dataList.push(item)
             this.dataListNew.push(item)
             if (this.dataList.length === fileList.length) {
@@ -388,7 +388,7 @@
           this.dataListNew.push(item)
         })
         for (let item of fileList) {
-          item.createDate = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+          item.createTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
           item.createBy = {
             id: '',
             name: ''
@@ -402,7 +402,7 @@
             item.url = item.raw.url
             if (item.raw.url !== undefined && item.raw.url !== null && item.raw.url !== {}) {
               await this.ossService.getTemporaryUrl(item.raw.url).then((data) => {
-                item.lsUrl = data.data
+                item.lsUrl = data
               })
             }
           }

+ 1 - 1
src/views/cw/reportManagement/ReportManagementForm.vue

@@ -359,7 +359,7 @@
                    ]">
                   <el-date-picker
                     placement="bottom-start"
-                    value-format="yyyy-MM-dd"
+                    value-format="YYYY-MM-DD"
                     v-model="inputForm.reportDate"
                     style="width: 100%"
                     placeholder="选择日期">

+ 4 - 4
src/views/cw/workContract/ContractRegistrationForm.vue

@@ -205,8 +205,8 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="合同金额(元)" prop="contractAmount" v-if="inputForm.contractAmountType === '1'"
+        <el-col :span="12" v-if="inputForm.contractAmountType === '1'">
+          <el-form-item label="合同金额(元)" prop="contractAmount"
                         :rules="[
                   {required: true, message:'请输入合同金额(元)', trigger:'blur'}
                ]">
@@ -216,8 +216,8 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="预计金额(元)" prop="predictAmount" v-if="inputForm.contractAmountType === '2'"
+        <el-col :span="12" v-if="inputForm.contractAmountType === '2'">
+          <el-form-item label="预计金额(元)" prop="predictAmount"
                         :rules="[
                   /*{required: true, message:'请输入预计金额(元)', trigger:'blur'}*/
                ]">

+ 4 - 4
src/views/cw/workContract/contractRegisitionAddForm/ContractAddForm.vue

@@ -215,8 +215,8 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="合同金额(元)" prop="contractAmount" v-if="inputForm.contractAmountType === '1'"
+        <el-col :span="12" v-if="inputForm.contractAmountType === '1'">
+          <el-form-item label="合同金额(元)" prop="contractAmount"
                         :rules="[
                   {required: true, message:'请输入合同金额(元)', trigger:'blur'}
                ]">
@@ -226,8 +226,8 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="预计金额(元)" prop="predictAmount" v-if="inputForm.contractAmountType === '2'"
+        <el-col :span="12" v-if="inputForm.contractAmountType === '2'">
+          <el-form-item label="预计金额(元)" prop="predictAmount"
                         :rules="[
                   /*{required: true, message:'请输入预计金额(元)', trigger:'blur'}*/
                ]">

+ 2 - 2
src/views/sys/login/components/login-form.vue

@@ -118,8 +118,8 @@ export default {
 			isShow: false,
 			captchaImg: "",
 			inputForm: {
-				username: "admin",
-				password: "admin",
+				username: "",
+				password: "",
 				uuid: "",
 				captcha: "",
 			},

+ 2 - 2
src/views/sys/user/UserInfo.vue

@@ -265,7 +265,7 @@
 							</el-form-item>
 						</el-form>
 					</el-tab-pane>
-					<el-tab-pane label="我的日志">
+					<!--<el-tab-pane label="我的日志">
 						<el-menu
 							default-active="1"
 							mode="horizontal"
@@ -372,7 +372,7 @@
 							@page-change="currentChangeHandle"
 						>
 						</vxe-pager>
-					</el-tab-pane>
+					</el-tab-pane>-->
 				</el-tabs>
 			</el-card>
 		</el-main>