Browse Source

互联网电视上线

hujunwei@agilestar.cn 2 years ago
parent
commit
9821522ee6
2 changed files with 291 additions and 90 deletions
  1. 67 35
      src/config/dev.js
  2. 224 55
      src/pages/main/internetAssessment/internetAssessment.vue

+ 67 - 35
src/config/dev.js

@@ -1,54 +1,86 @@
 'use strict'
 let devs = {
-    TITLE:'本地环境',
-    BASE_URL:"http://43.138.50.94:9600/", //本地环境
-    BASE_API:"http://43.138.50.94:8880/api",//工作流本地环境
-    EXCEL_URL:"http://43.138.50.94:7777", //本地excel路径
-    provincialWorkOrderAreafresourceId:'a682dc9f-2fea-11ed-a6ed-02427ba2d388',//通用工单地市
-    provincialWorkOrderfresourceId:'08368848-2fde-11ed-a6ed-02427ba2d388',//通用工单省
-    riskMaterialsfresourceId:'c9104902-6575-11ed-8e1e-d6cd97160e00',//风险防控
+    TITLE: '本地环境',
+    BASE_URL: "http://43.138.50.94:9600/", //本地环境
+    BASE_API: "http://43.138.50.94:8880/api",//工作流本地环境
+    EXCEL_URL: "http://43.138.50.94:7777", //本地excel路径
+    provincialWorkOrderAreafresourceId: 'a682dc9f-2fea-11ed-a6ed-02427ba2d388',//通用工单地市
+    provincialWorkOrderfresourceId: '08368848-2fde-11ed-a6ed-02427ba2d388',//通用工单省
+    riskMaterialsfresourceId: 'c9104902-6575-11ed-8e1e-d6cd97160e00',//风险防控
+    accountApplicationfresourceId: 'b3e6cc47-b1a9-11ed-886f-d6cd97160e00',//账号申请流程
+    accountdelfresourceId: '6a5fc7b5-b290-11ed-886f-d6cd97160e00',//账号删除
+    accountPermissionsfresourceId: '14c60ff0-b1a8-11ed-886f-d6cd97160e00',//账号权限申请流程
+    aqbgsyListfresourceId: '014cf465-b31c-11ed-886f-d6cd97160e00',//安全报告审阅
+    klhfsqList: '4a9e20e8-b33c-11ed-886f-d6cd97160e00',//口令恢复申请流程
+    rltzjlList: '7395620f-b33d-11ed-886f-d6cd97160e00',//容量调整记录流程
+    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:'本地环境',
-    BASE_URL:"http://127.0.0.1:8080", //本地环境
-    BASE_API:"http://43.138.50.94:8880/api",//工作流本地环境
-    EXCEL_URL:"http://43.138.50.94:7777", //本地excel路径
-    provincialWorkOrderAreafresourceId:'a682dc9f-2fea-11ed-a6ed-02427ba2d388',//通用工单地市
-    provincialWorkOrderfresourceId:'08368848-2fde-11ed-a6ed-02427ba2d388',//通用工单省
-    riskMaterialsfresourceId:'c9104902-6575-11ed-8e1e-d6cd97160e00',//风险防控
+    TITLE: '本地环境',
+    BASE_URL: "http://127.0.0.1:8080", //本地环境
+    BASE_API: "http://43.138.50.94:8880/api",//工作流本地环境
+    EXCEL_URL: "http://43.138.50.94:7777", //本地excel路径
+    provincialWorkOrderAreafresourceId: 'a682dc9f-2fea-11ed-a6ed-02427ba2d388',//通用工单地市
+    provincialWorkOrderfresourceId: '08368848-2fde-11ed-a6ed-02427ba2d388',//通用工单省
+    riskMaterialsfresourceId: 'c9104902-6575-11ed-8e1e-d6cd97160e00',//风险防控
+    accountApplicationfresourceId: 'b3e6cc47-b1a9-11ed-886f-d6cd97160e00',//账号申请流程
+    accountdelfresourceId: '6a5fc7b5-b290-11ed-886f-d6cd97160e00',//账号删除
+    accountPermissionsfresourceId: '14c60ff0-b1a8-11ed-886f-d6cd97160e00',//账号权限申请流程
+    aqbgsyListfresourceId: '014cf465-b31c-11ed-886f-d6cd97160e00',//安全报告审阅
+    klhfsqList: '4a9e20e8-b33c-11ed-886f-d6cd97160e00',//口令恢复申请流程
+    rltzjlList: '7395620f-b33d-11ed-886f-d6cd97160e00',//容量调整记录流程
+    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:'测试环境',
-    BASE_URL:"http://10.149.85.91:8000/spfm", //测试环境
-    BASE_API:"http://10.149.85.91:8000/api",//工作流测试环境
-    EXCEL_URL:"http://10.149.85.91:7777", //测试excel路径
-    provincialWorkOrderAreafresourceId:'33b0af93-b1ce-11ed-be6b-00505687dcd3',//通用工单地市
-    provincialWorkOrderfresourceId:'4fdbb96e-8bfd-11ed-8988-00505687dcd3',//通用工单省
-    riskMaterialsfresourceId:'3124a2d4-7209-11ed-8d6f-00505687dcd3',//风险防控
+    TITLE: '测试环境',
+    BASE_URL: "http://10.149.85.91:8000/spfm", //测试环境
+    BASE_API: "http://10.149.85.91:8000/api",//工作流测试环境
+    EXCEL_URL: "http://10.149.85.91:7777", //测试excel路径
+    provincialWorkOrderAreafresourceId: '33b0af93-b1ce-11ed-be6b-00505687dcd3',//通用工单地市
+    provincialWorkOrderfresourceId: '4fdbb96e-8bfd-11ed-8988-00505687dcd3',//通用工单省
+    riskMaterialsfresourceId: '3124a2d4-7209-11ed-8d6f-00505687dcd3',//风险防控
+    accountApplicationfresourceId: '9acf34bf-b24d-11ed-be6b-00505687dcd3',//账号申请流程
+    accountdelfresourceId: 'e907b062-b33f-11ed-be6b-00505687dcd3',//账号删除
+    accountPermissionsfresourceId: '2b9e648d-b24d-11ed-be6b-00505687dcd3',//账号权限申请流程
+    aqbgsyListfresourceId: 'bc3402ee-b33f-11ed-be6b-00505687dcd3',//安全报告审阅
+    klhfsqList: 'd4101040-b33e-11ed-be6b-00505687dcd3',//口令恢复申请流程
+    rltzjlList: 'b9283efe-b33e-11ed-be6b-00505687dcd3',//容量调整记录流程
+    sjkdbList: 'd36c60c0-b33f-11ed-be6b-00505687dcd3',//数据库导表流程
+    tyshList: '4a4153db-b33f-11ed-be6b-00505687dcd3',//通用审核流程
+    userList: '4edefb21-b24f-11ed-be6b-00505687dcd3',//用户清单流程
+    internetAssessment: 'd4092f5e-c49b-11ed-a8d3-00505687dcd3',//互联网电视
+
 }
 let prod = {
-    TITLE:'线上环境',
-    BASE_URL:"http://10.230.26.15:8000/mkt", //线上环境
-    BASE_API:"http://10.230.26.15:8000/api",//工作流线上环境
-    EXCEL_URL:"http://10.230.26.15:7777", //线上excel路径
-    provincialWorkOrderAreafresourceId:'db26384e-b984-11ed-afb6-e00084564cce',//通用工单地市
-    provincialWorkOrderfresourceId:'9b83efc7-b984-11ed-afb6-e00084564cce',//通用工单省
-    riskMaterialsfresourceId:'canvas',//风险防控
+    TITLE: '线上环境',
+    BASE_URL: "http://10.230.26.15:8000/mkt", //线上环境
+    BASE_API: "http://10.230.26.15:8000/api",//工作流线上环境
+    EXCEL_URL: "http://10.230.26.15:7777", //线上excel路径
+    provincialWorkOrderAreafresourceId: 'db26384e-b984-11ed-afb6-e00084564cce',//通用工单地市
+    provincialWorkOrderfresourceId: '9b83efc7-b984-11ed-afb6-e00084564cce',//通用工单省
+    riskMaterialsfresourceId: 'canvas',//风险防控
+    internetAssessment: 'canvas',//互联网电视
 }
