qinzhipeng_v@didiglobal.com 4 rokov pred
rodič
commit
bca7a170b2

+ 10 - 0
src/icons/svg/admin-model1.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13.055" height="14.26" viewBox="0 0 13.055 14.26">
+  <g id="数据模块" transform="translate(-68.946 -10.417)">
+    <path id="路径_13072" data-name="路径 13072" d="M75.35,24.677a.382.382,0,0,1-.218-.064L73.54,23.7a.455.455,0,0,1-.164-.609.446.446,0,0,1,.609-.155l1.364.782,5.339-3.084V18.819a.446.446,0,0,1,.446-.446.437.437,0,0,1,.446.446v2.1a.455.455,0,0,1-.218.391l-5.785,3.3A.409.409,0,0,1,75.35,24.677Zm-4.4-2.583a.409.409,0,0,1-.227,0l-1.383-.819a.455.455,0,0,1-.218-.391V14.207a.455.455,0,0,1,.218-.391l5.794-3.338a.437.437,0,0,1,.446,0l5.785,3.338a.455.455,0,0,1,.218.391v1.455a.437.437,0,0,1-.446.446.446.446,0,0,1-.446-.446v-1.2L75.35,11.379l-5.339,3.084v6.167l1.155.673a.428.428,0,0,1,.164.6A.446.446,0,0,1,70.948,22.094Z" transform="translate(-0.171)" fill="#559df7"/>
+    <path id="路径_13073" data-name="路径 13073" d="M75.179,249.716a.4.4,0,0,1-.218-.064l-5.785-3.275a.437.437,0,0,1-.173-.6.446.446,0,0,1,.609-.173l5.785,3.275a.446.446,0,0,1-.218.837Z" transform="translate(0 -231.788)" fill="#559df7"/>
+    <path id="路径_13074" data-name="路径 13074" d="M489.081,254a.446.446,0,0,1-.218-.837l5.458-3.083a.446.446,0,0,1,.609.173.455.455,0,0,1-.164.609l-5.458,3.083A.482.482,0,0,1,489.081,254Z" transform="translate(-413.72 -236.204)" fill="#559df7"/>
+    <path id="路径_13075" data-name="路径 13075" d="M476.606,482.951a.446.446,0,0,1-.446-.446v-6.531a.455.455,0,1,1,.91,0v6.531a.446.446,0,0,1-.464.446Z" transform="translate(-401.426 -458.493)" fill="#559df7"/>
+    <path id="路径_13076" data-name="路径 13076" d="M842.637,504.717m-1.037,0a1.037,1.037,0,1,0,1.037-1.037A1.037,1.037,0,0,0,841.6,504.717Z" transform="translate(-761.672 -486.253)" fill="#559df7"/>
+    <path id="路径_13077" data-name="路径 13077" d="M159.117,750.477m-1.037,0a1.037,1.037,0,1,0,1.037-1.037A1.037,1.037,0,0,0,158.08,750.477Z" transform="translate(-87.867 -728.52)" fill="#559df7"/>
+  </g>
+</svg>

+ 4 - 0
src/icons/svg/admin_check.svg

@@ -0,0 +1,4 @@
+
+<svg xmlns="http://www.w3.org/2000/svg" width="14.2" height="14.2" viewBox="0 0 14.2 14.2">
+  <path id="模块设置" d="M69.6,64H64.7a.7.7,0,0,0-.7.7v4.9a.7.7,0,0,0,.7.7h4.9a.7.7,0,0,0,.7-.7V64.7a.7.7,0,0,0-.7-.7Zm0,5.6H64.7V64.7h4.9v4.9Zm0,2.1H64.7a.7.7,0,0,0-.7.7v4.9a.7.7,0,0,0,.7.7h4.9a.7.7,0,0,0,.7-.7V72.4a.7.7,0,0,0-.7-.7Zm0,5.6H64.7V72.4h4.9v4.9ZM77.3,64H72.4a.7.7,0,0,0-.7.7v4.9a.7.7,0,0,0,.7.7h4.9a.7.7,0,0,0,.7-.7V64.7A.7.7,0,0,0,77.3,64Zm0,5.6H72.4V64.7h4.9v4.9Zm-4.9,4.9a.349.349,0,0,0-.35.35v2.8a.35.35,0,0,0,.7,0v-2.8A.349.349,0,0,0,72.4,74.5Zm1.75,0a.349.349,0,0,0-.35.35v2.8a.35.35,0,0,0,.7,0v-2.8A.349.349,0,0,0,74.15,74.5Zm1.75-1.4a.349.349,0,0,0-.35.35v4.2a.35.35,0,0,0,.7,0v-4.2A.349.349,0,0,0,75.9,73.1Zm1.75-.7a.349.349,0,0,0-.35.35v4.9a.35.35,0,0,0,.7,0v-4.9A.349.349,0,0,0,77.65,72.4Z" transform="translate(-63.9 -63.9)" fill="#fff" stroke="#fff" stroke-width="0.2"/>
+</svg>

