cloud-web-corejs 1.0.54-dev.19 → 1.0.54-dev.191

package/src/views/user/home/dev.vue

@@ -0,0 +1,29 @@
+<template>
+  <div id="containt" class="index-home-sys">
+    <i class="iconfont icon-a-kaifa1"></i>
+    <span>{{$t1('开发管理平台')}}</span>
+  </div>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+    }
+  },
+  methods: {
+  }
+
+};
+</script>
+<style scoped lang="scss">
+.index-home-sys{
+  background-color: #DEE9F2 !important;margin-top: 10px !important;height: calc(100vh - 52px);border-radius: 12px !important;text-align: center;line-height: calc(100vh - 60px);letter-spacing: 2px;
+  font-size: 48px;font-weight: 600;
+  i{vertical-align: middle;font-weight: 400;margin-right: 24px;color:#225076;font-size:48px;}
+  span{position: relative;
+    &:before{content: "";position: absolute;bottom:0;left:0;width: 223px;height: 16px;background: #96B4CD;z-index: -1;opacity: 0.8;}
+  }
+}
+</style>

package/src/views/user/home/index.vue

@@ -36,9 +36,7 @@ export default {
           let userInfo = res.objx;
           this.userInfo = userInfo;
           let flag = userInfo.flag;
-          if (flag !== 6 && flag !== 7 && flag !== 8) {
-            this.initHome();
-          }
+          this.initHome();
         }
       });
     },
