Pārlūkot izejas kodu

Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

Min 1 gadu atpakaļ
vecāks
revīzija
46261be489

+ 72 - 3
fhKeeper/formulahousekeeper/timesheet-workshop/src/assets/iconfont/demo_index.html

@@ -54,6 +54,24 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe618;</span>
+                <div class="name">产品</div>
+                <div class="code-name">&amp;#xe618;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe69a;</span>
+                <div class="name">智能优化</div>
+                <div class="code-name">&amp;#xe69a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe772;</span>
+                <div class="name">钉钉</div>
+                <div class="code-name">&amp;#xe772;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe625;</span>
                 <div class="name">推送</div>
@@ -492,9 +510,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1672729800404') format('woff2'),
-       url('iconfont.woff?t=1672729800404') format('woff'),
-       url('iconfont.ttf?t=1672729800404') format('truetype');
+  src: url('iconfont.woff2?t=1690265288277') format('woff2'),
+       url('iconfont.woff?t=1690265288277') format('woff'),
+       url('iconfont.ttf?t=1690265288277') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@@ -520,6 +538,33 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont firerock-iconchanpin"></span>
+            <div class="name">
+              产品
+            </div>
+            <div class="code-name">.firerock-iconchanpin
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont firerock-iconzhinengyouhua"></span>
+            <div class="name">
+              智能优化
+            </div>
+            <div class="code-name">.firerock-iconzhinengyouhua
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont firerock-icondingding"></span>
+            <div class="name">
+              钉钉
+            </div>
+            <div class="code-name">.firerock-icondingding
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont firerock-icontuisong"></span>
             <div class="name">
@@ -1177,6 +1222,30 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#firerock-iconchanpin"></use>
+                </svg>
+                <div class="name">产品</div>
+                <div class="code-name">#firerock-iconchanpin</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#firerock-iconzhinengyouhua"></use>
+                </svg>
+                <div class="name">智能优化</div>
+                <div class="code-name">#firerock-iconzhinengyouhua</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#firerock-icondingding"></use>
+                </svg>
+                <div class="name">钉钉</div>
+                <div class="code-name">#firerock-icondingding</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#firerock-icontuisong"></use>

+ 15 - 3
fhKeeper/formulahousekeeper/timesheet-workshop/src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2390497 */
-  src: url('iconfont.woff2?t=1672729800404') format('woff2'),
-       url('iconfont.woff?t=1672729800404') format('woff'),
-       url('iconfont.ttf?t=1672729800404') format('truetype');
+  src: url('iconfont.woff2?t=1690265288277') format('woff2'),
+       url('iconfont.woff?t=1690265288277') format('woff'),
+       url('iconfont.ttf?t=1690265288277') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.firerock-iconchanpin:before {
+  content: "\e618";
+}
+
+.firerock-iconzhinengyouhua:before {
+  content: "\e69a";
+}
+
+.firerock-icondingding:before {
+  content: "\e772";
+}
+
 .firerock-icontuisong:before {
   content: "\e625";
 }

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
fhKeeper/formulahousekeeper/timesheet-workshop/src/assets/iconfont/iconfont.js


+ 21 - 0
fhKeeper/formulahousekeeper/timesheet-workshop/src/assets/iconfont/iconfont.json

@@ -5,6 +5,27 @@
   "css_prefix_text": "firerock-icon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "4464993",