+ 10 - 0
src/icons/svg/admin_model.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13.055" height="14.26" viewBox="0 0 13.055 14.26">
+  <g id="数据模块" transform="translate(-68.946 -10.417)">
+    <path id="路径_13072" data-name="路径 13072" d="M75.35,24.677a.382.382,0,0,1-.218-.064L73.54,23.7a.455.455,0,0,1-.164-.609.446.446,0,0,1,.609-.155l1.364.782,5.339-3.084V18.819a.446.446,0,0,1,.446-.446.437.437,0,0,1,.446.446v2.1a.455.455,0,0,1-.218.391l-5.785,3.3A.409.409,0,0,1,75.35,24.677Zm-4.4-2.583a.409.409,0,0,1-.227,0l-1.383-.819a.455.455,0,0,1-.218-.391V14.207a.455.455,0,0,1,.218-.391l5.794-3.338a.437.437,0,0,1,.446,0l5.785,3.338a.455.455,0,0,1,.218.391v1.455a.437.437,0,0,1-.446.446.446.446,0,0,1-.446-.446v-1.2L75.35,11.379l-5.339,3.084v6.167l1.155.673a.428.428,0,0,1,.164.6A.446.446,0,0,1,70.948,22.094Z" transform="translate(-0.171)" fill="#444"/>
+    <path id="路径_13073" data-name="路径 13073" d="M75.179,249.716a.4.4,0,0,1-.218-.064l-5.785-3.275a.437.437,0,0,1-.173-.6.446.446,0,0,1,.609-.173l5.785,3.275a.446.446,0,0,1-.218.837Z" transform="translate(0 -231.788)" fill="#444"/>
+    <path id="路径_13074" data-name="路径 13074" d="M489.081,254a.446.446,0,0,1-.218-.837l5.458-3.083a.446.446,0,0,1,.609.173.455.455,0,0,1-.164.609l-5.458,3.083A.482.482,0,0,1,489.081,254Z" transform="translate(-413.72 -236.204)" fill="#444"/>
+    <path id="路径_13075" data-name="路径 13075" d="M476.606,482.951a.446.446,0,0,1-.446-.446v-6.531a.455.455,0,1,1,.91,0v6.531a.446.446,0,0,1-.464.446Z" transform="translate(-401.426 -458.493)" fill="#444"/>
+    <path id="路径_13076" data-name="路径 13076" d="M842.637,504.717m-1.037,0a1.037,1.037,0,1,0,1.037-1.037A1.037,1.037,0,0,0,841.6,504.717Z" transform="translate(-761.672 -486.253)" fill="#444"/>
+    <path id="路径_13077" data-name="路径 13077" d="M159.117,750.477m-1.037,0a1.037,1.037,0,1,0,1.037-1.037A1.037,1.037,0,0,0,158.08,750.477Z" transform="translate(-87.867 -728.52)" fill="#444"/>
+  </g>
+</svg>

