互联网电视

src/components/workDeptThree.vue

@@ -11,8 +11,6 @@
       node-key="id"
       :default-checked-keys="defaultListc"
       :default-expanded-keys="defaultListc"
-      @node-click="handleNodeClick"
-      @node-expand="handleNodeClick"
     >
       <span
         class="custom-tree-node"
@@ -113,27 +111,27 @@ export default {
       ) {
         return;
       }
-      this.$http({
-        url: "/sysmgr/sysuserinfo/queryList",
-        method: "post",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        data: {
-          groupId: v.o,
-        },
-      }).then((res) => {
-        res.data.forEach((item) => {
-          v.children.push({
-            id: item.id,
-            label: item.loginNameStr,
-            type: 1,
-            displayname: v.displayname,
-            groupId: item.groupId,
-            loginNoStr: item.loginNoStr,
-          });
-        });
-      });
+      // this.$http({
+      //   url: "/sysmgr/sysuserinfo/queryList",
+      //   method: "post",
+      //   headers: {
+      //     "Content-Type": "application/json",
+      //   },
+      //   data: {
+      //     groupId: v.o,
+      //   },
+      // }).then((res) => {
+      //   res.data.forEach((item) => {
+      //     v.children.push({
+      //       id: item.id,
+      //       label: item.loginNameStr,
+      //       type: 1,
+      //       displayname: v.displayname,
+      //       groupId: item.groupId,
+      //       loginNoStr: item.loginNoStr,
+      //     });
+      //   });
+      // });
       for (let i = 0; i < this.$refs.tree.store._getAllNodes().length; i++) {
         if (s && v.o == this.$refs.tree.store._getAllNodes()[i].data.o) {
           this.$refs.tree.store._getAllNodes()[i].expanded = true;

src/components/workflowBase.vue

@@ -274,6 +274,8 @@ export default {
           }
           if (this.isLastManStatus == true) {
             list.lastman = "yes";
+            list.lastManDecision = "yes";
+            list.resourceId = this.nodes.currentShape[0].resourceId
           }
           if (this.nodes.currentShape) {
             list.resolution = this.nodes.currentShape[0].condition.resolution;

src/config/dev.js

@@ -16,6 +16,7 @@ let devs = {
     sjkdbList: '78e1edce-b319-11ed-886f-d6cd97160e00',//数据库导表流程
     tyshList: '345a2955-b321-11ed-886f-d6cd97160e00',//通用审核流程
     userList: '65791a1e-b1ac-11ed-886f-d6cd97160e00',//用户清单流程
+    internetAssessment: '87753452-c2f3-11ed-9c8b-d6cd97160e00',//互联网电视
 }
 let dev = {
     TITLE: '本地环境',
@@ -34,6 +35,7 @@ let dev = {
     sjkdbList: '78e1edce-b319-11ed-886f-d6cd97160e00',//数据库导表流程
     tyshList: '345a2955-b321-11ed-886f-d6cd97160e00',//通用审核流程
     userList: '65791a1e-b1ac-11ed-886f-d6cd97160e00',//用户清单流程
+    internetAssessment: '87753452-c2f3-11ed-9c8b-d6cd97160e00',//互联网电视
 }
 let test = {
     TITLE: '测试环境',
@@ -51,7 +53,8 @@ let test = {
     rltzjlList: 'b9283efe-b33e-11ed-be6b-00505687dcd3',//容量调整记录流程
     sjkdbList: 'd36c60c0-b33f-11ed-be6b-00505687dcd3',//数据库导表流程
     tyshList: '4a4153db-b33f-11ed-be6b-00505687dcd3',//通用审核流程
-    userList: '4fdbb96e-8bfd-11ed-8988-00505687dcd3',//用户清单流程
+    userList: '4edefb21-b24f-11ed-be6b-00505687dcd3',//用户清单流程
+    internetAssessment: 'd4092f5e-c49b-11ed-a8d3-00505687dcd3',//互联网电视
 
 }
 let prod = {

src/http/api.js

@@ -80,7 +80,7 @@ export function getNowdata(e) {
     let yy = new Date().getFullYear()
     let mm = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
     let dd = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
-    let hh = new Date().getHours()
+    let hh = new Date().getHours()< 10 ? '0' + new Date().getHours() : new Date().getHours()
     let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes() : new Date().getMinutes()
     let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds()
     let time = yy + e.a + mm + e.a + dd + e.b + hh + e.c + mf + e.c + ss

src/pages/main/accountPermissions/accountApplication.vue

@@ -444,19 +444,19 @@ export default {
                     { required: true, message: "请添加申请用途", trigger: "blur" },
                 ],
                 proposerUserType: [
-                    { required: true, message: "请选择请选择申请用户类型", trigger: "blur" },
+                    { required: true, message: "请选择请选择申请用户类型", trigger: "change" },
                 ],
                 proposerType: [
-                    { required: true, message: "请选择申请类型", trigger: "blur" },
+                    { required: true, message: "请选择申请类型", trigger: "change" },
                 ],
                 needName: [
                     { required: true, message: "请添加申请主题", trigger: "blur" },
                 ],
                 isSensitive: [
-                    { required: true, message: "请选择是否涉敏", trigger: "blur" },
+                    { required: true, message: "请选择是否涉敏", trigger: "change" },
                 ],
                 isAdd4aRights: [
-                    { required: true, message: "请选择是否添加4A授权", trigger: "blur" },
+                    { required: true, message: "请选择是否添加4A授权", trigger: "change" },
                 ],
                 userName: [
                     { required: true, message: "请添加用户名", trigger: "blur" },
@@ -486,7 +486,7 @@ export default {
                 type: "bt1n",
                 typename: "上传文件",
                 // limit: 5,
-                url: "/market/waf/upload",
+                url: "/market/waf/uploadByMinio",
                 fileList: [],
             },
             list: {},
@@ -630,7 +630,7 @@ export default {
                 // fresourceId: "b3e6cc47-b1a9-11ed-886f-d6cd97160e00", // 本地环境
                 // fresourceId: "canvas", // 生产环境
                 // fresourceId: "9acf34bf-b24d-11ed-be6b-00505687dcd3", //测试91环境
-                fresourceId: getConfig().accountApplicationfresourceId, 
+                fresourceId: getConfig().accountApplicationfresourceId,
                 processDefinitionKey: "BOMC_process",
             },
             dialogStatus: false, //dialog显示
@@ -924,30 +924,46 @@ export default {
             this.handleAccountStatus = true
         },
         delAccount() {
-            this.$http({
-                url: "/market/BomcProcessAccount/delBatch",
-                method: "post",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                data: { delId: this.AccountdelId },
-            }).then((res) => {
-                this.getAccountTable({}, this.pageSizeAccount)
-                this.handleAccountStatus = false
+            this.$confirm("即将删除数据, 是否删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
             })
+                .then(() => {
+                    this.$http({
+                        url: "/market/BomcProcessAccount/delBatch",
+                        method: "post",
+                        headers: {
+                            "Content-Type": "application/json",
+                        },
+                        data: { delId: this.AccountdelId },
+                    }).then((res) => {
+                        this.getAccountTable({}, this.pageSizeAccount)
+                        this.handleAccountStatus = false
+                    })
+                })
+                .catch(() => { });
         },
         delHost() {
-            this.$http({
-                url: "/market/BomcProcessHost/delBatch",
-                method: "post",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                data: { delId: this.HostdelId },
-            }).then((res) => {
-                this.getHostTable({}, this.pageSizeHost)
-                this.handleHostStatus = false
+            this.$confirm("即将删除数据, 是否删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
             })
+                .then(() => {
+                    this.$http({
+                        url: "/market/BomcProcessHost/delBatch",
+                        method: "post",
+                        headers: {
+                            "Content-Type": "application/json",
+                        },
+                        data: { delId: this.HostdelId },
+                    }).then((res) => {
+                        this.getHostTable({}, this.pageSizeHost)
+                        this.handleHostStatus = false
+                    })
+                })
+                .catch(() => { });
         },
         handleSelectionChangeHost(val) {
             this.HostdelId = []
@@ -1124,7 +1140,7 @@ export default {
                 fileName: e.fileName,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
@@ -1162,7 +1178,7 @@ export default {
                 fileName: e.name,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",

src/pages/main/accountPermissions/accountPermissions.vue

@@ -131,10 +131,10 @@ export default {
                     { required: true, message: "请添加账号名称", trigger: "blur" },
                 ],
                 dimensionalFlow: [
-                    { required: true, message: "请选择八维度使用流程", trigger: "blur" },
+                    { required: true, message: "请选择八维度使用流程", trigger: "change" },
                 ],
                 proposerType: [
-                    { required: true, message: "请选择申请类型", trigger: "blur" },
+                    { required: true, message: "请选择申请类型", trigger: "change" },
                 ],
                 needName: [
                     { required: true, message: "请添加申请主题", trigger: "blur" },
@@ -146,7 +146,7 @@ export default {
                 type: "bt1n",
                 typename: "上传文件",
                 // limit: 5,
-                url: "/market/waf/upload",
+                url: "/market/waf/uploadByMinio",
                 fileList: [],
             },
             list: {},

src/pages/main/accountPermissions/accountdel.vue

@@ -227,10 +227,10 @@ export default {
                     { required: true, message: "请添加CRM账号", trigger: "blur" },
                 ],
                 deleteUserType: [
-                    { required: true, message: "请选择删除用户类型", trigger: "blur" },
+                    { required: true, message: "请选择删除用户类型", trigger: "change" },
                 ],
                 proposerType: [
-                    { required: true, message: "请选择申请类型", trigger: "blur" },
+                    { required: true, message: "请选择申请类型", trigger: "change" },
                 ],
                 needName: [
                     { required: true, message: "请添加任务主题", trigger: "blur" },
@@ -248,7 +248,7 @@ export default {
                 type: "bt1n",
                 typename: "上传文件",
                 // limit: 5,
-                url: "/market/waf/upload",
+                url: "/market/waf/uploadByMinio",
                 fileList: [],
             },
             list: {},
@@ -301,7 +301,7 @@ export default {
                 // fresourceId: "6a5fc7b5-b290-11ed-886f-d6cd97160e00", // 本地环境
                 // fresourceId: "canvas", // 生产环境
                 // fresourceId: "e907b062-b33f-11ed-be6b-00505687dcd3", //测试91环境
-                fresourceId: getConfig().accountdelfresourceId, 
+                fresourceId: getConfig().accountdelfresourceId,
                 processDefinitionKey: "ZHSC_process",
             },
             dialogStatus: false, //dialog显示
@@ -578,17 +578,25 @@ export default {
         },
 
         delHost() {
-            this.$http({
-                url: "/market/ZhscProcessHost/delBatch",
-                method: "post",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                data: { delId: this.HostdelId },
-            }).then((res) => {
-                this.getHostTable({}, this.pageSizeHost)
-                this.handleHostStatus = false
+            this.$confirm("即将删除数据, 是否删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
             })
+                .then(() => {
+                    this.$http({
+                        url: "/market/ZhscProcessHost/delBatch",
+                        method: "post",
+                        headers: {
+                            "Content-Type": "application/json",
+                        },
+                        data: { delId: this.HostdelId },
+                    }).then((res) => {
+                        this.getHostTable({}, this.pageSizeHost)
+                        this.handleHostStatus = false
+                    })
+                })
+                .catch(() => { });
         },
         handleSelectionChangeHost(val) {
             this.HostdelId = []
@@ -661,7 +669,7 @@ export default {
                 fileName: e.fileName,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
@@ -700,7 +708,7 @@ export default {
                 fileName: e.name,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",

src/pages/main/accountPermissions/aqbgsyList.vue

@@ -124,7 +124,7 @@ export default {
                 type: "bt1n",
                 typename: "上传文件",
                 // limit: 5,
-                url: "/market/waf/upload",
+                url: "/market/waf/uploadByMinio",
                 fileList: [],
             },
             list: {},
@@ -462,7 +462,7 @@ export default {
                 fileName: e.fileName,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
@@ -501,7 +501,7 @@ export default {
                 fileName: e.name,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",

src/pages/main/accountPermissions/klhfsqList.vue

@@ -177,7 +177,7 @@ export default {
                 type: "bt1n",
                 typename: "上传文件",
                 // limit: 5,
-                url: "/market/waf/upload",
+                url: "/market/waf/uploadByMinio",
                 fileList: [],
             },
             list: {},
@@ -203,7 +203,7 @@ export default {
                 // fresourceId: "4a9e20e8-b33c-11ed-886f-d6cd97160e00", // 本地环境
                 // fresourceId: "canvas", // 生产环境
                 // fresourceId: "d4101040-b33e-11ed-be6b-00505687dcd3", //测试91环境
-                fresourceId: getConfig().klhfsqList, 
+                fresourceId: getConfig().klhfsqList,
                 processDefinitionKey: "KLHF_process",
             },
             dialogStatus: false, //dialog显示
@@ -501,17 +501,25 @@ export default {
             this.handleSjkdbOwnerStatus = true
         },
         delAccount() {
-            this.$http({
-                url: "/market/KlhfProcessAccount/delBatch",//KlhfProcessAccount
-                method: "post",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                data: { delId: this.AccountId },
-            }).then((res) => {
-                this.getTableAccount({}, this.pageSizeAccount)
-                this.handleSjkdbOwnerStatus = false
+            this.$confirm("即将删除数据, 是否删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
             })
+                .then(() => {
+                    this.$http({
+                        url: "/market/KlhfProcessAccount/delBatch",//KlhfProcessAccount
+                        method: "post",
+                        headers: {
+                            "Content-Type": "application/json",
+                        },
+                        data: { delId: this.AccountId },
+                    }).then((res) => {
+                        this.getTableAccount({}, this.pageSizeAccount)
+                        this.handleSjkdbOwnerStatus = false
+                    })
+                })
+                .catch(() => { });
         },
         handleSelectionChange(val) {
             this.AccountId = []

src/pages/main/accountPermissions/rltzjlList.vue

@@ -152,7 +152,7 @@ export default {
                 type: "bt1n",
                 typename: "上传文件",
                 // limit: 5,
-                url: "/market/waf/upload",
+                url: "/market/waf/uploadByMinio",
                 fileList: [],
             },
             list: {},
@@ -508,7 +508,7 @@ export default {
                 fileName: e.fileName,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
@@ -547,7 +547,7 @@ export default {
                 fileName: e.name,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",

src/pages/main/accountPermissions/sjkdbList.vue

@@ -270,10 +270,10 @@ export default {
                     { required: true, message: "请添加数据迁移用途", trigger: "blur" },
                 ],
                 importMode: [
-                    { required: true, message: "请选择导入方式", trigger: "blur" },
+                    { required: true, message: "请选择导入方式", trigger: "change" },
                 ],
                 isSensitive: [
-                    { required: true, message: "请选择是否涉及敏感数据", trigger: "blur" },
+                    { required: true, message: "请选择是否涉及敏感数据", trigger: "change" },
                 ],
                 needName: [
                     { required: true, message: "请添加标题", trigger: "blur" },
@@ -286,7 +286,7 @@ export default {
                 type: "bt1n",
                 typename: "上传文件",
                 // limit: 5,
-                url: "/market/waf/upload",
+                url: "/market/waf/uploadByMinio",
                 fileList: [],
             },
             list: {},
@@ -334,7 +334,7 @@ export default {
                 // fresourceId: "78e1edce-b319-11ed-886f-d6cd97160e00", // 本地环境
                 // fresourceId: "canvas", // 生产环境
                 // fresourceId: "d36c60c0-b33f-11ed-be6b-00505687dcd3", //测试91环境
-                fresourceId: getConfig().sjkdbList, 
+                fresourceId: getConfig().sjkdbList,
                 processDefinitionKey: "SJKDB_process",
             },
             dialogStatus: false, //dialog显示
@@ -622,17 +622,25 @@ export default {
             this.handleSjkdbTableNameStatus = true
         },
         delSjkdbTableName() {
-            this.$http({
-                url: "/market/SjkdbProcessOwnerTableName/delBatch",//SjkdbProcessOwnerTableName
-                method: "post",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                data: { delId: this.SjkdbTableNamedelId },
-            }).then((res) => {
-                this.getSjkdbTableNameTable({}, this.pageSizSjkdbTableName)
-                this.handleSjkdbTableNameStatus = false
+            this.$confirm("即将删除数据, 是否删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
             })
+                .then(() => {
+                    this.$http({
+                        url: "/market/SjkdbProcessOwnerTableName/delBatch",//SjkdbProcessOwnerTableName
+                        method: "post",
+                        headers: {
+                            "Content-Type": "application/json",
+                        },
+                        data: { delId: this.SjkdbTableNamedelId },
+                    }).then((res) => {
+                        this.getSjkdbTableNameTable({}, this.pageSizSjkdbTableName)
+                        this.handleSjkdbTableNameStatus = false
+                    })
+                })
+                .catch(() => { });
         },
         delSjkdbOwner() {
             this.$http({
@@ -776,7 +784,7 @@ export default {
                 fileName: e.fileName,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
@@ -814,7 +822,7 @@ export default {
                 fileName: e.name,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",

src/pages/main/accountPermissions/tyshList.vue

@@ -130,13 +130,13 @@ export default {
             lastManList: [],
             rule: {
                 type: [
-                    { required: true, message: "请选择类别", trigger: "blur" },
+                    { required: true, message: "请选择类别", trigger: "change" },
                 ],
                 isCenterDirectorApprove: [
-                    { required: true, message: "请选择是否中心主任审批", trigger: "blur" },
+                    { required: true, message: "请选择是否中心主任审批", trigger: "change" },
                 ],
                 centerDirector: [
-                    { required: true, message: "请选择中心主任", trigger: "blur" },
+                    { required: true, message: "请选择中心主任", trigger: "change" },
                 ],
                 remark: [
                     { required: true, message: "请添加备注", trigger: "blur" },
@@ -166,7 +166,7 @@ export default {
                 type: "bt1n",
                 typename: "上传文件",
                 // limit: 5,
-                url: "/market/waf/upload",
+                url: "/market/waf/uploadByMinio",
                 fileList: [],
             },
             list: {},
@@ -504,7 +504,7 @@ export default {
                 fileName: e.fileName,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
@@ -543,7 +543,7 @@ export default {
                 fileName: e.name,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",

src/pages/main/userList/userList.vue

@@ -124,7 +124,7 @@ export default {
                 type: "bt1n",
                 typename: "上传文件",
                 // limit: 5,
-                url: "/market/waf/upload",
+                url: "/market/waf/uploadByMinio",
                 fileList: [],
             },
             list: {},
@@ -462,7 +462,7 @@ export default {
                 fileName: e.fileName,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
@@ -501,7 +501,7 @@ export default {
                 fileName: e.name,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",

src/router/index.js

@@ -2341,6 +2341,12 @@ const routes = [{
             component: (resolve) => require( /* webpackChunkName: "system" */
                 ['../pages/main/accountPermissions/rltzjlList.vue'], resolve)
         },
+        {
+            path: '/internetAssessment',
+            name: 'internetAssessment',
+            component: resolve => require(['../pages/main/internetAssessment/internetAssessment.vue'], resolve),
+            meta: { title: '互联网电视考核' }
+        }
 
 
     ]

vue.config.js

@@ -126,14 +126,14 @@ module.exports = {
                     "^/market": "",
                 },
             },
-            "/api": {
-                target: "http://43.138.50.94:7777",
-                ws: false,
-                changeOrigin: true,
-                pathRewrite: {
-                    "^/api": "",
-                },
-            },
+            // "/api": {
+            //     target: "http://43.138.50.94:7777",
+            //     ws: false,
+            //     changeOrigin: true,
+            //     pathRewrite: {
+            //         "^/api": "",
+            //     },
+            // },
             // 开发环境变化可注释 ⬆️⬆️
             "/": {
                 // target: 'http://192.168.2.145:9600/spfm',
@@ -148,11 +148,11 @@ module.exports = {
                 // target: "http://124.223.66.248:9600",
                 // target: "http://43.138.50.94:9600",
                 // target: 'http://192.168.2.44:9600/',
-                target: 'http://192.168.2.124:9600',
+                target: 'http://192.168.2.92:9600',
                 // target: "http://124.223.66.248:9600",
                 // target: "http://43.138.50.94:9600",
                 changeOrigin: true,
-                logLevel:'debug',
+                // logLevel:'debug',
             },
         },
     },