Merge branch 'greenUrgent' into testToMerge

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

src/HManagement/siteManage/securityConfig/components/placementSet/index.vue

@@ -0,0 +1,71 @@
+<template>
+  <div class="container normal-panel normal-margin">
+    <p class="normal-title normal-margin" style="font-weight: bold">{{ $t('广告位设置') }}</p>
+    <div>
+      <el-row :gutter="20">
+        <el-col :span="8" v-for="card in list" :key="card.index" style="margin:20px 0">
+          <el-card shadow="none">
+            <el-carousel :interval="5000" arrow="always">
+              <el-carousel-item v-for="item in card.ads" :key="item.index">
+                <img style="width:100%" :src="item.attinfos[0]?item.attinfos[0].url:''" alt="">
+                <!-- <previewImage style="width:100%" :image="item.attinfos[0]?item.attinfos[0]:''"></previewImage> -->
+              </el-carousel-item>
+            </el-carousel>
+            <div style="margin-top:10px;">
+              <p>{{card.notes}} <small style="float:right;color:#999">{{card.dimensional}}</small></p>
+              <div class="flex">
+                <div>
+                  <el-tag style="margin:10px 10px 0 0">{{card.systemclient}}</el-tag>
+                  <el-tag>{{card.location}}</el-tag>
+                </div>
+                <setting :banner="card.ads" :sys_adspaceid="card.sys_adspaceid " @onSuccess="listData"></setting>
+                <!-- <i style="font-size:16px;color:#666" class="el-icon-setting"></i> -->
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import previewImage from '@/components/previewImage/index.vue'
+import setting from '../../../advertisement_mag/modules/setting'
+export default {
+  name: "index",
+  components:{previewImage,setting},
+  data () {
+    return {
+      list:[]
+    }
+  },
+  methods:{
+    listData () {
+      this.$api.requested({
+        "classname": "webmanage.adspace.adspace",
+        "method": "query_adspacelist",
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+        }
+      }).then(res=>{
+        this.list = res.data
+      })
+    }
+  },
+  mounted () {
+    this.listData()
+  }
+}
+</script>
+
+<style scoped>
+.flex{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  /* cursor: pointer; */
+}
+</style>

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>
 

src/HManagement/siteManage/securityConfig/modules/setContentTemplate.vue

@@ -0,0 +1,61 @@
+<template>
+  <div>
+    <el-button size="small" style="width:120px" type="primary" @click="querySite_Parameter">{{ $t('设 置') }}</el-button>
+    <el-dialog :title="$t(dialog_title)" append-to-body :visible.sync="dialogEditVisible" width="860px">
+      <el-row :gutter="16" style="text-align: center">
+        <el-col :span="24" style="margin-top: -20px">
+          <span style="color: #8C8C8C">{{ $t(tip_content) }}？</span>
+        </el-col>
+        <el-col :span="24" style="margin-top: 20px">
+          <div style="width: 780px;" class="inline-16" >
+            <el-radio-group v-model="checkData">
+              <el-radio :label="1" style="color: #8C8C8C">{{ $t('开启') }}</el-radio>
+              <el-radio :label="0" style="color: #8C8C8C">{{$t('关闭')}}</el-radio>
+            </el-radio-group>
+          </div>
+        </el-col>
+      </el-row>
+      <div class="dialog-footer">
+        <el-button size="small" @click="dialogEditVisible = false" class="normal-btn-width">{{$t('取 消')}}</el-button>
+        <el-button size="small" type="warning"  class="normal-btn-width btn-warning" @click="onSubmit">{{$t('确 定')}}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "setContentTemplate",
+  props:["data","dialog_title","tip_content","set_name"],
+  data() {
+    return {
+      dialogEditVisible:false,
+      checkData:0,
+      form:{}
+    }
+  },
+  methods:{
+    querySite_Parameter(){
+      this.dialogEditVisible = true
+      this.form = Object.assign({},this.form,this.data)
+      this.checkData = this.form[this.set_name]
+    },
+    async onSubmit(){
+      this.form[this.set_name] = this.checkData
+      const res = await this.$api.requested({
+        "classname": "webmanage.site.site",
+        "method": "updateSite_Parameter",
+        "content": this.form
+      })
+      this.tool.showMessage(res,()=>{
+        this.$emit('onSuccess')
+        this.dialogEditVisible = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HManagement/siteManage/securityConfig/modules/setTemplate.vue

@@ -0,0 +1,60 @@
+<template>
+  <div style="margin-bottom: 10px">
+    <el-card shadow="hover">
+      <div class="div-flex">
+        <div class="div-flex-left">
+          <div style="margin: auto">
+            <slot name="svgIcon"></slot>
+          </div>
+          <div style="margin-left: 10px">
+            <div class="title-font">
+              {{$t(title)}}
+              <el-tooltip  effect="dark"  placement="top-start" class="inline-16" style="margin-top: 4px;margin-left: 5px" v-if="is_tip">
+                <div slot="content">
+                 <slot name="tipContent"></slot>
+                </div>
+                <img width="14px" height="14px" src="../../../../assets/icons/prompt_icon.svg" style="float: right">
+              </el-tooltip>
+            </div>
+            <div class="result-font">{{$t(`当前设置：`) + $t(setResult)}}</div>
+          </div>
+          <div style="margin-left: 10px">
+            <slot name="imgSrc"></slot>
+          </div>
+        </div>
+<!--        <setContentTemplate></setContentTemplate>-->
+        <div style="margin-top: 4px">
+          <slot name="setContent"></slot>
+        </div>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import setContentTemplate from "@/HManagement/siteManage/securityConfig/modules/setContentTemplate";
+export default {
+  name: "setTemplate",
+  props:['title','setResult','is_tip'],
+  components:{setContentTemplate}
+}
+</script>
+
+<style scoped>
+ .div-flex{
+   display: flex;
+   justify-content: space-between;
+ }
+ .div-flex-left{
+   display: flex;
+   justify-content: left;
+ }
+ .title-font{
+   font-size: 14px;
+   font-weight: bold;
+ }
+ .result-font{
+   font-size: 12px;
+   color: #7F8792;
+ }
+</style>

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>