+      "name": "产品",
+      "font_class": "chanpin",
+      "unicode": "e618",
+      "unicode_decimal": 58904
+    },
+    {
+      "icon_id": "666901",
+      "name": "智能优化",
+      "font_class": "zhinengyouhua",
+      "unicode": "e69a",
+      "unicode_decimal": 59034
+    },
+    {
+      "icon_id": "20375943",
+      "name": "钉钉",
+      "font_class": "dingding",
+      "unicode": "e772",
+      "unicode_decimal": 59250
+    },
     {
       "icon_id": "10936691",
       "name": "推送",

BIN
fhKeeper/formulahousekeeper/timesheet-workshop/src/assets/iconfont/iconfont.ttf


BIN
fhKeeper/formulahousekeeper/timesheet-workshop/src/assets/iconfont/iconfont.woff


BIN
fhKeeper/formulahousekeeper/timesheet-workshop/src/assets/iconfont/iconfont.woff2


+ 2 - 2
fhKeeper/formulahousekeeper/timesheet-workshop/src/routes.js

@@ -96,7 +96,7 @@ export const allRouters = [
         path: '/',
         component: Home,
         name: '产品管理',
-        iconCls: 'iconfont firerock-iconxiangmu',
+        iconCls: 'iconfont firerock-iconchanpin',
         leaf: false,
         children: [
             { path: '/product/:cateId', component: prodList, name: '产品管理',iconCls: 'iconfont firerock-iconxiangmu' },
@@ -163,7 +163,7 @@ export const allRouters = [
         path: '/',
         component: Home,
         name: '系统设置',
-        iconCls: 'iconfont firerock-iconquanxian1',
+        iconCls: 'iconfont firerock-iconsetting',
         leaf: true,//只有一个节点
         children: [
             { path: '/settings', component: settings, name: '角色权限'},

+ 3 - 2
fhKeeper/formulahousekeeper/timesheet-workshop/src/views/Home.vue

@@ -8,7 +8,7 @@
                 <img v-if="collapsed" class="headImg" src="../assets/image/head_logo.png" />
                 <div v-else class="logo-sys">
                     <img class="headImg" src="../assets/image/head_logo.png" />
-                    <span>{{$t('workingHoursHousekeeper')}}</span>
+                    <span>{{appName}}</span>
                 </div>
             </el-col>
             <el-col :span="6">
@@ -306,6 +306,7 @@
         inject:['reloads'],
         data() {
             return {
+                appName: localStorage.appName,
                 companyForm:{
                     name: '',
                 },
@@ -986,7 +987,7 @@
                         height: 100%;
                         line-height: 60px;
                         margin-left: 15px;
-                        font-size: 18px;
+                        font-size: 16px;
                         // margin: 20px 0 0 15px;
                         vertical-align: middle;
                     }

+ 34 - 8
fhKeeper/formulahousekeeper/timesheet-workshop/src/views/Login.vue

@@ -4,9 +4,10 @@
             <div class="login-par">
                 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-position="left" label-width="0px" class="demo-ruleForm login-container">
                     <div class="login-logo">
-                        <img src="../assets/image/login_logo.png" style="width:100px;height:80px;"/>
+                        <img v-if="!appLogo" src="../assets/image/login_logo.png" style="width:100px;height:80px;"/>
+                        <img v-else :src="'/upload/'+appLogo" style="width:100px;height:80px;"/>
                     </div>
-                    <h3 class="title">{{ $t('workingHoursHousekeeper') }}</h3>
+                    <h3 class="title">{{ appName? appName:"生产车间工时管家" }}</h3>
                     <el-form-item class="login-input" prop="username">
                         <el-input type="text" v-model="ruleForm.username" autocomplete="off" :placeholder="$t('zhang-hao-shou-ji-hao')" clearable prefix-icon="el-icon-user-solid"></el-input>
                     </el-form-item>
@@ -32,19 +33,19 @@
                                 <p><span style="color: #333">QQ:</span><span id="QQ">3052894409</span></p>
                             </div>
                         </el-link>
-                        <el-link type="primary" style="margin-right:5px;" @click="dialogVisible=true" :underline="false">
+                        <!-- <el-link type="primary" style="margin-right:5px;" @click="dialogVisible=true" :underline="false">
                             {{ $t('shi-yong-shuo-ming') }} </el-link>
-                        <el-link type="primary" v-if="!isCorpWX" @click="jumpTo" :underline="false">{{ $t('qi-ye-zhu-ce') }}</el-link>
+                        <el-link type="primary" v-if="!isCorpWX" @click="jumpTo" :underline="false">{{ $t('qi-ye-zhu-ce') }}</el-link> -->
                     </div>
                 </el-form>
             </div>
             <el-dialog :title="$t('shi-yong-shuo-ming')" :visible.sync="dialogVisible" width="500px">
-                <p><a style="color:#409EFF;text-decoration:none" href="upload/生产车间管家使用说明_基础版.docx" download="生产车间管家使用说明_基础版.docx" 
+                <!-- <p><a style="color:#409EFF;text-decoration:none" href="upload/生产车间管家使用说明_基础版.docx" download="生产车间管家使用说明_基础版.docx" 
                             target="_blank">生产车间管家使用说明_基础版.docx</a></p>
                 <p><a style="color:#409EFF;text-decoration:none" href="upload/生产车间管家使用说明_项目管理专业版.docx" download="生产车间管家使用说明_项目管理专业版.docx" 
                             target="_blank">生产车间管家使用说明_项目管理专业版.docx</a></p>
                 <p><a style="color:#409EFF;text-decoration:none" href="upload/生产车间管家使用说明_建筑工程专业版.docx" download="生产车间管家使用说明_建筑工程专业版.docx" 
-                            target="_blank">生产车间管家使用说明_建筑工程专业版.docx</a></p>
+                            target="_blank">生产车间管家使用说明_建筑工程专业版.docx</a></p> -->
                 <!-- <p><a style="color:#409EFF;text-decoration:none" href="upload/生产车间管家使用说明_项目经理.docx" download="生产车间管家使用说明_项目经理.docx" 
                             target="_blank">生产车间管家使用说明_项目经理.docx</a></p>
                 <p><a style="color:#409EFF;text-decoration:none" href="upload/生产车间管家使用说明_普通员工.docx" download="生产车间管家使用说明_普通员工.docx" 
@@ -72,6 +73,7 @@
         inject:['reloads'],
         data() {
             return {
+                appSettingErrMsg: null,
                 isCorpWX: false,
                 dialogVisible: false,
                 logining: false,
@@ -87,7 +89,9 @@
                 wxworkFlg: false,
                 bindingqywx: false,
 
-                wxHrefFlg: false
+                wxHrefFlg: false,
+                appName: localStorage.appName,
+                appLogo: localStorage.appLogo,
             };
         },
         watch: {
@@ -98,6 +102,9 @@
 			}
         },
         created() {
+            if (!localStorage.appName) {
+                localStorage.appName = "生产车间工时管家";
+            }
             // this.langChange()
             if (localStorage.userInfo != null) {
                 var user = JSON.parse(localStorage.userInfo);
@@ -117,7 +124,7 @@
             }
         },
         mounted() {
-            // this.wxworkCli()
+            this.getSettings();
             var ua = navigator.userAgent.toLowerCase();
             console.log(ua, '打印出来')
             if (ua.indexOf("wxwork") > 0) {
@@ -250,6 +257,25 @@
             }
         },
         methods: {
+            getSettings() {
+                this.http.post('/sys-config/getAppSetting', {},
+                res => {
+                    if (res.code == "ok") {
+                        this.appName = res.data.appName;
+                        this.appLogo = res.data.appLogo;
+                        localStorage.appName = this.appName;
+                        localStorage.appLogo = this.appLogo;
+                    } else {
+                        this.appSettingErrMsg = res.msg;
+                    }
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                });
+            },
             wxworkCli() {
                 // this.wxworkFlg = true
                 // this.$nextTick(()=>{