2022-7

src/SManagement/archives_sc/archives_details/detail.vue

@@ -36,7 +36,6 @@ export default {
       isFileInfoPanlShow: false,
       //itemfile样式
       itemStyle: {
-        itemWidth: 486,
         img: {
           width: 52.75,
           height: 63.83
@@ -147,7 +146,7 @@ export default {
   margin-top: 20px;
   padding: 0 20px;
 }
-.el-drawer__body .file .title {
+.el-drawer__body .file1 .title {
   margin-bottom: 20px;
 }
 </style>

src/SManagement/archives_upload/components/FileList.vue

@@ -63,6 +63,7 @@ export default {
   computed:{
   },
   watch:{
+    
   },
   filters: {
 

src/SManagement/archives_upload/components/Set.vue

@@ -14,7 +14,8 @@
                      :show-all-levels="false" 
                      v-model="ruleForm.category" 
                      :props="props"
-                     @change="changeSelect">
+                     @change="changeSelect"
+                     v-if="aaa">
         </el-cascader>
       </el-form-item>
     </el-form>
@@ -51,7 +52,8 @@ export default {
             { required: true, message: '请选择分类', trigger: 'blur' }
           ],
       },
-      seleteList: []
+      seleteList: [],
+      aaa:true
     };
   },
   components: {
@@ -75,6 +77,8 @@ export default {
     getSeleteData() {
       this.$api.requested(this.select).then( res => {
         this.seleteList = res.data
+        console.log(this.seleteList);
+        
       })
     }
   },

src/SManagement/archives_upload/index.vue

@@ -91,7 +91,6 @@ export default {
     //保存
     save () {
       this.$refs.set.$refs.form.validate((val) => {
-        var that = this
         if (val) {
           if (this.uploadType == '3') this.cacheInfo.content.content = weBtoa(this.$refs.editor.editor.getHtml())
           this.cacheInfo.content.type = this.uploadType
@@ -132,7 +131,8 @@ export default {
         this.uploadCacheData = res.data
         this.create_sat_sharematerialid = this.uploadCacheData.sat_sharematerialid
         this.cacheInfo.content.sat_sharematerialid = this.uploadCacheData.sat_sharematerialid
-
+        console.log(this.uploadCacheData);
+        
         this.isEditFile()
       })
     },
@@ -194,10 +194,12 @@ export default {
           "classname": "webmanage.saletool.sharematerial.sharematerial",
           "method": "delete",
           "content": {
-            "sat_sharematerialid": this.uploadCacheData.sat_sharematerialid
+            "sat_sharematerialid": [this.uploadCacheData.sat_sharematerialid]
           }
         }
         let result = await this.$api.requested(param)
+        console.log(result);
+        
       }
     },
     //重置所有数据

src/SManagement/notice/notice_detail/NoticeDetail.vue

@@ -9,7 +9,6 @@
       </div>
     </div>
     <div class="text-content" v-if="tool.checkAuth($route.name,'read')">
-      <span class="title">正文小标题</span>
       <div id="fwb"></div>
     </div>
     <div class="file-content"  v-if="detailData.attinfos && detailData.attinfos.length > 0">
@@ -50,8 +49,6 @@
 
 <script>
 import FileItem from '@/components/file-block/index'
-import FileType from '@/utils/matchingFeilType'
-
 import {weAtob,weBtoa} from "@/utils/weapp-jwt"
 export default {
   name: "NoticeDetail",
@@ -59,12 +56,13 @@ export default {
     return {
       //拉取数据配置
       param: {
-        "accesstoken": "c94ae676c321f1ce91e05797ba2f9bc3",
-        "classname": "saletool.notice.notice",
-        "method": "queryNoticeMain",
-        "content": {
-          "sat_noticeid": 4
-        }
+          "accesstoken": "c94ae676c321f1ce91e05797ba2f9bc3",
+          "classname": "saletool.notice.notice",
+          "method": "queryNoticeMain",
+          "content": {   
+              "sat_noticeid":4
+
+          }
       },
       //发表配置
       send: {
@@ -121,8 +119,12 @@ export default {
     getNoticeDetail () {
       this.param.content.sat_noticeid = this.$route.query.sat_noticeid
       this.$api.requested(this.param).then(res => {
+        console.log(res);
+        
         this.detailData = res.data
-        this.detailData.attinfos = FileType.fileList(this.detailData.attinfos)
+        console.log(this.detailData);
+        
+        this.detailData.attinfos = this.fileType.fileList(this.detailData.attinfos)
         this.compileFWB()
       })
     },

src/SManagement/submitedit_one/index.vue

@@ -24,7 +24,7 @@ export default {
           "content": {
               "onceonly":1,
               "pageNumber": 1,
-              "pageSize": 4,
+              "pageSize": 9,
               "where":{
                   "begdate":"",
                   "enddate":""

src/SManagement/user/role-manage/components/RoleItem.vue

@@ -82,6 +82,10 @@ export default {
 }
 .role-list .role-item .left .role-info p {
   margin-bottom: 10px;
+  max-width: 220px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 .role-list .role-item .left .role-info p:nth-child(1) {
   font-size: 16px;

src/components/file-block/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="file1" v-if="fileData">
+  <div class="file10" v-if="fileData">
     <div class="item-file" :style="[{width:(!itemStyle.itemWidth ? '100%' : itemStyle.itemWidth + 'px')},{'margin-right':itemStyle.margin + 'px'}]" v-for="(item,index) in fileData" :key="index">
       <div class="left">
         <div class="icon" :style="{width:itemStyle.img.width+'px',height:itemStyle.img.height+'px',}">
@@ -97,7 +97,7 @@ export default {
 *{
   box-sizing: border-box;
 }
-.file1 {
+.file10 {
   display: flex;
   flex-wrap: wrap;
 }

src/components/my-editor/Editor.vue

@@ -18,6 +18,7 @@
 <script>
 import Vue from 'vue'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
+import {weAtob,weBtoa} from "@/utils/weapp-jwt"
 
 export default Vue.extend({
     components: { Editor, Toolbar },
@@ -112,7 +113,7 @@ export default Vue.extend({
     mounted() {
         // 模拟 ajax 请求，异步渲染编辑器
         setTimeout(() => {
-          this.html = decodeURIComponent(this.content)
+          this.html = weAtob(this.content)
         }, 1000)
     },
     beforeDestroy() {

src/components/upload/hw_obs_upload.vue

@@ -96,7 +96,7 @@ export default {
     },
 
     // 上传到华为云
-    async upoladFileToServer (url, file, ext, obsfilename) {
+    async upoladFileToServer (url, file, ext, obsfilename) {      
       let THIS = this
       let config = {
         headers: ext === 'pdf' ? { 'Content-Type': 'application/pdf' } : { 'Content-Type': 'application/octet-stream' },
@@ -108,7 +108,6 @@ export default {
               THIS.$set(e, 'progress', percent);
             }
           })
-
         },
       }
       const res = await this.$upload.hw_upload(url, file.raw, config)

src/views/mediaStock/modules/list.vue

@@ -1,6 +1,5 @@
 <template>
   <div>
-    
     <div  class="flex-align-center flex-between border-bottom container normal-panel">
       <div class="flex-align-center">
         <slot name="upload"></slot>