Merge branch 'dev_september' of http://git.elinkit.com.cn:7070/r/epmet-oper into dev_september

epmet-oper-web/src/App.vue

@@ -64,11 +64,11 @@ export default {
     // eslint-disable-next-line
     // debugger
     that.setEnv(env)
-
+    console.log('屏幕宽度:' + document.documentElement.clientWidth)
     // 根据屏幕分辨率调整size
     if (document.documentElement.clientHeight < 800) {
       // medium大小
-      that.setSize('medium')
+      that.setSize('small')
       // 屏幕分辨率
       that.setResolution('small')
       Vue.prototype.$ELEMENT = { size: 'medium', zIndex: 3000 }

epmet-oper-web/src/components/ren-region-tree/src/ren-region-tree.vue

@@ -1,49 +1,65 @@
 <template>
   <div class="ren-region">
-  <el-input v-model="showName" :placeholder="placeholder" @focus="treeDialog">
+    <el-input v-model="showName"
-    <el-button slot="append" icon="el-icon-search" @click="treeDialog"></el-button>
+              :placeholder="placeholder"
-  </el-input>
+              @focus="treeDialog">
-  <el-input :value="value" style="display: none"></el-input>
+      <el-button slot="append"
-  <el-dialog :visible.sync="visibleTree" width="360px" :modal="false" :title="placeholder" :close-on-click-modal="false" :close-on-press-escape="false">
+                 icon="el-icon-search"
-    <el-form size="mini" :inline="true">
+                 @click="treeDialog"></el-button>
-      <el-form-item :label="$t('keyword')">
+    </el-input>
-        <el-input v-model="filterText"></el-input>
+    <el-input :value="value"
-      </el-form-item>
+              style="display: none"></el-input>
-      <el-form-item>
+    <el-dialog :visible.sync="visibleTree"
-        <el-button type="default">{{ $t('query') }}</el-button>
+               width="360px"
-      </el-form-item>
+               :modal="false"
-    </el-form>
+               :title="placeholder"
-    <el-tree
+               :close-on-click-modal="false"
-      class="filter-tree"
+               :close-on-press-escape="false">
-      :data="dataList"
+      <el-form size="mini"
-      :default-expanded-keys="expandedKeys"
+               :inline="true">
-      :props="{ label: 'name', children: 'children' }"
+        <el-form-item :label="$t('keyword')">
-      :expand-on-click-node="false"
+          <el-input v-model="filterText"></el-input>
-      :filter-node-method="filterNode"
+        </el-form-item>
-      :highlight-current="true"
+        <el-form-item>
-      node-key="id"
+          <el-button type="default">{{ $t('query') }}</el-button>
-      ref="tree">
+        </el-form-item>
-    </el-tree>
+      </el-form>
-    <template slot="footer">
+      <el-tree class="filter-tree"
-      <el-button type="default" @click="cancelHandle()" size="mini">{{ $t('cancel') }}</el-button>
+               :data="dataList"
-      <el-button type="info" @click="clearHandle()" size="mini">{{ $t('clear') }}</el-button>
+               :default-expanded-keys="expandedKeys"
-      <el-button type="primary" @click="commitHandle()" size="mini">{{ $t('confirm') }}</el-button>
+               :props="{ label: 'name', children: 'children' }"
-    </template>
+               :expand-on-click-node="false"
-  </el-dialog>
+               :filter-node-method="filterNode"
+               :highlight-current="true"
+               node-key="id"
+               ref="tree">
+      </el-tree>
+      <template slot="footer">
+        <el-button type="default"
+                   @click="cancelHandle()"
+                   size="mini">{{ $t('cancel') }}</el-button>
+        <el-button type="info"
+                   @click="clearHandle()"
+                   size="mini">{{ $t('clear') }}</el-button>
+        <el-button type="primary"
+                   @click="commitHandle()"
+                   size="mini">{{ $t('confirm') }}</el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 <style lang="scss">
 .ren-region {
-    .filter-tree {
+  .filter-tree {
-        max-height: 230px;
+    max-height: 230px;
-        overflow: auto;
+    overflow: auto;
-    }
+  }
-    .el-dialog__body {
+  .el-dialog__body {
-        padding: 0px 0px 0px 20px;
+    padding: 0px 0px 0px 20px;
-    }
+  }
-    .el-dialog__footer {
+  .el-dialog__footer {
-        padding: 10px 20px 8px 20px;
+    padding: 10px 20px 8px 20px;
-    }
+  }
 }
 </style>
 <script>
@@ -99,7 +115,7 @@ export default {
           this.$refs.tree.setCurrentKey(id)
           this.expandedKeys = [id]
         })
-      }).catch(() => {})
+      }).catch(() => { })
     },
     cancelHandle () {
       this.visibleTree = false

epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue

@@ -369,19 +369,21 @@
                  :label-width="'100px'">
           <el-form-item v-if="optionType!=='1'"
                         label="角色">
-
+            <div style="overflow-x:auto">
-            <el-checkbox style="width:550px"
+
-                         :indeterminate="isIndeterminate"
+              <el-checkbox style="width:'500px'"
-                         v-model="checkAll"
+                           :indeterminate="isIndeterminate"
-                         @change="handleCheckAllChange">全选</el-checkbox>
+                           v-model="checkAll"
-
+                           @change="handleCheckAllChange">全选</el-checkbox>
-            <el-checkbox-group style="width:550px"
+
-                               v-model="roleCheckedArray"
+              <el-checkbox-group style="width:'500px'"
-                               @change="handleCheckedCitiesChange">
+                                 v-model="roleCheckedArray"
-              <el-checkbox v-for="item in roleAllList"
+                                 @change="handleCheckedCitiesChange">
-                           :label="item.roleKey"
+                <el-checkbox v-for="item in roleAllList"
-                           :key="item.roleKey">{{item.roleName}}</el-checkbox>
+                             :label="item.roleKey"
-            </el-checkbox-group>
+                             :key="item.roleKey">{{item.roleName}}</el-checkbox>
+              </el-checkbox-group>
+            </div>
 
           </el-form-item>
           <el-form-item v-if="optionType!=='3'"
@@ -490,8 +492,13 @@ export default {
     },
     dialogWidth () {
 
-      return this.resolution === 'small' ? 50 : 40
+      return this.resolution === 'small' ? 60 : 60
     },
+    checkWidth () {
+
+      return document.documentElement.clientWidth * (this.dialogWidth / 100)
+    },
+
     ...mapGetters(['clientHeight', 'resolution']),
     formRule () {
       return {
@@ -677,6 +684,7 @@ export default {
       const { data, code, msg, internalMsg } = await requestPost(url, this.upOrDownForm)
 
       if (code === 0) {
+        debugger
         this.roleCheckedArray = []
 
         data.forEach(item => {

epmet-oper-web/src/views/modules/productConfig/subscribe/MyTemp.vue

@@ -56,7 +56,6 @@ export default {
       this.resiAppid = resiAppid
 
       this.radioChange('resi')
-
     },
     radioChange (val) {
 
@@ -78,6 +77,7 @@ export default {
       })
     },
     doLayout () {
+
       this.$nextTick(() => {
         if (this.activeName === 'gov') {
           this.$refs['ref_work'].doLayout() // 解决表格错位

epmet-oper-web/src/views/modules/productConfig/subscribe/MyTempList.vue

@@ -82,6 +82,7 @@ export default {
   methods: {
 
     doLayout () {
+
       this.$nextTick(() => {
         this.$refs['ref_table'].doLayout() // 解决表格错位
 

epmet-oper-web/src/views/modules/productConfig/subscribe/TempDetail.vue

@@ -79,6 +79,7 @@
                 <span class="span_right_item_title">详细内容</span>
               </el-col>
               <el-col :span="18">
+                <!-- <span class="span_right_item_content">{{dataForm.content}}</span> -->
                 <div v-for="(item,index) in contentArray"
                      :key="index">
                   <el-row :gutter="10">
@@ -171,7 +172,7 @@ export default {
       //右侧详细内容解析
 
       this.contentArray = []
-      let arrayContent = this.dataForm.content.split('\\n')
+      let arrayContent = this.dataForm.content.split(' ')
       for (let i = 0; i < arrayContent.length - 1; i++) {
         let oneArray = arrayContent[i].split(':')
         let obj = {}

epmet-oper-web/src/views/modules/productConfig/subscribe/TempList.vue

@@ -46,6 +46,7 @@
           </el-form>
           <el-table ref="ref_publictable"
                     v-loading="dataListLoading"
+                    :height="tableHeight"
                     :data="dataList"
                     border
                     style="width: 100%;">
@@ -64,6 +65,11 @@
                              header-align="left"
                              :min-width="100"
                              align="left"></el-table-column>
+            <el-table-column prop="categoryShow"
+                             label="类目"
+                             header-align="left"
+                             :min-width="100"
+                             align="left"></el-table-column>
             <el-table-column label="操作"
                              fixed="right"
                              header-align="center"
@@ -163,7 +169,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return this.clientHeight - 60 - 80 - 80
+      return this.clientHeight - 60 - 80 - 170
     },
     ...mapGetters(['clientHeight', 'env'])
   },
@@ -179,9 +185,9 @@ export default {
   },
   methods: {
     async renderSelData () { // 渲染下拉框/单选框/复选框等数据
-      debugger
+
-      const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/getcategory'
+      // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/getcategory'
-      // const url = '/third/subscribe/getcategory'
+      const url = '/third/subscribe/getcategory'
       let params = {
         appId: this.resiAppid
       }
@@ -200,9 +206,7 @@ export default {
       // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/getpubtemplatetitles'
       const url = '/third/subscribe/getpubtemplatetitles'
 
-
       this.tableParams.appId = this.resiAppid
-      // this.tableParams.ids = '794'
 
       const { data, code, msg, internalMsg } = await requestPost(url, this.tableParams)
       if (code === 0) {
@@ -210,7 +214,16 @@ export default {
         this.dataList = data.list
         this.dataList.forEach(element => {
           element.typeShow = element.type === 2 ? '一次性订阅' : '长期订阅'
-          // element.keywordsShow = element.keywords.join()
+
+          for (let i = 0; i < this.categoryList.length; i++) {
+            if (element.categoryId === this.categoryList[i].id + '') {
+              element.categoryShow = this.categoryList[i].name
+              break
+            }
+          }
+
+
+
         })
       } else {
         // this.$message.error(msg + "：" + internalMsg)
@@ -229,6 +242,15 @@ export default {
         }
 
       }
+
+      this.$nextTick(() => {
+        if (this.activeName === 'mine') {
+          this.$refs.ref_mytemp.doLayout() // 解决表格错位
+        } else if (this.activeName === 'public') {
+          this.$refs.ref_publictable.doLayout() // 解决表格错位
+        }
+
+      })
     },
     //同步本地公共模板库为微信的公共模板库
     async syncSubSure () {

epmet-oper-web/src/views/pages/loginWork.vue

@@ -101,21 +101,15 @@
               :width="30"
               :top="'120px'"
               @cancel="diaCancel">
-      <div class="div_total">
+      <!-- <div class="div_total"> -->
-        <div v-for="(item,index) in tableData"
+      <div v-for="(item,index) in tableData"
-             :key=index
+           :key=index
-             class="div_row">
+           class="div_row">
-          <!-- <i class="el-icon-user-solid i_icon"></i> -->
+        <span @click="selectCustomer(item)"
-          <span @click="selectCustomer(item)"
+              class="span_name">{{item.customerName}}</span>
-                class="span_name">{{item.customerName}}</span>
-          <!-- <el-button class="btn_sel"
-                     size="small"
-                     type="primary"
-                     plain
-                     @click="selectCustomer(item)">选择</el-button> -->
-        </div>
-
       </div>
+
+      <!-- </div> -->
       <!-- <el-table v-loading="tableLoading"
                 :data="tableData"
                 border
@@ -297,12 +291,15 @@ export default {
   width: 100%;
   text-align: center;
 }
+.el-dialog__body {
+  width: 500px;
+  padding: 0px 0px 0px 20px;
+}
 .div_row {
   height: 50px;
-  width: 50%;
   text-align: center;
   line-height: 50px;
-  margin: 10px 0 10px 150px;
+
   /* width: 100px; */
   /* background-color: rgb(241, 241, 241); */
 }
@@ -321,6 +318,5 @@ export default {
   font-size: 18px;
   cursor: pointer;
   /* color: rgb(37, 156, 235); */
-  float: left;
 }
 </style>