Merge remote-tracking branch 'origin/master'

.env.production

@@ -4,4 +4,5 @@ ENV = 'production'
 
 # 生产环境
 # base api
- VUE_APP_BASE_API = 'http://zt.cebitic.com:10184'
+  VUE_APP_BASE_API = 'http://www.hzyzntg.com:20081/'
+  VUE_APP_BASE_APIS = 'http://www.hzyzntg.com:20020/teaServer'

src/api/contentManagement/sysContentNewsInformation.js

@@ -50,9 +50,9 @@ export function updateSysContentNewsInformation(data) {
 }
 
 // 5. 逻辑删除新闻资讯
-export function delSysContentNewsInformation(businessId) {
+export function delSysContentNewsInformation(businessId, unitId) {
   return request({
-    url: '/cmsnews/delete/' + businessId,
+    url: '/cmsnews/deleteLogical/' + businessId + '/' + unitId,
     method: 'delete'
   })
 }
@@ -94,7 +94,7 @@ export function crawler() {
 }
 export function queryCrawlerStatus(params) {
   return request({
-    url: '/cmstask/detail/'+ params.id,
+    url: '/cmstask/detail/' + params.id,
     method: 'get'
   })
 }

src/views/contentManagement/newsInformation/index.vue

@@ -309,8 +309,8 @@ export default {
       shareShopLoading: false,
       crawlerDigShow: false,
       newsTypeMap: {
-        '0': '爬虫',
-        '1': '自建'
+        '0': '爬取',
+        '1': '网站'
       },
       queryShop: true,
       hasAddPerm: ['sys:contentNewsInformation:add'],
@@ -535,7 +535,7 @@ export default {
     handleShareShop(row) {
       // 根据row.unitId是否存在来决定是否解析并设置店铺列表
       if (row.unitId) {
-        this.ruleForm.shops = JSON.parse(row.unitId)
+        this.ruleForm.shops = row.unitId.split(',').map(Number)
       } else {
         this.ruleForm.shops = []
       }
@@ -697,9 +697,11 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      console.log('this.queryParams.unitId', this.queryParams.unitId)
       this.$router.push({
         path: '/contentManagement/newsInformation/info/index',
         query: {
+          unitId: this.queryParams.unitId,
           isOperation: '1',
           title: '新增新闻'
         }
@@ -720,12 +722,17 @@ export default {
     /** 删除按钮操作 */
     removeCourse(row) {
       const id = row.businessId
+      let unitId = this.queryParams.unitId
+      const clearable = this.clearable
       this.$confirm('是否确认操作？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return delSysContentNewsInformation(id)
+        if (clearable) {
+          unitId = null
+        }
+        return delSysContentNewsInformation(id, unitId)
       }).then(() => {
         this.loadData()
         this.$message({

src/views/contentManagement/newsInformation/info/index.vue

@@ -407,6 +407,7 @@ export default {
             // 编辑
             form.flag = '1'
             form.newsType = '1'
+            form.unitId = this.$route.query.unitId
             updateSysContentNewsInformation(form).then(res => {
               if (res.code === 200) {
                 this.$message({
@@ -425,6 +426,7 @@ export default {
             form.flag = '1'
             form.newsType = '1'
             form.tenant = this.userId
+            form.unitId = this.$route.query.unitId
             addSysContentNewsInformation(form).then(res => {
               if (res.code === 200) {
                 this.$message({

src/views/contentManagement/videoInformation/index.vue

@@ -55,8 +55,8 @@
           <div style="float: right">
             <el-form-item>
               <!--          //新增按钮-->
+<!--              v-has-permi="hasAddPerm"-->
               <el-button
-                v-has-permi="hasAddPerm"
                 :class="commonField.addClass"
                 :type="commonField.typePrimary"
                 :icon="commonField.addIcon"
@@ -232,8 +232,8 @@ export default {
       shareShopDiaLog: false,
       shareShopLoading: false,
       newsTypeMap: {
-        '0': '爬虫',
-        '1': '自建'
+        '0': '爬取',
+        '1': '网站'
       },
       queryShop: true,
       hasAddPerm: ['sys:contentNewsInformation:add'],
@@ -546,7 +546,8 @@ export default {
         path: '/contentManagement/videoInformation/info/index',
         query: {
           isOperation: '1',
-          title: '新增视频'
+          title: '新增视频',
+          unitId: this.queryParams.unitId
         }
       })
     },

src/views/contentManagement/videoInformation/info/index.vue

@@ -467,6 +467,7 @@ export default {
             // 编辑
             form.flag = '1'
             form.videoType = '1'
+            form.unitId = this.$route.query.unitId
             updateSysContentNewsInformation(form).then(res => {
               if (res.code === 200) {
                 this.$message({
@@ -485,6 +486,7 @@ export default {
             form.flag = '1'
             form.videoType = '1'
             form.tenant = this.userId
+            form.unitId = this.$route.query.unitId
             addSysContentNewsInformation(form).then(res => {
               if (res.code === 200) {
                 this.$message({