+ 8 - 0
src/icons/svg/admin_业务线.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="14.5" viewBox="0 0 16 14.5">
+  <g id="业务管理_1_" data-name="业务管理 (1)" transform="translate(-125.673 -130.816)">
+    <path id="路径_13135" data-name="路径 13135" d="M432.95,271.313h-4.3a.43.43,0,0,1,0-.86h4.3a.43.43,0,0,1,0,.86Zm0,2.581h-4.3a.43.43,0,0,1,0-.86h4.3a.43.43,0,1,1,0,.86Z" transform="translate(-296.141 -136.61)" fill="#fff"/>
+    <path id="路径_13136" data-name="路径 13136" d="M320.888,138.989a.43.43,0,0,1-.43-.43v-6.883h-7.743v6.883a.43.43,0,0,1-.86,0v-7.313a.43.43,0,0,1,.43-.43h8.6a.43.43,0,0,1,.43.43v7.313A.43.43,0,0,1,320.888,138.989Z" transform="translate(-181.366 0)" fill="#fff"/>
+    <path id="路径_13137" data-name="路径 13137" d="M198.072,230.359h-2.151a.43.43,0,0,1-.43-.43v-5.592a.43.43,0,0,1,.43-.43h2.151a.43.43,0,0,1,.43.43v5.592A.43.43,0,0,1,198.072,230.359Zm-1.721-.86h1.29v-4.732h-1.29Z" transform="translate(-68.528 -91.37)" fill="#fff"/>
+    <path id="路径_13138" data-name="路径 13138" d="M141.2,532.9H126.143a.452.452,0,0,1-.471-.43v-5.592a.452.452,0,0,1,.471-.43H132.1a.468.468,0,0,1,.446.294l.52,1.426h1.675l.52-1.426a.469.469,0,0,1,.446-.294H141.2a.452.452,0,0,1,.471.43v5.592A.452.452,0,0,1,141.2,532.9Zm-14.588-.86h14.118v-4.732h-4.68l-.52,1.426a.469.469,0,0,1-.446.294h-2.353a.468.468,0,0,1-.446-.294l-.52-1.426h-5.152Z" transform="translate(0 -387.588)" fill="#fff"/>
+  </g>
+</svg>

+ 2 - 1
src/views/ToConfigure/components/adminIndex.vue

@@ -11,7 +11,7 @@
         <adminContent :data="admin_content" :type="1" />
         <!-- 内容 -->
         <!-- 创建/编辑 -->
-        <Configure :show.sync="show" :title="'增加模版项'" @update="selectTemplates" />
+        <Configure ref="configure" :show.sync="show" :title="'增加模版项'" @update="selectTemplates" />
         <!-- 创建/编辑 -->
       </el-main>
     </el-container>
@@ -62,6 +62,7 @@ export default {
       const res = await deleteBizTemplate({ bizId: this.bizId, templateId: cal.id })
       if (res.code === 200) {
         this.selectTemplates()
+        this.$refs.configure.selectBizUnAddTemplates()
         this.$message({ message: '模块删除成功', type: 'success', duration: 1000, offset: 150 })
       }
     },

+ 1 - 0
src/views/ToConfigure/components/toConfigureNodel.vue

