Эх сурвалжийг харах

更新依赖,系统参数设置,新增生成页码

ZaiZai 2 жил өмнө
parent
commit
a9c54d471e

+ 2 - 2
package.json

@@ -12,7 +12,7 @@
         "crypto-js": "^4.1.1",
         "dayjs": "^1.11.7",
         "echarts": "^5.4.2",
-        "element-plus": "^2.3.3",
+        "element-plus": "^2.3.4",
         "js-base64": "^3.7.5",
         "js-cookie": "^3.0.4",
         "js-md5": "^0.7.3",
@@ -32,7 +32,7 @@
         "archiver": "^5.3.1",
         "autoprefixer": "^10.4.14",
         "codemirror": "^6.0.1",
-        "js-fast-way": "^0.0.9",
+        "js-fast-way": "^0.1.0",
         "mitt": "^3.0.0",
         "postcss": "^8.4.23",
         "sass": "^1.62.0",

+ 7 - 4
src/config/index.json

@@ -1,6 +1,9 @@
 {
-  "version": "20230423142605",
-  "target": "http://47.110.251.215:8090",
-  "smsPhone": "",
-  "vite": {}
+    "version": "202304141558",
+    "target": "http://47.110.251.215:8090",
+    "smsPhone": "",
+    "vite": {
+        "port": 5173,
+        "host": "0.0.0.0"
+    }
 }

+ 2 - 3
src/layout/index.vue

@@ -64,7 +64,7 @@ import UserInfoBar from "./modules/UserInfoBar.vue"
 import ConfigBar from "./modules/ConfigBar.vue"
 import {initButtons,initProjectContract} from "~sto/app";
 import website from '~src/config/index'
-import {setImageColor} from "js-fast-way";
+import {setImageColor, setImageColorStyle} from "js-fast-way";
 import {setAppName} from "~uti/tools";
 
 //初始组合式
@@ -166,8 +166,7 @@ watch(() => [
 
 //设置Logo图片颜色
 const setLogoImageColor = () => {
-    const { result } = setImageColor(AppColor.value?.color);
-    document.getElementById('logo-icon').style = result.filter
+    setImageColorStyle('logo-icon', AppColor.value?.color)
 }
 
 //设置折叠

+ 4 - 3
src/views/config/parameter.vue

@@ -21,7 +21,7 @@
                                 <el-checkbox :label="1">公路工程</el-checkbox>
                                 <el-checkbox :label="2">水里水电工程</el-checkbox>
                             </el-checkbox-group>
-                    </div> 
+                    </div>
                 </div>
                 <div class="hc-page-content-box-list">
                      <div class="hc-page-content-box-list-title">案卷四要素设置</div>
@@ -32,8 +32,9 @@
                                 <el-checkbox label="2">卷内目录</el-checkbox>
                                 <el-checkbox label="3">脊背</el-checkbox>
                                 <el-checkbox label="4">备考表</el-checkbox>
+                                <el-checkbox label="5">生成页码</el-checkbox>
                             </el-checkbox-group>
-                    </div> 
+                    </div>
                 </div>
             </HcCard>
         </div>
@@ -225,7 +226,7 @@ line-height: 1.75rem;
       margin-bottom: 30px;
       .hc-page-content-box-list-title{
           margin-top: 30px;
-          padding-left: 30px; 
+          padding-left: 30px;
           margin-bottom: 30px;
           font-size: 20px;
           color: rgba(52, 54, 57, 0.5);

+ 2 - 6
src/views/login/index.vue

@@ -75,7 +75,7 @@ import {getTenantID} from "~api/user";
 import {getTopUrl, setAppName} from "~uti/tools";
 import logoIcon from "~src/assets/logo/icon.png";
 import logoName from "~src/assets/logo/name.png";
-import {formValidate, getObjVal, setImageColor} from "js-fast-way"
+import {formValidate, getObjVal, setImageColorStyle} from "js-fast-way"
 
 const userStore = useAppStore()
 userStore.clearStoreData() //先清理下缓存
@@ -98,11 +98,7 @@ onMounted(() => {
 })
 
 const setAppImageColor = () => {
-    const dom = document.getElementById('logo-icon')
-    if (dom) {
-        const { result } = setImageColor('#1ECC95');
-        dom.style = result.filter
-    }
+    setImageColorStyle('logo-icon', '#1ECC95')
 }
 
 //表单

+ 8 - 8
yarn.lock

@@ -760,10 +760,10 @@ electron-to-chromium@^1.4.284:
   resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.353.tgz"
   integrity sha512-IdJVpMHJoBT/nn0GQ02wPfbhogDVpd1ud95lP//FTf5l35wzxKJwibB4HBdY7Q+xKPA1nkZ0UDLOMyRj5U5IAQ==
 
-element-plus@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.3.3.tgz#33173bbbe84ada40f4d796fe5043c44781198ea4"
-  integrity sha512-Zy61OXrG6b4FF3h29A9ZOUkaEQXjCuFwNa7DlpB3Vo+42Tw5zBbHe5a4BY7i56TVJG5xTbS9UQyA726J91pDqg==
+element-plus@^2.3.4:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.3.4.tgz#4319f6b0a1096cfac9c53b69da2fe23ac5aea63e"
+  integrity sha512-SQr0J9z7N4z48WYk/l9NE2tizl8Q7j2OhqlpTc42k4pGncry3+rVX6dsmcsglFynn6vt3NzYxWJqmLFyDKQq+g==
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.0.6"
@@ -1032,10 +1032,10 @@ js-cookie@^3.0.4:
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.4.tgz#9ae3c5f6eb34d2292d76e0579fabfe7c872e1fae"
   integrity sha512-tlu5VGqPFMP5eBefnmszCFZkPXG2n527NRN9XdNtN6FZ5n/0e98TdDm8BOz290OIIsxtXb9XTJjfqE6gVhOHQw==
 
-js-fast-way@^0.0.9:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/js-fast-way/-/js-fast-way-0.0.9.tgz#4b438e132c85aebddca7c17f600a7a44a3f8b58b"
-  integrity sha512-9ZAsgq3kYbtEqAYqD+gkMQASSk0ymK/evbKuyJBnMBRG+JG7bMmdYuUZssJIBS6OBepF1el/blHGszSDGiebrg==
+js-fast-way@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/js-fast-way/-/js-fast-way-0.1.0.tgz#92da060b161e5602c37cb4d2d6d4338958d8b807"
+  integrity sha512-Pv/x/Adk2QVvTpcDQaJ1O3++NsEFAfT3OdwgAfB+mwEx6Q3fmFnT4WdYjNtEcnlNcaAg+k65FTdsEoNsUHedlA==
 
 js-md5@^0.7.3:
   version "0.7.3"