Explorar el Código

验证码和项目成本拖拽和显示等问题

yuhan hace 1 año
padre
commit
360a5873a9

+ 20 - 4
src/views/module_kzks/projectCostList/ProjectCostList.vue

@@ -177,6 +177,7 @@
         @mousedown.native="mouseDownHandler"
         @mouseup.native="mouseUpHandler"
         @mousemove.native="mouseMoveHandler"
+        :rowClassName="setRowClassName"
         :rowSelection="{
           selectedRowKeys: selectedRowKeys,
           onChange: onSelectChange,
@@ -421,7 +422,7 @@ import { number } from 'echarts';
           {
             title:'型号',
             align:"center",
-            dataIndex: 'xhname'
+            dataIndex: 'xhname',
           },
           {
             title:'计划完成时间',
@@ -502,8 +503,8 @@ import { number } from 'echarts';
             title:'预估价',
             align:"center",
             dataIndex: 'estimationcoat',
-            customRender: (text) => {
-              return Number(text).toFixed(2)
+            customRender: (text, record) => {
+              return record.contractfpe ? '-' : Number(text).toFixed(2)
             },
           },
           {
@@ -772,6 +773,7 @@ import { number } from 'echarts';
         this.mouseOffset = e.clientX;
         this.handlerFirstTime = new Date().getTime()
         this.mouseFlag = true;
+        console.log(this.mouseOffset)
       },
       mouseUpHandler(e) {
         var lastTime = new Date().getTime();
@@ -785,6 +787,8 @@ import { number } from 'echarts';
       mouseMoveHandler(e) {
         // 这里面需要注意,通过ref需要那个那个包含table元素的父元素
         let v=document.getElementsByClassName("ant-table-body")[0]
+        v.style.cursor = 'move'
+        v.style['user-select'] = 'none'
         if (this.mouseFlag) {
           // 设置水平方向的元素的位置
           v.scrollLeft -= (- this.mouseOffset + (this.mouseOffset = e.clientX));
@@ -866,6 +870,12 @@ import { number } from 'echarts';
         // var key = this.$route.name+":colsettings";
         // let colSettings= Vue.ls.get(key);
       },
+      // 亏损标红
+      setRowClassName(record, index){
+        if(record.lrl < 0){
+          return 'table-kuisun-color'
+        }
+      },
       //列设置更改事件
       onColSettingsChange (checkedValues) {
         console.log(checkedValues)
@@ -960,7 +970,7 @@ import { number } from 'echarts';
             console.log(res)
             this.duibiList = res
             this.duibiclList = []
-})
+          })
           var selectTasknos = this.selectionRows.map( res => {
             return res.taskno
           })
@@ -1171,4 +1181,10 @@ import { number } from 'echarts';
 </script>
 <style scoped>
   @import '~@assets/less/common.less';
+</style>
+<style>
+  .table-kuisun-color{
+    color: red !important;
+    /* user-select: 'none'; */
+  }
 </style>

+ 10 - 8
src/views/user/LoginAccount.vue

@@ -12,7 +12,8 @@
           </a-input>
         </a-form-model-item>
 
-        <a-row :gutter="0">
+        <!-- 修改 隐藏验证码 -->
+        <!-- <a-row :gutter="0">
           <a-col :span="16">
             <a-form-model-item required prop="inputCode">
               <a-input v-model="model.inputCode" size="large" type="text" placeholder="请输入验证码">
@@ -24,7 +25,7 @@
             <img v-if="requestCodeSuccess" style="margin-top: 2px;" :src="randCodeImage" @click="handleChangeCheckCode"/>
             <img v-else style="margin-top: 2px;" src="../../assets/checkcode.png" @click="handleChangeCheckCode"/>
           </a-col>
-        </a-row>
+        </a-row> -->
       </a-form-model>
     </div>
 </template>
@@ -45,7 +46,7 @@
         model:{
           username: 'admin',
           password: '123456',
-          inputCode: ''
+          // inputCode: ''
         },
         validatorRules:{
           username: [
@@ -55,9 +56,9 @@
           password: [{
             required: true, message: '请输入密码!', validator: 'click'
           }],
-          inputCode: [{
-            required: true, message: '请输入验证码!'
-          }]
+          // inputCode: [{
+          //   required: true, message: '请输入验证码!'
+          // }]
         }
 
       }
@@ -123,12 +124,13 @@
       },
       //账号密码登录
       handleLogin(rememberMe){
-        this.validateFields([ 'username', 'password', 'inputCode' ], (err)=>{
+        // this.validateFields([ 'username', 'password', 'inputCode' ], (err)=>{
+        this.validateFields([ 'username', 'password' ], (err)=>{
           if(!err){
             let loginParams = {
               username: this.model.username,
               password: this.model.password,
-              captcha: this.model.inputCode,
+              // captcha: this.model.inputCode,
               checkKey: this.currdatetime,
               remember_me: rememberMe,
             }