qymljy 1 месяц назад
Родитель
Сommit
9a7635cbb8

+ 2 - 2
src/HManagement/siteManage/messageSendtype/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
     <div class="container normal-panel normal-margin">
-      <p class="normal-title normal-margin">{{ $t('消息提醒设置') }}</p>
-      <div class="flex-align-center" style="padding:50px;border-bottom:1px solid #eeeeee">
+      <p class="normal-title normal-margin" style="font-weight: bold">{{ $t('消息设置') }}</p>
+      <div class="flex-align-center">
          <div class="flex-align-center switch-panel">
           <small>{{ $t('系统弹窗提醒') }}&emsp;</small>
           <el-switch

Разница между файлами не показана из-за своего большого размера
+ 12 - 261
src/HManagement/siteManage/securityConfig/index.vue


Разница между файлами не показана из-за своего большого размера
+ 266 - 0
src/HManagement/siteManage/securityConfig/indexCopy.vue


+ 10 - 25
src/HManagement/siteManage/securityConfig/modules/basicinfo.vue

@@ -1,34 +1,19 @@
 <template>
-  <div class="container normal-panel normal-margin panel" style="display:flex">
+  <div  style="display:flex;padding-top: 20px;padding-left: 20px">
     <div>
-      <el-descriptions>
-          <el-descriptions-item :label="$t(`企业名称`)">{{enterprise.enterprisename?enterprise.enterprisename:'--'}}</el-descriptions-item>
-          <el-descriptions-item :label="$t(`企业简称`)">{{enterprise.abbreviation}}</el-descriptions-item>
+      <el-descriptions :column="4">
+        <el-descriptions-item :label="$t(`企业名称`)">{{enterprise.enterprisename?enterprise.enterprisename:'--'}}</el-descriptions-item>
+        <el-descriptions-item :label="$t(`企业简称`)">{{enterprise.abbreviation}}</el-descriptions-item>
         <el-descriptions-item :label="$t(`法人`)">{{enterprise.contact}}</el-descriptions-item>
         <el-descriptions-item :label="$t(`电话`)">{{enterprise.phonenumber}}</el-descriptions-item>
-          <!-- <el-descriptions-item :label="$t(`企业互联ID`)">苏州市</el-descriptions-item> -->
-      </el-descriptions>
-      <el-descriptions direction="vertical">
-        <el-descriptions-item :label="$t(`企业操作页LOGO`)">
-          <div class="image-panel" style="margin-left:10px">
-            <img v-show="img.usetype === 'actionlogo'" v-for="img in siteinfo.attinfos" :key="img.index" style="width:100%" :src="img.url" alt="">
-          </div>
-        </el-descriptions-item>
-        <!-- <el-descriptions-item :label="$t(`企业登录页LOGO`)">
-          <br><div>
-            <el-image src="">
-              <div slot="error" class="image-slot">
-                <i class="el-icon-picture-outline"></i>
-              </div>
-            </el-image>
-          </div>
-        </el-descriptions-item> -->
-        <!-- <el-descriptions-item :label="$t(`登录背景`)">
-        </el-descriptions-item> -->
       </el-descriptions>
+      <div style="font-size: 14px">
+        {{$t(`企业操作页LOGO:`)}}
+      </div>
+      <div class="image-panel" style="width: 100px;height: 100px">
+          <img v-show="img.usetype === 'actionlogo'" v-for="img in siteinfo.attinfos" :key="img.index" style="width:100%" :src="img.url" alt="">
+      </div>
     </div>
-    <el-button  :disabled="!tool.checkAuth($route.name,'update')" icon="el-icon-edit" size="small" type="primary" style="width:120px;height: 30px"
-                @click="onShowDtail">{{$t('编 辑')}}</el-button>
   </div>
 </template>
 

+ 97 - 0
src/components/normal-basic-layout/normalCompany.vue

@@ -0,0 +1,97 @@
+<template>
+  <div class="basic__layout__panel">
+    <div style="padding:16px 16px 0 16px;" class="flex-align-center flex-between" >
+      <div style="width: 100%;background: #FFFFFF;height: 271px">
+        <div class="flex-align-center" style="width: 100%;display: flex;justify-content: space-between">
+          <div class="inline-16" v-if="activeApp" style="font-size:26px;font-weight:bold;margin-top: 20px;margin-left: 20px">{{$t(customTitle ? customTitle : activeApp.meta.title)}}&nbsp;
+            <div v-if="!customTitle && isPortraitShow !== 'true'" style="display:inline">
+              <img width="20" v-if="showAppCollection()" src="@/assets/icons/incoll.svg" alt="">
+              <img width="20" v-else src="@/assets/icons/uncoll.svg" @click="addToAsideBar" alt="">
+            </div>
+          </div>
+          <slot name="titleRight"></slot>
+        </div>
+        <slot name="company"></slot>
+      </div>
+      <div>
+        <slot name="refresh"></slot>
+      </div>
+    </div>
+    <slot name="content"></slot>
+    <drawer></drawer>
+  </div>
+</template>
+
+<script>
+
+import {mapGetters} from 'vuex'
+export default {
+  props:['tableName','idName','tableData','apiId','formPath','oldFormPath','options','autoQuery','detailPath','customTitle','hidePagination','isPortraitShow'],
+  components:{
+    drawer:() =>  import('./drawerDetail/drawer'),
+
+  },
+  computed:{
+    ...mapGetters({
+      activeApp:'activeApp',
+      searchValue:'searchValue',
+      menuApp:'menuApp',
+    })
+  },
+  data () {
+    return {
+
+    }
+  },
+  methods:{
+    // 创建快捷应用
+    async addToAsideBar () {
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.userauthforweb.userauth",
+        "method": "create_usershortcuts",
+        "content": {
+          "systemappid":this.activeApp.systemappid
+        }
+      })
+      this.$store.dispatch('setAppMenu')
+    },
+    showAppCollection () {
+			let _isSame = this.menuApp.some(m=>this.activeApp.name === m.systemapp)
+			return _isSame
+		},
+    refresh () {
+      this.$emit('onRefresh')
+    }
+  },
+  mounted () {
+  },
+  created () {
+  }
+}
+
+</script>
+<style>
+.layout-header-panel .el-input-group__append, .el-input-group__prepend{
+  background-color: #fff !important;
+  color: #999 !important;
+  border: 1px solid #dcdfe6 !important;
+  cursor: pointer;
+}
+</style>
+<style scoped>
+
+/* .basic__layout__panel{
+  padding: 16px 0;
+} */
+.basic__layout__panel{
+  height: calc(100vh - 130px);
+  background: #F5F5F5;
+}
+.card__list{
+  display: flex;
+}
+.collection{
+  color: orange !important;
+}
+
+</style>

Некоторые файлы не были показаны из-за большого количества измененных файлов