模型等

src/utils/api.js

@@ -127,6 +127,10 @@ export default {
     getAllModelListBySys: `nakadai/nakadai/model/demo/getAllModelListBySys`,
     InstitutionSourceModel: `nakadai/nakadai/model/demo/InstitutionSourceModel`,
     disableModelDemo: `nakadai/nakadai/model/demo/disabledEvents`,
+    copyTheModelToTheNakadai: `nakadai/nakadai/model/demo/copyTheModelToTheNakadai`,
+    builtInModelButtonDisplayByNakadai: `nakadai/nakadai/model/demo/builtInModelButtonDisplayByNakadai`,
+    builtInModelState: `nakadai/nakadai/model/demo/builtInModelState`,
+    modelRedis: `nakadai/nakadai/model/demo/getRedisCache`,
 
     // 课程管理三级联查
     courseDiscipline: `nakadai/nakadai/subject/courseDiscipline`, //课程学科类别

src/views/order/AddOrder.vue

@@ -1668,12 +1668,6 @@
                width="380px"
                class="ship-dia"
                :close-on-click-modal="false">
-      <!-- <div v-if="curRow.mallNonAssociatedLinks"
-           class="ship">
-        <p class="line"
-           v-for="(link, i) in curRow.mallNonAssociatedLinks"
-           :key="i">{{ link.urlName }}：{{ link.url }}</p>
-      </div> -->
       <el-input :disabled="viewDisabled"
                 v-model="shipContent"
                 placeholder="请填写需交付的产品登录地址、账号、密码等内容...（300个字以内）"
@@ -2851,7 +2845,8 @@ export default {
     showShip (row) {
       this.curRow = row
       let val = ''
-      row.mallNonAssociatedLinks.forEach(e => {
+      // 产品管理那里设置了链接的则要显示到发货内容输入框里
+      row.mallNonAssociatedLinks && row.mallNonAssociatedLinks.forEach(e => {
         val += e.urlName + '：' + e.url + '\n'
       })
       this.shipInfo = val
@@ -2859,16 +2854,6 @@ export default {
       this.shipVisible = true
     },
     copyLink () {
-      // const oInput = document.createElement('input')
-      // oInput.value = this.shipInfo
-      // document.body.appendChild(oInput)
-      // oInput.select()
-      // document.execCommand('Copy')
-      // this.$message({
-      //   message: '复制成功',
-      //   type: 'success'
-      // })
-      // oInput.remove()
       this.shipContent += this.shipInfo
     },
     // 发货信息弹框提交

src/views/serve/backstage/model.vue

@@ -106,6 +106,7 @@
 </template>
 <script>
 import org from "./modelType"
+import Setting from '@/setting'
 export default {
   data () {
     return {
@@ -172,10 +173,20 @@ export default {
     getData () {
       clearInterval(this.timer)
       this.getList()
-      // this.timer = setInterval(this.getList, 1000)
+      if (!Setting.isDev) {
+      this.timer = setInterval(this.getRedis, 1000)
+      }
+    },
+    // 获取redis缓存
+    getRedis () {
+      this.$post(this.api.modelRedis).then(({ data }) => {
+        if (data) {
+          localStorage.getItem('modelNakadai') !== data && this.getList() // 本地缓存跟redis返回的不一样，就查询列表
+          localStorage.setItem('modelNakadai', data)
+        }
+      }).catch(res => { })
     },
     initData () {
-      this.$refs.table.clearSelection()
       this.page = 1
       this.getData()
     },

src/views/serve/backstage/modelType.vue

@@ -3,8 +3,6 @@
     <div>
       <div class="front-switch">
         <el-switch v-model="modelIsShow"
-                   :active-value="0"
-                   :inactive-value="1"
                    active-text="内置模型按钮前台展示"
                    @change="changeModelStatus"></el-switch>
       </div>
@@ -122,13 +120,13 @@ export default {
     },
     // 获取内置模型按钮展示状态
     getModelStatus () {
-      this.$post(`${this.api.checkIsShowBySystemId}?systemId=${this.systemId}`).then(res => {
+      this.$post(`${this.api.builtInModelState}?systemId=${this.systemId}`).then(res => {
-        this.modelIsShow = res.isShow // 0为展示 1为不展示
+        this.modelIsShow = res.message == 'true' ? true : fale
       }).catch(res => { })
     },
     // 改变内置模型按钮展示状态
     changeModelStatus (val) {
-      this.$post(`${this.api.modifyIsShowState}?systemId=${this.systemId}&isShow=${val}`).then(res => { }).catch(res => { })
+      this.$post(`${this.api.builtInModelButtonDisplayByNakadai}?systemId=${this.systemId}&isShow=${val}`).then(res => { }).catch(res => { })
     },
     getSingle () {
       this.$router.push({

src/views/serve/backstage/sourceModel.vue

@@ -2,7 +2,7 @@
   <div class="wrap">
     <div class="side">
       <org ref="tree"
-           @initData="initData"
+           @initData="catetoryClick"
            @getData="getData"></org>
     </div>
 
@@ -83,7 +83,8 @@
                        @click="edit(scope.row)">编辑</el-button>
             <el-button type="text"
                        @click="del(scope.row)">删除</el-button>
-            <el-button type="text"
+            <el-button v-if="isSchool"
+                       type="text"
                        @click="copy(scope.row)">复制</el-button>
             <el-switch v-if="scope.row.postStatus"
                        v-model="scope.row.ztOpen"
@@ -116,7 +117,7 @@
                     style="width: 280px"></el-input>
         </el-form-item>
         <el-form-item label="模型分类">
-          <el-cascader :options="categoryList"
+          <el-cascader :options="categories"
                        v-model="categoryIdCus"
                        :props="categoryProps"
                        clearable
@@ -135,9 +136,11 @@
 </template>
 <script>
 import org from "./sourceType"
+import Setting from '@/setting'
 export default {
   data () {
     return {
+      systemId: this.$route.query.systemId,
       isTopLevel: true, // 是否是在顶级分类
       listData: [],
       keyword: "",
@@ -154,7 +157,9 @@ export default {
         label: 'categoryName',
         value: 'id'
       },
-      timer: null
+      timer: null,
+      isSchool: 0,
+      categories: []
     };
   },
   components: {
@@ -175,31 +180,44 @@ export default {
   },
   methods: {
     // 获取列表
-    async getList (school) {
+    async getList () {
       const curNode = this.$refs.tree.$refs.tree.getCurrentNode() || {}// 获取当前选中的分类
       this.isTopLevel = !curNode.level
       // 如果是首级，要调另一个接口
-      const { data } = await this.$post(this.api[school ? 'InstitutionSourceModel' : !curNode.level ? 'getAllModelListBySys' : 'sysModelDemoList'], {
+      const { data } = await this.$post(this.api[this.isSchool ? 'InstitutionSourceModel' : !curNode.level ? 'getAllModelListBySys' : 'sysModelDemoList'], {
         modelName: this.keyword,
         pageNum: this.page,
         pageSize: this.pageSize,
         categoryId: curNode.id,
-        founder: school ? 1 : 0
+        founder: this.isSchool ? 1 : 0
       })
       this.listData = data.records
       this.total = data.total
     },
-    getData (school) {
+    getData () {
       clearInterval(this.timer)
-      this.getList(school)
+      this.getList()
-      // this.timer = setInterval(() => {
+      if (!Setting.isDev) {
-      //   this.getList(school)
+        this.timer = setInterval(this.getRedis, 1000)
-      // }, 1000)
+      }
     },
-    initData (school) {
+    // 获取redis缓存
-      this.$refs.table.clearSelection()
+    getRedis () {
+      this.$post(this.api.modelRedis).then(({ data }) => {
+        if (data) {
+          localStorage.getItem('modelNakadai') !== data && this.getList() // 本地缓存跟redis返回的不一样，就查询列表
+          localStorage.setItem('modelNakadai', data)
+        }
+      }).catch(res => { })
+    },
+    // 分类点击回调
+    catetoryClick (school) {
+      this.isSchool = school
+      this.initData()
+    },
+    initData () {
       this.page = 1
-      this.getData(school)
+      this.getData()
     },
     // 新增
     add () {
@@ -232,28 +250,23 @@ export default {
     },
     // 复制
     copy (row) {
-      this.$post(this.api.sourceModelClassification + '?founder=0').then(res => {
-        const { data } = res
-        // 没有子级，删除children属性
-        const handleLeaf = list => {
-          list.map(e => {
-            if (e.children.length) {
-              handleLeaf(e.children)
-            } else {
-              delete e.children
-            }
-          })
-        }
-        handleLeaf(data)
-        this.categoryList = data[0].children
-      }).catch(res => { })
-
       this.curRow = JSON.parse(JSON.stringify(row))
       this.copyVisible = true
     },
     // 复制提交
-    copySubmit () {
+    async copySubmit () {
-
+      const ids = this.categoryIdCus
+      const row = this.curRow
+      if (!row.modelName) return this.$message.error('请输入模型名称！')
+      if (!ids.length) return this.$message.error('请选择模型分类！')
+      await this.$post(this.api.copyTheModelToTheNakadai, {
+        beCopiedModelId: row.id,
+        categoryId: ids[ids.length - 1],
+        modelName: row.modelName,
+        systemId: this.systemId
+      })
+      this.$message.success('复制成功！')
+      this.copyVisible = false
     },
     del (row) {
       this.$confirm("确定要删除吗？", "提示", {

src/views/serve/backstage/sourceType.vue

@@ -87,6 +87,7 @@ export default {
       this.$post(this.api.sourceModelClassification + '?founder=0').then(res => {
         const { data } = res
         this.orgList = data
+        this.$parent.categories = data
         data.length && this.$nextTick(() => {
           const categoryId = this.$route.query.categoryId
           this.$refs.tree.setCurrentKey(categoryId || data[0].id)