back/src/views/modules/ability/bsabilityai.vue

@@ -329,8 +329,8 @@ export default {
     this.dataForm.name = ''
     this.dataForm.type = '组件服务'
     this.$http.get('/sys/user/info').then(res => {
+      console.log('res', res.data.data, !res.data.data.superAdmin, this.$store.state.user.roleIdList)
       this.superAdmin = res.data.data.superAdmin
- 
     })
   },
   mounted () {
@@ -341,6 +341,7 @@ export default {
     // 置顶
     toppingCapacity (item) {
       this.$http.put('/resource/pin_top/' + item.id).then(res => {
+        console.log('置顶', res.data.code)
         if (res.data.code == 0) {
           this.$message({
             message: '置顶成功',
@@ -420,6 +421,7 @@ export default {
             })
             this.dataList[index].infoList2 = dataListSinforList
           })
+          console.log('this.dataList', this.dataList)
           this.total = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.total
             : 0
@@ -441,12 +443,8 @@ export default {
       }
     },
     showDetail (val) {
-<<<<<<< HEAD
-      window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id)
-=======
       console.log(val)
       window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id + '&&hiddenBackFlag=true')
->>>>>>> 1e4d145fe03902c4ae099d8c968b93c472595a68
       // this.addOrUpdateHandle(id)
       // this.addOrUpdateVisible = true
       // this.disabled = false
@@ -493,6 +491,7 @@ export default {
       this.uuidTwo = this.uuid(13, 16)
       this.uuidSnum = this.uuidOne + this.uuidTwo
       this.uuidSnum = this.uuidSnum.replace(/\s+/g, '')
+      console.log('this.uuidOne', this.uuidSnum)
     },
     showDocument (val) {
       // 第一步：创建文档
@@ -631,12 +630,8 @@ export default {
     },
     // 新上架
     clear () {
-<<<<<<< HEAD
-      this.$router.push(this.routePath)
-=======
       // this.$router.push(this.routePath)
       console.log('清空----------------------------------------')
->>>>>>> 1e4d145fe03902c4ae099d8c968b93c472595a68
       this.notFilled = []
       this.showPutOnTheShelfFlag = false
       this.showPutOnTheShelfFlag2 = false
@@ -675,6 +670,7 @@ export default {
       )[0].children
     },
     changeInfoList (obj) {
+      console.log(obj, this.submitFrom)
       this.submitFrom.infoList = this.submitFrom.infoList.filter(
         (item) => item.attrType !== obj.attrType
       )
@@ -698,12 +694,14 @@ export default {
     },
     // 完全删除
     deleteCompletely (row) {
+      console.log('完全删除===', row)
       this.$confirm('确认是否删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         this.$http.post('/resource/delResBySuAd?id=' + row.id).then(res => {
+          console.log('删除结果', res.data)
           if (res.data.code == 0) {
             this.$message({
               type: 'success',
@@ -720,6 +718,7 @@ export default {
       })
     },
     submitData () {
+      console.log('提交11111111111===============>', this.putOnTheShelfList, this.submitFrom)
       const arr = []
       this.putOnTheShelfList.map((item) => {
         item.children.map((child) => {
@@ -729,7 +728,6 @@ export default {
               child.name === '应用场景' ||
               child.name === '功能介绍'
             ) {
-           
               arr.push(child.name)
               if (
                 this.submitFrom.infoList.filter(
@@ -829,7 +827,6 @@ export default {
           }
         })
       })
-
       this.submitFrom.infoList = this.submitFrom.infoList.sort(
         (a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType)
       )
@@ -878,6 +875,7 @@ export default {
       if ((this.radio === '业务组件' || this.radio === '开发组件') && (!this.submitFrom.infoList.filter(val => val.attrType === '组件地址')[0] || !this.submitFrom.infoList.filter(val => val.attrType === '组件地址')[0].attrValue)) {
         this.notFilled.push('组件地址')
       }
+      console.log(this.submitFrom, this.notFilled, '表单验证')
       if (this.notFilled.length > 0) {
         this.$message({
           message: '请填写必填字段！',
@@ -891,6 +889,8 @@ export default {
               val.attrValue = this.radio
             }
           })
+          console.log('编辑===============>', this.submitFrom)
+          console.log(this.submitFrom.infoList, '===============abc')
           // 去重
           const newArr = this.submitFrom.infoList.filter(
             (element, index, self) => {
@@ -914,6 +914,7 @@ export default {
             })
             .catch(() => {})
         } else {
+          console.log('提交11111111111===============>', this.putOnTheShelfList, this.submitFrom)
           this.$http
             .post('/resource/insert?source= b', this.submitFrom)
             .then(({ data: res }) => {

back/src/views/modules/components/upload/index.vue

@@ -34,7 +34,7 @@ export default {
     tip: String,
     maxCount: Number,
     data: Array,
-    list: Object ,
+    list: Array,
     emitFlag: String,
     busType: Number
   },
@@ -46,13 +46,13 @@ export default {
   },
   methods: {
     handleExceed (file) {
-
+      console.log(file)
     },
     handError (err, file, fileList) {
-   
+      console.log(err, file, fileList)
     },
     handlePreview (file) {
-
+      console.log(file)
       if (file.response) {
         window.open(
           window.SITE_CONFIG.previewUrl +
@@ -74,7 +74,7 @@ export default {
             message: file.name + '上传成功',
             type: 'success'
           })
-    
+          console.log(file, fileList)
           this.$emit('changeInfoList', {
             attrType: this.title,
             attrValue: file.response.data,
@@ -91,7 +91,7 @@ export default {
       }
     },
     handleRemove (file) {
-
+      console.log(file, '删除', this.title)
       this.$emit('changeInfoList', {
         attrType: this.title,
         attrValue: '',
@@ -104,7 +104,7 @@ export default {
     if (this.list.note1) {
       this.fileList.push({ name: this.list.note2 || '--', url: this.list.note1 })
     }
- 
+    console.log('上传组件===================>', this.list, this.fileList)
   }
 }
 </script>

back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue

@@ -26,7 +26,7 @@ js:
         :placeholder="'请选择' + name">
         <el-option
           :value="itemSelect.dictLabel"
-          v-for="(itemSelect, indexSelect) in optionsCopy"
+          v-for="(itemSelect, indexSelect) in options"
           :key="indexSelect">
         {{ itemSelect.dictLabel }}
         </el-option>
@@ -38,9 +38,9 @@ js:
         filterable
         placeholder="请输入关键词"
          @change="changeIiem(name,data.note1)"
-        >
+        :loading="loading">
         <el-option
-          v-for="(itemSelect) in optionsCopy"
+          v-for="(itemSelect) in options"
           :key="itemSelect.id"
           :label="itemSelect.name"
           :value="itemSelect.id">
@@ -56,7 +56,7 @@ js:
         >
         <el-option
           :value="itemSelect.dictLabel"
-          v-for="(itemSelect, indexSelect) in optionsCopy"
+          v-for="(itemSelect, indexSelect) in options"
           :key="indexSelect">
         {{ itemSelect.dictLabel }}
         </el-option>
@@ -66,7 +66,7 @@ js:
         v-else-if="type === 'checkBox'"
       >
         <el-checkbox-group  v-model="valueCheckBox" @change='chekBoxChange'>
-        <el-checkbox-button v-for="val in optionsCopy" :label="val.dictLabel" :key="val.dictLabel">{{val.dictLabel}}</el-checkbox-button>
+        <el-checkbox-button v-for="val in options" :label="val.dictLabel" :key="val.dictLabel">{{val.dictLabel}}</el-checkbox-button>
       </el-checkbox-group>
       </div>
       <!-- 不可点的input框 -->
@@ -96,7 +96,7 @@ export default {
   },
   props: {
     type: String,
-    data: Object,
+    data: Array,
     name: String,
     value: String,
     changeField: Array,
@@ -107,7 +107,6 @@ export default {
   },
   data () {
     return {
-      optionsCopy:[],
       // 多选放数据的数组
       valueCheckBox: [],
       // 单选数据
@@ -134,7 +133,7 @@ export default {
             res.data.list.forEach((element) => {
               dataList.push(element)
             })
-            this.optionsCopy = dataList
+            this.options = dataList
           })
           .catch(() => {})
       } else if (this.data.name === '归属部门' || this.data.name === '所属产品线') {
@@ -143,9 +142,10 @@ export default {
           res.data.data.forEach((element) => {
             dataList.push(element)
           })
-          this.optionsCopy = dataList
+          this.options = dataList
           if (!this.data.note1) {
             this.$http.get('/sys/user/info').then(({ data: res }) => {
+              console.log(res.data)
               this.data.note1 = res.data.deptId
             })
           }
@@ -159,6 +159,7 @@ export default {
         // this.options = dataList
         if (this.data.note1 == null) {
           this.$http.get('/sys/user/info').then(({ data: res }) => {
+            console.log(res.data)
             this.data.note1 = res.data.realName || ''
           })
         }
@@ -172,12 +173,11 @@ export default {
         //   this.options = dataList
         if (this.data.note1 == null) {
           this.$http.get('/sys/user/info').then(({ data: res }) => {
+            console.log(res.data)
             this.data.note1 = res.data.mobile || ''
           })
         }
         // })
-      }else{
-        this.optionsCopy=this.options
       }
     },
     chekBoxChange (list) {
@@ -199,6 +199,7 @@ export default {
     },
     showTypeClick (e) {
       this.showType = e
+      console.log(e)
       this.$emit('show-type', this.showType)
     }
   },

back/src/views/modules/putOnTheShelf/components/special.vue

@@ -7,7 +7,7 @@
 -->
 <template>
     <div class="special">
-    <div class="top">{{ configure.name }}</div>
+        <div class="top">{{configure.name}}</div>
         <div class="bottom">
           <div class="items" v-show="data.length > 0">
             <div class="item" v-for="(val, index) in data" :key="'key1' + val.name + index">
@@ -15,11 +15,14 @@
                 <span>{{ configure.name }}-{{ index + 1 }}</span>
                 <span></span>
               </p>
-          <p v-for="(attr, index2) in configure.list" :key="'key2' + attr.name + index2">
+              <p v-for="(attr,index2) in configure.list" :key="'key2' + attr.name + index2">
                 <span>{{ attr.name }}</span>
                 <span v-if="attr.type === 'image'">
                   <!-- <a-image :width="85" :height="60" :src="val.img" /> -->
-              <el-image style="width: 85px; height: 60px" :src="val.img" :preview-src-list="[val.img]">
+                  <el-image
+                    style="width: 85px; height: 60px"
+                    :src="val.img"
+                    :preview-src-list="[val.img]">
                   </el-image>
                 </span>
                 <span v-else>{{ val[attr.field] + (attr.company || '') }}</span>
@@ -36,9 +39,13 @@
           <div class="form" v-for="(val, index) in configure.list" :key="'key3' + val.name + index">
             <span>{{ val.name }}</span>
             <a-input v-model:value="val.note1" ::maxlength="24" :placeholder="'请填写' + val.name + ',不超过24个字符'"
-          v-if="val.type == 'input'" />
+              v-if="val.type == 'input'"/>
             <template v-if="val.type == 'input2'">
-          <a-input v-model:value="val.note1" :placeholder="'请填写' + val.name" style="width: 570px;" />
+              <a-input
+                v-model:value="val.note1"
+                :placeholder="'请填写' + val.name"
+                style="width: 570px;"
+              />
               <span style="width: 2.5rem; padding-left: 0.1rem">
                 {{
                   numType == '一次性买断'
@@ -50,18 +57,17 @@
                     : numType == '按年计费'
                     ? '元/年'
                     : ''
-}}
+                }}
               </span>
             </template>
             <a-textarea v-model:value="val.note1" :showCount="true" :maxlength="200" :placeholder="'请填写' + val.name"
-          v-else-if="val.type == 'textArea'" />
+              v-else-if="val.type == 'textArea'"/>
             <a-input-number v-model:value="val.note1" :min="0" :max="9999" :step="0.01" string-mode
               :placeholder="'请填写' + val.name" v-else-if="val.type == 'number'" />
-        <a-radio-group v-model:value="val.note1" :options="val.options" v-else-if="val.type == 'radio'"
+            <a-radio-group v-model:value="val.note1" :options="val.options" v-else-if="val.type == 'radio'"    @change="radioChange"/>
-          @change="radioChange" />
             <!-- <upload :key="showKey" type="图片" btnName="上传图片" :maxCount="1" :data="val" :list="[]" tip="支持图片类型，大小不超过100M"
               v-else-if="val.type == 'image'"></upload> -->
-        <upload :key="showKey" :child='val' :limit=limit accept='.jpg,.png' v-else-if="val.type == 'image'"></upload>
+              <upload :key="showKey" :child='val' limit='1' accept='.jpg,.png' v-else-if="val.type == 'image'"></upload>
           </div>
           <div class="submit">
             <a-button type="primary" @click="add(configure.name)">添加更多</a-button>
@@ -70,7 +76,6 @@
     </div>
 </template>
 <script>
-import { deepClone } from '@/utils/form-generator'
 import upload from '@/views/modules/ability/upload.vue'
 // import upload from '@/views/modules/components/upload'
 export default {
@@ -82,44 +87,16 @@ export default {
     configure: Object,
     showData: Object
   },
-  watch: {
+  data () {
-    configure: {
-      handler(newVal) {
-        let title = newVal.name
-          let list = newVal.list
-          let coloneData = deepClone(this.data)
-          if (list && list.length > 0) {
-            let obj = {}
-            list.forEach((item) => {
-              obj[item.field] = item.note1
-            })
-            if (obj.name || obj.question || obj.price) {
-              coloneData.push(obj)
-            }
-          }
-          if (coloneData.length > 0) {
-            this.$emit('changeInfoList', {
-              attrType: title,
-              attrValue: JSON.stringify(coloneData),
-              delFlag: 0
-            })
-          }
-        
-      },
-      deep: true,
-      immediate: true,
-    },
-  },
-  data() {
     return {
-      limit: 1,
       data: [],
       showKey: 0,
       numType: '一次性买断'
     }
   },
   methods: {
-    add(title, addFlag, submitFlag) {
+    add (title, addFlag, submitFlag) {
+      console.log(title, addFlag, submitFlag)
       const list = this.configure.list
       let flag = true
       list.forEach((item) => {
@@ -187,7 +164,7 @@ export default {
         }
       }
     },
-    del(title, index) {
+    del (title, index) {
       this.data.splice(index, 1)
       const str = this.data.length > 0 ? JSON.stringify(this.data) : ''
       this.$emit('changeInfoList', {
@@ -196,7 +173,7 @@ export default {
         delFlag: 0
       })
     },
-    update(title, index) {
+    update (title, index) {
       const obj = this.data[index]
       this.data.splice(index, 1)
       const str = this.data.length > 0 ? JSON.stringify(this.data) : ''
@@ -209,11 +186,13 @@ export default {
         val.note1 = obj[val.field]
       })
     },
-    radioChange(e) {
+    radioChange (e) {
+      console.log(e, 'wewewe')
       this.numType = e.target.value
     }
   },
-  created() {
+  created () {
+    console.log('特殊处理=============>', this.showData)
     if (this.configure.name === '计费标准信息' || this.configure.name === '常见问题') {
       if (this.showData.children[0].note1) {
         this.data = JSON.parse(this.showData.children[0].note1)
@@ -250,7 +229,6 @@ export default {
 .bottom {
   margin-top: 25px;
   margin-bottom: 25px;
-
   .items {
     background: #fafafa;
     padding: 10px;
@@ -269,7 +247,7 @@ export default {
       }
     }
 
-    p:nth-of-type(1)>span:nth-of-type(1) {
+    p:nth-of-type(1) > span:nth-of-type(1) {
       font-size: 18px;
       font-weight: 600;
     }
@@ -288,7 +266,6 @@ export default {
         margin-right: 5px;
         margin-bottom: 1px;
       }
-
       .delImg {
         cursor: pointer;
         display: inline-block;
@@ -363,7 +340,6 @@ export default {
     }
   }
 }
-
 ::v-deep .el-image__preview {
   width: 100%;
   height: 100%;
@@ -419,18 +395,15 @@ export default {
   justify-content: space-between;
   align-items: center;
 }
-
 ::v-deep .ant-input-number {
   width: 200px;
 }
-
 ::v-deep .ant-transfer-list-header-title {
   font-size: 16px;
   color: #303133;
   font-weight: 400;
   text-align: left;
 }
-
 textarea {
   height: 100px;
   resize: none;

back/src/views/modules/workBench/components/trend-view.vue

@@ -89,6 +89,9 @@ export default {
         },
         (res) => {
       
+          // if (res.data.code !== 0) {
+          //   return
+          // }
           if (res.data.data && res.data.data.length > 0) {
             this.data = res.data.data[0].values
             this.data.map((item) => {
@@ -105,8 +108,8 @@ export default {
             }
           } else {
             this.trendChartData = {
-              xaxis: this.ydata,
+              xaxis: [],
-              ydata:this.xaxis
+              ydata: []
             }
           }
       
@@ -115,7 +118,7 @@ export default {
           })
         },
         (err) => {
-    
+          console.log('err', err)
         }
       )
     },

front/public/static/config/basicConfig.js

@@ -8,7 +8,7 @@
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
-  version: 'dev', // 西海岸
+  version: 'xihaian', // 西海岸
   // version: 'dev', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   // version: 'qingdao', // 测试

front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue

@@ -456,7 +456,7 @@
                 :maxCount="1"
                 :data="item"
                 :list="props.videoList"
-                tip="支持视频类型mp4、mp3、mpeg，大小不超过100M"
+                tip="支持视频类型，大小不超过100M"
               ></upload>
 
               <!-- <a-button