4.0.53 登录页背景图更改为内联样式且从服务端获取

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "4.0.52",
+  "version": "4.0.53",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",

src/client/Login.vue

@@ -1,5 +1,13 @@
 <template>
-  <div class="login">
+  <div
+    class="login"
+    :style="{
+      backgroundImage: `url(${backgroundImageUrl})`,
+      backgroundSize: '100%',
+      backgroundRepeat: 'no-repeat',
+      backgroundPosition: '50% 85%',
+    }"
+  >
     <div>
       <div class="login_wrapper">
         <div class="login_form">
@@ -11,9 +19,11 @@
                   src="/static/assets/client-base-v4/image/template-logo.png"
                   style="margin-top: -40px; width: 100px; height: 100px"
                 />
-                <div class="desc" data-v-7b9d9b52="">Prodog 希望帮助您更好的管理物料</div>
+                <div class="desc" data-v-7b9d9b52="">
+                  Prodog 希望帮助您更好的管理物料
+                </div>
               </h1>
-              
+
               <div>
                 <input
                   v-model="userName"
@@ -118,18 +128,21 @@
                     </label>
                   </div>
                   <div>
-                    <a class="reset_pass forget-password" @click="toForgetPassword()">{{
-                      $t("lang.login.forgetPassword")
-                    }}</a>
+                    <a
+                      class="reset_pass forget-password"
+                      @click="toForgetPassword()"
+                    >{{ $t("lang.login.forgetPassword") }}</a>
                   </div>
                 </div>
                 <div class="clear" />
               </div>
               <div>
                 <div>
-                  <a class="btn btn-default submit" style="width: 100%" @click="login">{{
-                    $t("lang.login.login")
-                  }}</a>
+                  <a
+                    class="btn btn-default submit"
+                    style="width: 100%"
+                    @click="login"
+                  >{{ $t("lang.login.login") }}</a>
                 </div>
                 <div class="clear" />
               </div>
@@ -219,6 +232,7 @@ export default {
       time: 60,
       authSetting: [],
       getImageSrc,
+      backgroundImageUrl: '/static/assets/client-base-v4/image/background.svg',
     };
   },
 
@@ -242,7 +256,7 @@ export default {
   mounted: function () {
     $('body').attr('class', 'body-login');
     $('body').children(':first').attr('class', '');
- 
+
     this.initView();
     this.queryAllAuthSetting();
     this.unqiueAccountManagementDto();
@@ -492,12 +506,10 @@ export default {
       });
     },
 
-
     toForgetPassword: function () {
       this.$router.push('/retrievePassword');
     },
 
-
     /**
      * 获取服务端当前时间
      */
@@ -528,20 +540,19 @@ export default {
       this.accountDateTime = moment().format('YYYY-MM-DD HH:mm:ss');
       console.log('自动生成时间成功：' + this.accountDateTime);
     },
-
   },
 };
 </script>
 
 <style scoped>
-.login{
+/* .login { */
   /* background-image: linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.5)), url('../assets/background.svg'); */
-  background-image: url('../assets/background.svg');
+  /* background-image: url('../assets/background.svg');
   background-repeat: no-repeat;
   background-position: center 110px;
   background-size: 100%;
-  background-position: 50% 85%;
-}
+  background-position: 50% 85%; */
+/* } */
 .login_wrapper {
   margin: 0px auto;
   padding-top: 5%;
@@ -800,24 +811,24 @@ export default {
 
 .copyright {
   font-size: small;
-    position: fixed;
-    bottom: 0;
-    text-align: center;
-    width: 100%;
-    padding-left: 1rem;
-    padding-right: 1rem;
+  position: fixed;
+  bottom: 0;
+  text-align: center;
+  width: 100%;
+  padding-left: 1rem;
+  padding-right: 1rem;
 }
 
-.copyright-inner{
+.copyright-inner {
   overflow: hidden;
   white-space: nowrap;
 }
 
-.copyright a{
+.copyright a {
   color: #333;
 }
 
-.desc{
+.desc {
   margin-top: 12px;
   margin-bottom: 2rem;
   font-size: 14px;
@@ -825,16 +836,16 @@ export default {
   color: rgba(0, 0, 0, 0.65);
 }
 
-.account-name{
+.account-name {
   position: fixed;
   top: 1rem;
   right: 1rem;
   color: rgba(0, 0, 0, 0.45);
 }
 
-.other-login-method{
-      text-align: left;
-    font-size: 12px;
-    margin-bottom: 0.4rem;
+.other-login-method {
+  text-align: left;
+  font-size: 12px;
+  margin-bottom: 0.4rem;
 }
 </style>

src/workflow/CopyTaskWorkflow.vue

@@ -126,6 +126,7 @@ const searchDatas = isSearch => {
 // 状态改变事件
 const statusChange = value => {
   if (!value) searchParams.value.processStatusQuery = 'ALL';
+  pager.start = 0;
   searchDatas(true);
 };
 

src/workflow/MyApplyWorkflow.vue

@@ -23,20 +23,8 @@
     @get-pager="getPageParams"
   >
     <template #bodyCell="{ column, record }">
-      <template v-if="column.key === 'title'">
-        <span v-if="record.category != 'CurdWindow'">
-          {{ record.name }}
-        </span>
-        <span v-else>
-          {{ record.title }}
-        </span>
-      </template>
       <template v-if="column.key === 'description'">
-        <span
-          v-if="record.category != 'CurdWindow'"
-          style="white-space: pre-line"
-        >{{ record.description }}</span>
-        <span v-else style="white-space: pre-line">{{ record.content }}</span>
+        <span style="white-space: pre-line">{{ record.content }}</span>
       </template>
       <template v-if="column.key === 'operation'">
         <a-button type="link" @click="selectTaskInfo(record)">

src/workflow/WorkflowEdit.vue

@@ -508,7 +508,6 @@ export default {
       this.isOk =  false;
       this.isNext =  false;
       this.isDeleteOk =  false;
-      this.archiveVisible = true;
     },
     next: function () {
       this.current++;
@@ -1198,6 +1197,7 @@ export default {
       ajaxApiGet(url).then(
         success => {
           _self.tableSql = success;
+          this.archiveVisible = true;
         },
 
         error => {