-export const getConfig  = () =>{
-    switch(process.env.VUE_APP_ENV){
+export const getConfig = () => {
+    switch (process.env.VUE_APP_ENV) {
         case "development":
-            window.sessionStorage.setItem('getConfig',JSON.stringify(dev) )
+            window.sessionStorage.setItem('getConfig', JSON.stringify(dev))
             return dev;
         case 'test':
-            window.sessionStorage.setItem('getConfig',JSON.stringify(test))
+            window.sessionStorage.setItem('getConfig', JSON.stringify(test))
             return test;
         case 'production':
-            window.sessionStorage.setItem('getConfig',JSON.stringify(prod))
+            window.sessionStorage.setItem('getConfig', JSON.stringify(prod))
             return prod
         case 'devs':
-            window.sessionStorage.setItem('getConfig',JSON.stringify(devs))
-            return devs; 
+            window.sessionStorage.setItem('getConfig', JSON.stringify(devs))
+            return devs;
     }
 }
 export default getConfig;

+ 224 - 55
src/pages/main/internetAssessment/internetAssessment.vue

@@ -33,7 +33,7 @@
                     </el-form-item>
                 </div>
                 <div class="" style="margin: 1%;    border-bottom: 1px solid #e1e1e1;">
-                    <el-form-item label="考核说明:" >
+                    <el-form-item label="考核说明:">
                         <el-input type="textarea" v-model="fromList.assessmentDescription" maxlength="500" show-word-limit
                             :disabled="disabled"></el-input>
                     </el-form-item>
@@ -51,8 +51,7 @@
                     </el-form-item>
                 </div>
                 <div class="" v-if="fromList.assessmentTemplate">
-                    <el-form-item
-                        :label="fromList.assessmentTemplate == '1' ? '合作运营考核(100分,权重50%):' : '合作运营考核(    100分,权重100%)'">
+                    <el-form-item v-if="fromList.assessmentTemplate != '1'" label="合作运营考核(100分,权重100%)">
                         <el-button type="primary" style="float:left"
                             v-if="dialogTitle == '新建工单' || fromList.taskName == '起草'"
                             @click="addNewHost1()">新增考核项</el-button>
@@ -110,9 +109,91 @@
                             <el-table-column prop="score" label="考核得分">
                                 <template slot-scope="scope">
                                     <span
-                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核'&&fromList.assessmentTemplate == '1')">
-                                        <el-input size="mini" type="number" :precision="0" v-model="scope.row.score"
-                                            oninput="value=value.replace(/[^\d]/g,'')"
+                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核' && fromList.assessmentTemplate == '1')">
+                                        <el-input size="mini" type="text" :precision="0" v-model="scope.row.score"
+                                            oninput="value=value.replace(/[^\d.]/g,'')"
+                                            @blur="onInputFocus1(scope.$index, scope.row.score)"></el-input>
+                                    </span>
+                                    <span v-else>{{ scope.row.score }}</span>
+                                </template>
+                            </el-table-column>
+
+                            <el-table-column label="操作" v-if="dialogTitle == '新建工单' || fromList.taskName == '起草'">
+                                <template slot-scope="scope">
+                                    <div style="display:flex">
+                                        <el-button icon="el-icon-edit" type="text"
+                                            @click="editX(scope.row, scope.$index)">{{
+                                                scope.row.show ? '保存' : "修改" }}
+                                        </el-button>
+                                        <el-button type="text" @click="delectv(scope.$index, scope.row)">删除</el-button>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </el-form-item>
+                </div>
+                <div class="" v-if="fromList.assessmentTemplate">
+                    <el-form-item v-if="fromList.assessmentTemplate == '1'" label="合作运营考核(100分,权重50%)">
+                        <el-button type="primary" style="float:left"
+                            v-if="dialogTitle == '新建工单' || fromList.taskName == '起草'"
+                            @click="addNewHost1()">新增考核项</el-button>
+                        <el-table class="com-table" :key="Date.now()" ref="multipleTable"
+                            :data="fromList.content1.tableData1" tooltip-effect="dark" size="mini" border
+                            style="width: 100%">
+                            <el-table-column prop="item" label="考核项目">
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.show">
+                                        <el-input type="textarea" size="mini" v-model="scope.row.item"></el-input>
+                                    </span>
+                                    <span v-else>{{ scope.row.item }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="detailed" label="考核细则">
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.show">
+                                        <el-input type="textarea" size="mini" v-model="scope.row.detailed"></el-input>
+                                    </span>
+                                    <span v-else>{{ scope.row.detailed }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="content" label="考核内容">
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.show">
+                                        <el-input type="textarea" size="mini" v-model="scope.row.content"></el-input>
+                                    </span>
+                                    <span v-else>{{ scope.row.content }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="principle" label="考核原则">
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.show">
+                                        <el-input type="textarea" size="mini" v-model="scope.row.principle"></el-input>
+                                    </span>
+                                    <span v-else>{{ scope.row.principle }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="deductMarks" label="扣分标准">
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.show">
+                                        <el-input type="textarea" size="mini" v-model="scope.row.deductMarks"></el-input>
+                                    </span>
+                                    <span v-else>{{ scope.row.deductMarks }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="require" label="佐证要求">
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.show">
+                                        <el-input type="textarea" size="mini" v-model="scope.row.require"></el-input>
+                                    </span>
+                                    <span v-else>{{ scope.row.require }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="score" label="考核得分">
+                                <template slot-scope="scope">
+                                    <span
+                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核' && fromList.assessmentTemplate == '1')">
+                                        <el-input size="mini" type="text" :precision="0" v-model="scope.row.score"
+                                            @input="numDxsCheck(fromList.content1.tableData1[scope.$index], 1, 'score')"
                                             @blur="onInputFocus1(scope.$index, scope.row.score)"></el-input>
                                     </span>
                                     <span v-else>{{ scope.row.score }}</span>
@@ -192,10 +273,10 @@
                             <el-table-column prop="score" label="考核得分">
                                 <template slot-scope="scope">
                                     <span
-                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核'&&fromList.assessmentTemplate == '1')">
-                                        <el-input size="mini" type="number" :precision="0" v-model="scope.row.score"
-                                            oninput="value=value.replace(/[^\d]/g,'')"
-                                            @blur="onInputFocus1(scope.$index, scope.row.score)"></el-input>
+                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核' && fromList.assessmentTemplate == '1')">
+                                        <el-input size="mini" type="text" :precision="0" v-model="scope.row.score"
+                                            @input="numDxsCheck(fromList.content1.tableData2[scope.$index], 1, 'score')"
+                                            @blur="onInputFocus2(scope.$index, scope.row.score)"></el-input>
                                     </span>
                                     <span v-else>{{ scope.row.score }}</span>
                                 </template>
@@ -226,10 +307,10 @@
                             <el-table-column label="考核得分">
                                 <template slot-scope="scope">
                                     <span
-                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核'&&fromList.assessmentTemplate == '1')">
-                                        <el-input size="mini" type="number" :precision="0" v-model="scope.row.score"
-                                            oninput="value=value.replace(/[^\d]/g,'')"
-                                            @blur="onInputFocus1(scope.$index, scope.row.score)"></el-input>
+                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核' && fromList.assessmentTemplate == '1')">
+                                        <el-input size="mini" type="text" :precision="0" v-model="scope.row.score"
+                                            @input="numDxsCheck(fromList.content1.tableData3[scope.$index], 1, 'score')"
+                                            @blur="onInputFocus3(scope.$index, scope.row.score)"></el-input>
                                     </span>
                                     <span v-else>{{ scope.row.score }}</span>
                                 </template>
@@ -248,10 +329,10 @@
                             <el-table-column label="考核得分">
                                 <template slot-scope="scope">
                                     <span
-                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核'&&fromList.assessmentTemplate == '1')">
-                                        <el-input size="mini" type="number" :precision="0" v-model="scope.row.score"
-                                            oninput="value=value.replace(/[^\d]/g,'')"
-                                            @blur="onInputFocus1(scope.$index, scope.row.score)"></el-input>
+                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核' && fromList.assessmentTemplate == '1')">
+                                        <el-input size="mini" type="text" :precision="0" v-model="scope.row.score"
+                                            @input="numDxsCheck(fromList.content1.tableData4[scope.$index], 1, 'score')"
+                                            @blur="onInputFocus4(scope.$index, scope.row.score)"></el-input>
                                     </span>
                                     <span v-else>{{ scope.row.score }}</span>
                                 </template>
@@ -270,10 +351,10 @@
                             <el-table-column label="考核得分">
                                 <template slot-scope="scope">
                                     <span
-                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核'&&fromList.assessmentTemplate == '1')">
-                                        <el-input size="mini" type="number" :precision="0" v-model="scope.row.score"
-                                            oninput="value=value.replace(/[^\d]/g,'')"
-                                            @blur="onInputFocus1(scope.$index, scope.row.score)"></el-input>
+                                        v-if="dialogTitle == '新建工单' || fromList.taskName == '起草' || (fromList.taskName == '发起考核' && fromList.assessmentTemplate == '1')">
+                                        <el-input size="mini" type="text" :precision="0" v-model="scope.row.score"
+                                            @input="numDxsCheck(fromList.content1.tableData5[scope.$index], 1, 'score')"
+                                            @blur="onInputFocus5(scope.$index, scope.row.score)"></el-input>
                                     </span>
                                     <span v-else>{{ scope.row.score }}</span>
                                 </template>
@@ -282,9 +363,9 @@
                     </el-form-item>
                 </div>
                 <div class="flex-load" style="display: flex; flex-direction: column">
-                    <el-form-item label="附件:"  prop="accessoryList">
-                        <my-upload v-if="fromList.taskName == '初评'" @uploadBack="uploadBack" @delloadBack="delloadBack" @clickDownload="download"
-                            :fileInfo="fileInfo" :fileList="fromList.accessoryList"
+                    <el-form-item label="附件:" prop="accessoryList">
+                        <my-upload v-if="fromList.taskName == '初评'" @uploadBack="uploadBack" @delloadBack="delloadBack"
+                            @clickDownload="download" :fileInfo="fileInfo" :fileList="fromList.accessoryList"
                             style="width: 30% !important"></my-upload>
                         <div v-if="fromList.taskName != '初评'">
                             <div v-for="(item, index) in fromList.accessoryList" :key="index">
@@ -323,6 +404,7 @@ import Seach from "../../../components/el-search";
 import myUpload from "../../../components/workflowUpload";
 import Workflow from "../../../components/workflowBase";
 import WorkflowEntrance from "../../../components/workflowEntrance";
+import getConfig from '../../../config/dev.js'
 import {
     getTodoBase,
     getDoneBase,
@@ -351,7 +433,7 @@ export default {
                     { required: true, message: "请添加考核主题", trigger: "blur" },
                 ],
                 assessmentTemplate: [
-                    { required: true, message: "请选择考核模板", trigger: "blur" },
+                    { required: true, message: "请选择考核模板", trigger: "change" },
                 ],
             },
             form: {
@@ -362,7 +444,7 @@ export default {
                 type: "bt1n",
                 typename: "上传文件",
                 // limit: 5,
-                url: "/market/waf/upload",
+                url: "/market/waf/uploadByMinio",
                 fileList: [],
             },
             list: {},
@@ -385,9 +467,10 @@ export default {
                 processDefinitionKey: "hlw_dskh_process",//流程key
             },
             requestForm: {
-                fresourceId: "87753452-c2f3-11ed-9c8b-d6cd97160e00", // 本地环境
+                // fresourceId: "87753452-c2f3-11ed-9c8b-d6cd97160e00", // 本地环境
                 // fresourceId: "canvas", // 生产环境
-                // fresourceId: "4edefb21-b24f-11ed-be6b-00505687dcd3", //测试91环境
+                // fresourceId: "d4092f5e-c49b-11ed-a8d3-00505687dcd3", //测试91环境
+                fresourceId: getConfig().internetAssessment,
                 processDefinitionKey: "hlw_dskh_process",
             },
             dialogStatus: false, //dialog显示
@@ -678,23 +761,33 @@ export default {
     methods: {
         selectChanged(val) {
             console.log(val);
+            this.fromList.assessmentTemplate = '1'
             this.assessmentTemplateoption.map((item) => {
                 if (val == item.code) {
                     console.log(JSON.parse(item.value));
-
                     if (val == '1') {
                         this.fromList.content1 = JSON.parse(item.value)
+                        this.fromList.content1.tableData1.map((item) => {
+                            item.show = false;
+                        })
+                        this.fromList.content1.tableData2.map((item) => {
+                            item.show = false;
+                        })
                     } else {
-                        let a=JSON.parse(item.value)
-                        this.fromList.content1.tableData1 = a.tableData1
-                        this.fromList.content1.tableData3 = a.tableData2
-                        this.fromList.content1.tableData5 = a.tableData3
-                        this.fromList.content1.tableCol3 = a.tableCol2
-                        this.fromList.content1.tableCol5 = a.tableCol3
+                        let a = JSON.parse(item.value)
+                        this.$set(this.fromList.content1, 'tableData1', a.tableData1)
+                        this.$set(this.fromList.content1, 'tableData3', a.tableData2)
+                        this.$set(this.fromList.content1, 'tableData5', a.tableData3)
+                        this.$set(this.fromList.content1, 'tableCol3', a.tableCol2)
+                        this.$set(this.fromList.content1, 'tableCol5', a.tableCol3)
+                        this.fromList.content1.tableData1.map((item) => {
+                            item.show = false;
+                        })
                     }
                 }
             })
-            this.fromList.currentScore = 0
+            this.fromList.assessmentTemplate = val
+            this.fromList.currentScore = 0.0
             // if (val == '1') {        a
             // this.fromList.content1.tableData1 = [
             //     { time: '2020-08-10', grade: 'niuniu', name: '小明', subjects: '语文', score: 0, },
@@ -746,7 +839,8 @@ export default {
                     proposerNo: JSON.parse(window.sessionStorage.getItem('userInfo')).loginNoStr,
                     proposerTime: getNowdata({ a: '-', b: ' ', c: ':' }),
                     currentScore: 0,
-                    content1: {}
+                    content1: {},
+                    assessmentTemplate: '',
                 }
                 let accessoryList = [];
                 accessoryList = v;
@@ -804,7 +898,7 @@ export default {
                 fileName: e.fileName,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
@@ -843,7 +937,7 @@ export default {
                 fileName: e.name,
             };
             this.$http({
-                url: "/market/waf/downFile",
+                url: "/market/waf/downFileByMinio",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
@@ -979,8 +1073,16 @@ export default {
                     })
                 }
                 this.fromList.content1 = JSON.parse(this.fromList.content);
+                this.fromList.content1.tableData1.map((item) => {
+                    item.show = false;
+                })
+                if (this.fromList.content1.tableData2) {
+                    this.fromList.content1.tableData2.map((item) => {
+                        item.show = false;
+                    })
+                }
                 this.fromList.resourceId = e.resourceId
-                console.log(  this.fromList);
+                console.log(this.fromList);
             });
         },
         async clickForm(e) {
@@ -1333,36 +1435,38 @@ export default {
             });
         },
         onInputFocus(i, v) {
-            let a = 0
+            let a = 0.00
+            console.log(a);
             if (this.fromList.assessmentTemplate == '1') {
                 this.fromList.content1.tableData1.map((item, index) => {
-                    a += parseInt(item.score)
+                    a += parseFloat(item.score)
                 })
                 this.fromList.content1.tableData2.map((item, index) => {
-                    a += parseInt(item.score)
+                    a += parseFloat(item.score)
                 })
                 a = a / 2
                 this.fromList.content1.tableData3.map((item, index) => {
-                    a += parseInt(item.score)
+                    a += parseFloat(item.score)
                 })
                 this.fromList.content1.tableData4.map((item, index) => {
-                    a += parseInt(item.score)
+                    a += parseFloat(item.score)
                 })
                 this.fromList.content1.tableData5.map((item, index) => {
-                    a -= parseInt(item.score)
+                    a -= parseFloat(item.score)
                 })
             } else {
                 this.fromList.content1.tableData1.map((item, index) => {
-                    a += parseInt(item.score)
+                    a += parseFloat(item.score)
                 })
                 this.fromList.content1.tableData3.map((item, index) => {
-                    a += parseInt(item.score)
+                    a += parseFloat(item.score)
                 })
                 this.fromList.content1.tableData5.map((item, index) => {
-                    a -= parseInt(item.score)
+                    a -= parseFloat(item.score)
                 })
             }
-            this.$set(this.fromList, 'currentScore', a)
+            console.log(a.toFixed(2));
+            this.$set(this.fromList, 'currentScore', a.toFixed(2))
         },
         onInputFocus1(i, v) {
             if (v == '') {
@@ -1394,7 +1498,7 @@ export default {
             }
             let a = 0
             this.fromList.content1.tableData3.map((item, index) => {
-                a += parseInt(item.score)
+                a += parseFloat(item.score)
             })
             if (a > 5) {
                 this.$message({
@@ -1419,7 +1523,7 @@ export default {
             }
             let a = 0
             this.fromList.content1.tableData4.map((item, index) => {
-                a += parseInt(item.score)
+                a += parseFloat(item.score)
             })
             if (a > 5) {
                 this.$message({
@@ -1444,7 +1548,7 @@ export default {
             }
             let a = 0
             this.fromList.content1.tableData5.map((item, index) => {
-                a += parseInt(item.score)
+                a += parseFloat(item.score)
             })
             if (a > 100) {
                 this.$message({
@@ -1459,6 +1563,12 @@ export default {
             }
             this.onInputFocus()
         },
+        editX(row, index) {
+            console.log(this.fromList.content1.tableData1);
+            row.show = row.show ? false : true
+            console.log(row);
+            this.$set(this.fromList.content1.tableData1, index, row)
+        },
         editv(row, index) {
             row.show = row.show ? false : true
             this.$set(this.fromList.content1.tableData1, index, row)
@@ -1468,20 +1578,79 @@ export default {
             this.$set(this.fromList.content1.tableData2, index, row)
         },
         delectv(index, row) {
-            this.fromList.content1.tableData1.splice(index, 1);
+            this.$confirm("即将删除数据, 是否删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.fromList.content1.tableData1.splice(index, 1);
+                })
+                .catch(() => { });
         },
         addNewHost1() {
             this.fromList.content1.tableData1.push({
+                item: '',
+                detailed: '',
+                content: '',
+                principle: '',
+                deductMarks: '',
+                require: '',
                 show: true,
                 score: 0
             })
         },
         addNewHost2() {
             this.fromList.content1.tableData2.push({
+                item: '',
+                detailed: '',
+                content: '',
+                principle: '',
+                deductMarks: '',
+                require: '',
                 show: true,
                 score: 0
             })
         },
+        numDxsCheck(form, ws, key) {
+            // console.log(form);
+            // console.log(key);
+            if (key === undefined) {
+                key = "cost";
+            }
+            form[key] = form[key] + "";
+
+            //先把非数字的都替换掉,除了数字和.
+            form[key] = form[key].replace(/[^\d.]/g, "");
+            //必须保证第一个为数字而不是.
+            form[key] = form[key].replace(/^\./g, "");
+            //保证只有出现一个.而没有多个.
+            form[key] = form[key].replace(/\.{2,}/g, ".");
+            //保证.只出现一次,而不能出现两次以上
+            form[key] = form[key].replace(".", "$#$").replace(/\./g, "").replace("$#$", ".");
+
+            //只能输入4个小数
+            // let c = null;
+            let c = /^(\-)*(\d+)\.(\d{1}).*$/;
+            // switch (ws) {
+            //     case 1:
+            //         c = /^(\-)*(\d+)\.(\d).*$/;
+            //     case 2:
+            //         c = /^(\-)*(\d+)\.(\d\d).*$/;
+            //         break;
+            //     case 3:
+            //         c = /^(\-)*(\d+)\.(\d\d\d).*$/;
+            //         break;
+            //     case 4:
+            //         c = /^(\-)*(\d+)\.(\d\d\d\d).*$/;
+            //         break;
+            //     default:
+            //         c = /^(\-)*(\d+)\.(\d\d).*$/;
+            // }
+            //只能输入两个小数
+            form[key] = form[key].replace(c, '$1$2.$3');
+            // console.log(form[key]);
+        }
     },
 
 }