@@ -54,6 +54,7 @@ export default {
           const data = { bizId: this.bizId, templateIds: this.ruleForm.name }
           const res = await addBizTemplates(data)
           if (res.code === 200) {
+            this.selectBizUnAddTemplates()
             this.$emit('update')
             this.$nextTick(() => {
               this.$refs.ruleForm.resetFields()

+ 5 - 5
src/views/administrators/components/adminContent.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-header>
+    <el-header style="height: auto;">
       <div class="admin-content-title">{{ data.name }}
         <i v-if="data.type === 2 && type !== 1" class="el-icon-edit admin-content-update" @click="$emit('update', '编辑', data)" />
       </div>
@@ -8,8 +8,8 @@
     <el-main>
       <div v-html="data.content" />
       <div v-if="data.onlineModule" class="admin-content-online admin-content-start">
-        上线顺序
-        <div v-for="(item, index) in data.onlineModule.onlineOrder" :key="index">
+        <span style="margin-right: 10px;">上线顺序</span>
+        <div v-for="(item, index) in data.onlineModule.onlineOrder" :key="index" style="margin: 0 10px;">
           <div class="admin-content-start admin-content-item"><div class="admin-content-code">{{ index + 1 }}</div> {{ item }} </div>
         </div>
       </div>
@@ -31,7 +31,7 @@ export default {
   font-size: 16px;
   font-family: PingFang SC;
   font-weight: 500;
-  line-height: 60px;
+  padding-top: 20px;
   color: #444444;
 }
 .admin-content-item {
@@ -46,7 +46,7 @@ export default {
   text-align: center;
   border: 1px solid #999;
   border-radius: 50%;
-  margin: 2px 20px;
+  margin: 2px 5px;
 }
 .admin-content-online {
   font-size: 14px;

+ 8 - 5
src/views/administrators/components/adminNav.vue

@@ -10,12 +10,12 @@
     </el-header>
     <el-main style="padding: 10px; max-height: calc(100vh - 129px); overflow-y: auto;">
       <div v-for="(item, index) in admin_navList" :key="index" class="admin-nav-between admin-nav-col">
-        <div class="admin-nav-start">
-          <i class="el-icon-document" />
+        <div class="admin-nav-start admin-nav-cursor">
+          <svg-icon :icon-class="index === adminColor ? 'admin-model1' : 'admin_model'" />
           <el-tooltip v-if="item.name.length >= 9" class="item" effect="dark" :content="item.name" placement="top">
-            <div class="admin-nav-name admin-nav-cursor" @click="$emit('clickName', item)"> {{ item.name }} </div>
+            <div class="admin-nav-name admin-nav-cursor" :class="{'admin-name-color': index === adminColor}" @click="$emit('clickName', item), adminColor = index"> {{ item.name }} </div>
           </el-tooltip>
-          <div v-else class="admin-nav-name admin-nav-cursor" @click="$emit('clickName', item)"> {{ item.name }} </div>
+          <div v-else class="admin-nav-name admin-nav-cursor" :class="{'admin-name-color': index === adminColor}" @click="$emit('clickName', item), adminColor = index"> {{ item.name }} </div>
         </div>
         <i v-if="type === 1" class="el-icon-close admin-nav-cursor" @click="deleteModel = true, deleteId = item" />
         <i v-else-if="item.type === 2" class="el-icon-close admin-nav-cursor" @click="deleteModel = true, deleteId = item" />
@@ -41,6 +41,7 @@ export default {
   },
   data() {
     return {
+      adminColor: '',
       deleteModel: false, // 删除dialog
       deleteId: {},
       admin_query: '', // checkList模版查询
@@ -93,12 +94,14 @@ export default {
   cursor: pointer;
   color: #409eff;
 }
+.admin-name-color {
+  color:  #409eff;
+}
 .admin-nav-name {
   width: 149px;
   font-size: 14px;
   font-family: Microsoft Sans Serif;
   font-weight: 400;
-  color: #444444;
   padding-left: 10px;
   overflow: hidden;
   text-overflow:ellipsis;

+ 6 - 3
src/views/administrators/index.vue

@@ -3,8 +3,8 @@
     <el-header class="admin-title" style="padding: 0;">
       <div class="admin-zhihui" @click="$router.push({ name: '首页' })"><img :src="logo"> 质惠</div>
       <div class="admin-title">
-        <div class="admin-nav"><svg-icon icon-class="admin_project" /> 业务线管理</div>
-        <div class="admin-nav" @click="jump()"><svg-icon icon-class="admin_环境" /> checklist模块管理</div>
+        <div class="admin-nav"><svg-icon icon-class="admin_业务线" class="admin-margin" /> 业务线管理</div>
+        <div class="admin-nav" @click="jump()"><svg-icon icon-class="admin_check" class="admin-margin" /> checklist模块管理</div>
       </div>
     </el-header>
     <el-container class="admin-back">
@@ -119,7 +119,7 @@ export default {
   }
 .admin-nav {
   cursor: pointer;
-  margin-right: 100px;
+  margin: 0 50px 0 20px;
   padding: 0 10px;
 }
 .admin-nav:hover {
@@ -128,6 +128,9 @@ export default {
 .admin-back {
    background: #eee;
 }
+.admin-margin {
+  margin-right: 10px;
+}
 .admin-conent {
   min-height: calc(100vh - 80px);
   border-radius: 4px;