@@ -59,6 +57,15 @@ export default {
       });
     },
     initHome() {
+      let url = null;
+      let userInfo = this.userInfo;
+      let flag = userInfo.flag;
+      if (flag == 6 || flag == 7 || flag == 8) {
+        let url = '/user/home/dev.vue'
+        this.homeContent = require('@base/views' + url).default;
+        this.showHomeContent = true;
+        return
+      }
       this.$http({
         url: USER_PREFIX + '/menu/currentList',
         data: {},
@@ -68,17 +75,20 @@ export default {
           let homeMenu = menus.find(menu => menu.type == 2 && menu.enabled);
           let menuUrl = homeMenu?.url;
 
+          let userInfo = this.userInfo;
+          let flag = userInfo.flag;
+
           let str1 = "@base/views";
           let str2 = "@/views";
-          let url = null;
-          if (menuUrl) {
+
+          if (menuUrl && flag !== 1) {
+            //超级管理员不使用角色首页
             url = menuUrl + '.vue';
           } else {
             let defaultHomePage = this.userInfo.defaultHomePage;
             url = defaultHomePage ? defaultHomePage : '@base/views/user/home/default.vue'
           }
           if (url.startsWith(str1)) {
-            let a = url.slice(str1.length);
             this.homeContent = require('@base/views' + url.slice(str1.length)).default;
           } else if (url.startsWith(str2)) {
             this.homeContent = require('@/views' + url.slice(str2.length)).default;

package/src/views/user/login/default.vue

@@ -59,8 +59,10 @@
       </el-tabs>
     </div>
     <div class="tc copyright">
-      © 广州同望科技发展有限公司
-      <span style="margin-left:50px;">4000646100</span>
+      <slot name="footer">
+        © 广州同望科技发展有限公司
+        <span style="margin-left:50px;">4000646100</span>
+      </slot>
     </div>
   </div>
 </template>

package/src/views/user/login/index2.vue

@@ -0,0 +1,131 @@
+<template>
+  <div class="login-container" :class="backgroundClass" ref="login-container" v-show="showContent">
+    <div class="login-main" style="height: auto;">
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="账号登录" name="first">
+          <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="box-form login" autocomplete="on"
+                   label-position="left">
+            <el-form-item prop="username" class="txt">
+              <span class="svg-container"><i class="el-icon-user"/></span>
+              <el-input ref="username" v-model="loginForm.username" placeholder="请输入用户名" name="" type="text"
+                        tabindex="1" autocomplete="on" @keyup.enter.native="handleLogin"/>
+            </el-form-item>
+            <el-tooltip :enterable="false" v-model="capsTooltip" content="Caps lock is On" placement="right" manual>
+              <el-form-item prop="password" class="txt">
+                <span class="svg-container"><i class="el-icon-lock"/></span>
+                <el-input
+                  :key="passwordType"
+                  ref="password"
+                  v-model="loginForm.password"
+                  :type="passwordType"
+                  placeholder="请输入密码"
+                  name=""
+                  tabindex="2"
+                  autocomplete="on"
+                  auto-complete="new-password"
+                  @keyup.native="checkCapslock"
+                  @blur="capsTooltip = false"
+                  @keyup.enter.native="handleLogin"
+                />
+                <span class="show-pwd" @click="showPwd"><svg-icon
+                  :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"/></span>
+              </el-form-item>
+            </el-tooltip>
+            <div class="">
+              <el-checkbox v-model="isRememberPassword">记住密码</el-checkbox>
+            </div>
+            <el-button :loading="loading" type="primary" @click.prevent.stop="handleLogin" class="btn">登录</el-button>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane label="手机验证码登录" name="second">
+          <el-form ref="loginForm" :model="loginForm2" :rules="loginRules" class="box-form login" autocomplete="on"
+                   label-position="left">
+            <el-form-item prop="username" class="txt" style="width:66%">
+              <span class="svg-container"><i class="el-icon-mobile-phone"/></span>
+              <el-input ref="mobile" v-model="loginForm2.username" placeholder="请输入手机号" name="" type="text"
+                        tabindex="1" autocomplete="on" @keyup.enter.native="handleLogin"/>
+            </el-form-item>
+            <el-button class="btn-send" type="success" :class="{'gray-btn':isCounting}" @click="sendCode">
+              {{ buttonText }}
+            </el-button>
+            <el-form-item prop="smsCode" class="txt">
+              <span class="svg-container"><i class="el-icon-message"/></span>
+              <el-input ref="smsCode" v-model="loginForm2.smsCode" placeholder="请输入验证码" name="" type="text"
+                        tabindex="1" autocomplete="on" @keyup.enter.native="handleLogin"/>
+            </el-form-item>
+            <el-button :loading="loading" type="primary" @click.prevent.stop="handleLogin" class="btn">登录</el-button>
+          </el-form>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <div class="tc copyright">
+      <slot name="footer">
+        © 广州同望科技发展有限公司
+        <span style="margin-left:50px;">4000646100</span>
+      </slot>
+    </div>
+  </div>
+</template>
+
+<script>
+import mixin from "@base/views/user/login/indexMixin";
+
+export default {
+  name: 'Login',
+  mixins: [mixin]
+}
+</script>
+<style lang="scss" scoped>
+@import '@/resources/css/login.scss';
+
+.login-container.tc {
+  background: url(~@/resources/images/bg-login5.jpg) center center/cover no-repeat;
+}
+
+.login-container.chigo {
+  background: url(~@/resources/images/bg-login6.jpg) center center/cover no-repeat;
+}
+
+.login-container.pcp {
+  background: url(~@/resources/images/bg-login8.jpg) center center/cover no-repeat;
+}
+
+.el-select-dropdown {
+  right: 5px;
+  top: 25px;
+}
+
+::v-deep .login-main .el-tabs__header {
+  margin-bottom: 0;
+
+  .el-tabs__nav {
+    line-height: 65px;
+    margin: 0 25px;
+    width: calc(100% - 50px);
+
+    .el-tabs__item {
+      font-size: 18px;
+      width: 50%;
+      text-align: center;
+      margin-right: 0;
+      padding-right: 0 !important;
+      line-height: 65px;
+      height: 65px;
+    }
+  }
+}
+
+.btn-send {
+  position: absolute;
+  margin-top: -74px;
+  right: 35px;
+  height: 52px;
+  width: 27%;
+
+  &.gray-btn {
+    background: #dedede;
+    border-color: #dedede;
+    color: #8a8686;
+  }
+}
+</style>

package/src/views/user/notify_message/dialog.vue

@@ -87,7 +87,7 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
 .designer-dialog.indexUse #containt .detail-wrap .d-cont {
   height: calc(100vh - 82px)
 }

package/src/views/user/notify_template/edit.vue

@@ -1,187 +1,188 @@
-<template>
-  <div class="detail-wrap">
-    <el-form ref="editForm" :model="notifyTemplate">
-      <div class="d-header clearfix">
-        <div class="fl">
-          <i class="el-icon-info"/>
-          {{ dataId ? $t1('查看通知模板') : $t1('新增通知模板') }}
-        </div>
-        <div class="fr">
-          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
-            {{ $t1('重置') }}
-          </el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
-          </el-button>
-        </div>
-      </div>
-      <baseTabs>
-        <baseTabPane :label="$t1('基本信息')">
-          <template #default>
-            <table class="table-detail">
-              <tbody>
-              <tr>
-                <th><em class="f-red">*</em>{{ $t1('通知模板编码') }}</th>
-                <td>
-                  <el-form-item prop="notifyType" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="notifyTemplate.notifyType" clearable/>
-                  </el-form-item>
-                </td>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('通知模板名称') }}
-                </th>
-                <td>
-                  <el-form-item prop="ntName" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="notifyTemplate.ntName" clearable/>
-                  </el-form-item>
-                </td>
-                <th>{{ $t1('是否启用') }}</th>
-                <td>
-                  <el-form-item prop="enabled" :rules="[{ required: false, trigger: 'blur' }]">
-                    <el-radio-group v-model="notifyTemplate.enabled">
-                      <el-radio :label="true">{{ $t1('启用') }}</el-radio>
-                      <el-radio :label="false">{{ $t1('禁用') }}</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <th><em class="f-red">*</em>{{ $t1('通知内容') }}</th>
-                <td colspan="5">
-                  <el-form-item prop="content" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="textarea" :rows="2" size="small"
-                              v-model="notifyTemplate.content"
-                              clearable></el-input>
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <th>{{ $t1('跳转内容') }}</th>
-                <td colspan="5">
-                  <el-form-item prop="jumpContent" :rules="[{ required: false, trigger: 'blur' }]">
-                    <el-input type="textarea" :rows="2" size="small"
-                              v-model="notifyTemplate.jumpContent"
-                              clearable></el-input>
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <th>{{ $t1('备注') }}</th>
-                <td colspan="5">
-                  <el-input type="textarea" :rows="2" size="small" v-model="notifyTemplate.remark"
-                            clearable></el-input>
-                </td>
-              </tr>
-              <tr>
-                <th>
-                  {{ $t1('脚本(获取通知人)') }}
-                  <!--                  <scriptDescriptionButton path="static/readme/PushSetting.txt"></scriptDescriptionButton>-->
-                  <scriptTestButton :script.sync="notifyTemplate.script"></scriptTestButton>
-                </th>
-                <td colspan="7">
-                  <el-form-item prop="script" :rules="[{ required: false, trigger: 'blur' }]">
-                    <code-editor mode="java" :readonly="!1" v-model="notifyTemplate.script"
-                                 v-if="showCodeEditor"></code-editor>
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <th>{{ $t1('创建人') }}</th>
-                <td>{{ notifyTemplate.createBy }}</td>
-                <th>{{ $t1('创建时间') }}</th>
-                <td>{{ notifyTemplate.createDate }}</td>
-                <th>{{ $t1('更新人') }}</th>
-                <td>{{ notifyTemplate.modifyBy }}</td>
-                <th>{{ $t1('更新时间') }}</th>
-                <td>{{ notifyTemplate.modifyDate }}</td>
-              </tr>
-              </tbody>
-            </table>
-          </template>
-        </baseTabPane>
-      </baseTabs>
-    </el-form>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'notify_templateEdit',
-  props: {
-    _dataId: [String, Number]
-  },
-  components: {},
-  data() {
-    return {
-      isEdit: false,
-      tabIndex: 'first',
-      dataId: '',
-      notifyTemplate: {
-        enabled: true
-      },
-      showCodeEditor: false
-    };
-  },
-  created() {
-    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
-  },
-  mounted() {
-    this.getData();
-  },
-  methods: {
-    getData() {
-      if (this.dataId && !isNaN(this.dataId)) {
-        this.isEdit = true;
-        this.$commonHttp({
-          url: USER_PREFIX + `/notify_template/get`,
-          method: `post`,
-          data: {
-            id: this.dataId
-          },
-          isLoading: true,
-          modalStrictly: true,
-          success: res => {
-            this.notifyTemplate = res.objx || {};
-            this.showCodeEditor = true;
-          }
-        });
-      } else {
-        this.showCodeEditor = true;
-      }
-    },
-    saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
-        if (valid) {
-          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
-            var url = USER_PREFIX + (this.isEdit ? `/notify_template/update` : `/notify_template/save`);
-            this.$http({
-              url: url,
-              method: `post`,
-              data: this.notifyTemplate,
-              isLoading: true,
-              success: res => {
-                this.$message({
-                  message: res.content,
-                  type: 'success',
-                  duration: 500,
-                  onClose: t => {
-                    if (this.isEdit) {
-                      this.$baseReload();
-                    } else {
-                      this.$baseReload({
-                        updateParam: {
-                          _dataId: res.objx
-                        }
-                      });
-                    }
-                  }
-                });
-              }
-            });
-          });
-        }
-      });
-    }
-  }
-};
-</script>
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="notifyTemplate">
+      <div class="d-header clearfix">
+        <div class="fl">
+          <i class="el-icon-info"/>
+          {{ dataId ? $t1('查看通知模板') : $t1('新增通知模板') }}
+        </div>
+        <div class="fr">
+          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
+            {{ $t1('重置') }}
+          </el-button>
+          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
+          </el-button>
+        </div>
+      </div>
+      <baseTabs>
+        <baseTabPane :label="$t1('基本信息')">
+          <template #default>
+            <table class="table-detail">
+              <tbody>
+              <tr>
+                <th><em class="f-red">*</em>{{ $t1('通知模板编码') }}</th>
+                <td>
+                  <el-form-item prop="notifyType" :rules="[{ required: true, trigger: 'blur' }]">
+                    <el-input type="text" autocomplete="off" v-model="notifyTemplate.notifyType" clearable/>
+                  </el-form-item>
+                </td>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1('通知模板名称') }}
+                </th>
+                <td>
+                  <el-form-item prop="ntName" :rules="[{ required: true, trigger: 'blur' }]">
+                    <el-input type="text" autocomplete="off" v-model="notifyTemplate.ntName" clearable/>
+                  </el-form-item>
+                </td>
+                <th>{{ $t1('是否启用') }}</th>
+                <td>
+                  <el-form-item prop="enabled" :rules="[{ required: false, trigger: 'blur' }]">
+                    <el-radio-group v-model="notifyTemplate.enabled">
+                      <el-radio :label="true">{{ $t1('启用') }}</el-radio>
+                      <el-radio :label="false">{{ $t1('禁用') }}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th><em class="f-red">*</em>{{ $t1('通知内容') }}</th>
+                <td colspan="5">
+                  <el-form-item prop="content" :rules="[{ required: true, trigger: 'blur' }]">
+                    <el-input type="textarea" :rows="2" size="small"
+                              v-model="notifyTemplate.content"
+                              clearable></el-input>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1('跳转内容') }}</th>
+                <td colspan="5">
+                  <el-form-item prop="jumpContent" :rules="[{ required: false, trigger: 'blur' }]">
+                    <el-input type="textarea" :rows="2" size="small"
+                              v-model="notifyTemplate.jumpContent"
+                              clearable></el-input>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1('备注') }}</th>
+                <td colspan="5">
+                  <el-input type="textarea" :rows="2" size="small" v-model="notifyTemplate.remark"
+                            clearable></el-input>
+                </td>
+              </tr>
+              <tr>
+                <th>
+                  {{ $t1('脚本(获取通知人)') }}
+                  <!--                  <scriptDescriptionButton path="static/readme/PushSetting.txt"></scriptDescriptionButton>-->
+                  <scriptTestButton :script.sync="notifyTemplate.script"></scriptTestButton>
+                </th>
+                <td colspan="7">
+                  <el-form-item prop="script" :rules="[{ required: false, trigger: 'blur' }]">
+                    <code-editor mode="java" :readonly="!1" v-model="notifyTemplate.script"
+                                 v-if="showCodeEditor"></code-editor>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1('创建人') }}</th>
+                <td>{{ notifyTemplate.createBy }}</td>
+                <th>{{ $t1('创建时间') }}</th>
+                <td>{{ notifyTemplate.createDate }}</td>
+                <th>{{ $t1('更新人') }}</th>
+                <td>{{ notifyTemplate.modifyBy }}</td>
+                <th>{{ $t1('更新时间') }}</th>
+                <td>{{ notifyTemplate.modifyDate }}</td>
+              </tr>
+              </tbody>
+            </table>
+          </template>
+        </baseTabPane>
+      </baseTabs>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'notify_templateEdit',
+  props: {
+    _dataId: [String, Number]
+  },
+  components: {},
+  data() {
+    return {
+      isEdit: false,
+      tabIndex: 'first',
+      dataId: '',
+      notifyTemplate: {
+        enabled: true,
+        ntType:0
+      },
+      showCodeEditor: false
+    };
+  },
+  created() {
+    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
+  },
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      if (this.dataId && !isNaN(this.dataId)) {
+        this.isEdit = true;
+        this.$commonHttp({
+          url: USER_PREFIX + `/notify_template/get`,
+          method: `post`,
+          data: {
+            id: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            this.notifyTemplate = res.objx || {};
+            this.showCodeEditor = true;
+          }
+        });
+      } else {
+        this.showCodeEditor = true;
+      }
+    },
+    saveData() {
+      this.$refs.editForm.$baseValidate(valid => {
+        if (valid) {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+            var url = USER_PREFIX + (this.isEdit ? `/notify_template/update` : `/notify_template/save`);
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.notifyTemplate,
+              isLoading: true,
+              success: res => {
+                this.$message({
+                  message: res.content,
+                  type: 'success',
+                  duration: 500,
+                  onClose: t => {
+                    if (this.isEdit) {
+                      this.$baseReload();
+                    } else {
+                      this.$baseReload({
+                        updateParam: {
+                          _dataId: res.objx
+                        }
+                      });
+                    }
+                  }
+                });
+              }
+            });
+          });
+        }
+      });
+    }
+  }
+};
+</script>