修改页面样式

src/main.js

@@ -41,7 +41,6 @@ Vue.use(Viewer, {
 })
 Vue.use(base)
 import PuzzleVerification from 'vue-puzzle-verification'
-import { registerListenerChangeEvent } from "./utils/auth";
 Vue.use(PuzzleVerification)
 
 
@@ -59,7 +58,6 @@ window.vm = new Vue({
 }).$mount("#app");
 
 
-registerListenerChangeEvent()
 
 if (getToken() === null || getToken() === undefined || getToken() === '') {
   removeToken()

src/views/demand/components/DashboardMode.vue

@@ -1,58 +1,118 @@
 <template>
   <div class="status-warpper" v-loading="loading">
-    <div :class="`status-item ${item.value === '6' ? 'last' : ''}`"  v-for="item in statusOptions" :key="item.value">
+    <div
+      :class="`status-item ${item.value === '6' ? 'last' : ''}`"
+      v-for="item in statusOptions"
+      :key="item.value"
+    >
       <div class="status-item__header">
-        <p style="font-weight:700">
-          {{item.label}} · {{tableData[item.value] ? tableData[item.value].length : 0}}
+        <p style="color:#303133;font-weight: 700;height:20px;line-height: 20px;font-size: 15px">
+          {{ item.label }} ·
+          {{ tableData[item.value] ? tableData[item.value].length : 0 }}
         </p>
         <i v-if="item.value !== '6'" class="el-icon-arrow-left"></i>
       </div>
       <template v-if="level === '1'">
-        <draggable v-model="tableData[item.value]" tag="div" class="board-column-content" v-bind="dragOptions" group="corse" @change="hadnleChange" @start="drag = true"  @end="handleEnd">
+        <draggable
+          v-model="tableData[item.value]"
+          tag="div"
+          class="board-column-content"
+          v-bind="dragOptions"
+          group="corse"
+          @change="hadnleChange"
+          @start="drag = true"
+          @end="handleEnd"
+        >
           <transition-group type="transition" :name="!drag ? 'flip-list' : null">
-            <div class="drag-item" v-for="(item,index) in tableData[item.value]" :key="index" @click="getRouter('detail', item.id)">
+            <div
+              class="drag-item"
+              v-for="(item, index) in tableData[item.value]"
+              :key="index"
+              @click="getRouter('detail', item.id)"
+            >
               <div class="drag-item__header">
                 <div class="tag">
-                  {{typeOptions[item.type].textLabel}}
+                  {{ typeOptions[item.type].textLabel }}
                 </div>
-                {{item.bugNo}}
+                <div class="bugNo">
+                  {{ item.bugNo }}
+                </div>
+              </div>
+
+              <div
+                style="
+                  font-size: 13px;
+                  text-align: justify;
+                  line-height: 18px;
+                  margin: 8px 0px;
+                  color: #000;
+                "
+              >
+                {{ item.title }}
               </div>
-            
-              <h3 style="font-size:14px;font-weight:700;margin:5px 0px;color:#000">{{item.title}}</h3>
 
               <div class="drag-item__footer">
-              <el-tooltip :content="`优先级 : ${levelOptions.find(({value}) => value === item.level).label}`">
-                 <p :style="`color:${levelOptions.find(({value}) => value === item.level).color}`">{{ levelOptions.find(({value}) => value === item.level).label}}</p>
-              </el-tooltip>
-              <!-- <p>{{item.apply_name}}</p> -->
-               <el-tooltip :content="`创建人 : ${item.apply_name}`">
-                 <p class="name">{{item.apply_name}}</p>
-               </el-tooltip>
-             </div>
+                <el-tooltip
+                  :content="`优先级 : ${
+                    levelOptions.find(({ value }) => value === item.level).label
+                  }`"
+                >
+                  <p
+                    :style="`color:${
+                      levelOptions.find(({ value }) => value === item.level).color
+                    }`"
+                  >
+                    {{ levelOptions.find(({ value }) => value === item.level).label }}
+                  </p>
+                </el-tooltip>
+                <!-- <p>{{item.apply_name}}</p> -->
+                <el-tooltip :content="`创建人 : ${item.apply_name}`">
+                  <p class="name">{{ item.apply_name }}</p>
+                </el-tooltip>
+              </div>
             </div>
           </transition-group>
         </draggable>
       </template>
 
       <template v-else>
-        <div class="drag-item" v-for="(item,index) in tableData[item.value]" :key="index" @click="getRouter('detail', item.id)">
+        <div
+          class="drag-item"
+          v-for="(item, index) in tableData[item.value]"
+          :key="index"
+          @click="getRouter('detail', item.id)"
+        >
           <div class="drag-item__header">
             <div class="tag">
-              {{typeOptions[item.type].textLabel}}
+              {{ typeOptions[item.type].textLabel }}
+            </div>
+            <div class="bugNo">
+              {{ item.bugNo }}
             </div>
-            {{item.bugNo}}
           </div>
-        
-          <h3 style="font-size:14px;font-weight:700;margin:5px 0px;color:#000">{{item.title}}</h3>
+
+          <h3 style="font-size: 14px; font-weight: 700; margin: 5px 0px; color: #000">
+            {{ item.title }}
+          </h3>
           <div class="drag-item__footer">
-          <el-tooltip :content="`优先级 : ${levelOptions.find(({value}) => value === item.level).label}`">
-             <p :style="`color:${levelOptions.find(({value}) => value === item.level).color}`">{{ levelOptions.find(({value}) => value === item.level).label}}</p>
-          </el-tooltip>
-          <!-- <p>{{item.apply_name}}</p> -->
-           <el-tooltip :content="`创建人 : ${item.apply_name}`">
-           <p class="name">{{item.apply_name}}</p>
-           </el-tooltip>
-         </div>
+            <el-tooltip
+              :content="`优先级 : ${
+                levelOptions.find(({ value }) => value === item.level).label
+              }`"
+            >
+              <p
+                :style="`color:${
+                  levelOptions.find(({ value }) => value === item.level).color
+                }`"
+              >
+                {{ levelOptions.find(({ value }) => value === item.level).label }}
+              </p>
+            </el-tooltip>
+            <!-- <p>{{item.apply_name}}</p> -->
+            <el-tooltip :content="`创建人 : ${item.apply_name}`">
+              <p class="name">{{ item.apply_name }}</p>
+            </el-tooltip>
+          </div>
         </div>
       </template>
     </div>
@@ -64,7 +124,7 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
 import addEdit from "@/components/addEdit";
-import draggable from "vuedraggable"
+import draggable from "vuedraggable";
 
 import {
   company_type,
@@ -81,7 +141,7 @@ export default {
   mixins: [mixinPage, resToken],
   components: {
     addEdit,
-    draggable
+    draggable,
   },
   computed: {
     //组件SIZE设置
@@ -89,18 +149,18 @@ export default {
     powers() {
       return this.$store.getters.btnList;
     },
-     dragOptions() {
+    dragOptions() {
       return {
         animation: 200,
         group: "description",
         disabled: false,
-        ghostClass: "ghost"
+        ghostClass: "ghost",
       };
-    }
+    },
   },
   data() {
     return {
-      drag:false,
+      drag: false,
       select: "1",
       input: "",
       type: 1,
@@ -156,22 +216,22 @@ export default {
         this.$message.warning("暂未找到相关流程！");
       }
     },
-    handleEnd(evt){
-      this.drag = false
+    handleEnd(evt) {
+      this.drag = false;
     },
-    hadnleChange(evt){
-      console.log(evt)
-      const { added } = evt
-      if(!added) return
-      const { element , newIndex} = added
+    hadnleChange(evt) {
+      console.log(evt);
+      const { added } = evt;
+      if (!added) return;
+      const { element, newIndex } = added;
 
       const afterUpdateStatus = Object.keys(this.tableData).findIndex((key) => {
-        const item = this.tableData[key].find(item => item.bugNo === element.bugNo)
-        return !!item
-      })
+        const item = this.tableData[key].find((item) => item.bugNo === element.bugNo);
+        return !!item;
+      });
 
-      if(afterUpdateStatus === -1) return
-      this.onUpdateStatus(element, afterUpdateStatus, element.status, newIndex)
+      if (afterUpdateStatus === -1) return;
+      this.onUpdateStatus(element, afterUpdateStatus, element.status, newIndex);
     },
     getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
@@ -193,46 +253,60 @@ export default {
         this.$message.warning("暂未找到相关流程！");
       }
     },
-    async onUpdateStatus(updateData, afterUpdateStatus, beforeUpdateStatus,newIndex){
-      const model = JSON.parse(JSON.stringify(updateData))
-      const sourceData = JSON.parse(JSON.stringify(this.tableData))
-      model.status = String(afterUpdateStatus)
-      delete model['can']
-      delete model['company_name']
-      try{
-        const {code } = await asyncRequest.update({
-        bugNo:model.bugNo,
-        company_type:model.company_type,
-        deal_id:model.deal_id,
-        id:model.id,
-        // model_id:model.model_id,
-        model_id:Array.isArray(model.model_id) ? model.model_id : [model.model_id],
-        level:model.level,
-        noteNo:model.noteNo,
-        remark:model.remark,
-        status:model.status,
-        title:model.title,
-        type:model.type
-      })
+    async onUpdateStatus(updateData, afterUpdateStatus, beforeUpdateStatus, newIndex) {
+      const model = JSON.parse(JSON.stringify(updateData));
+      const sourceData = JSON.parse(JSON.stringify(this.tableData));
+      model.status = String(afterUpdateStatus);
+      delete model["can"];
+      delete model["company_name"];
+      try {
+        const { code } = await asyncRequest.update({
+          bugNo: model.bugNo,
+          company_type: model.company_type,
+          deal_id: model.deal_id,
+          id: model.id,
+          // model_id:model.model_id,
+          model_id: Array.isArray(model.model_id) ? model.model_id : [model.model_id],
+          level: model.level,
+          noteNo: model.noteNo,
+          remark: model.remark,
+          status: model.status,
+          title: model.title,
+          type: model.type,
+        });
 
-      switch(Number(code)){
-        case 0:
-          sourceData[afterUpdateStatus][newIndex].status = afterUpdateStatus
-          break
-        default:
-          //更新失败撤回
-          this.$message.error(`${updateData.bugNo} 状态由"${statusOptions.find(({value}) => value === String(beforeUpdateStatus)).label}"更新至"${statusOptions.find(({value}) => value === String(afterUpdateStatus)).label}"失败`)
-          sourceData[afterUpdateStatus].splice(newIndex,1)
-          sourceData[beforeUpdateStatus].push(updateData)
-          break
-      }
-      this.tableData = sourceData
-      }catch(e){
+        switch (Number(code)) {
+          case 0:
+            sourceData[afterUpdateStatus][newIndex].status = afterUpdateStatus;
+            break;
+          default:
+            //更新失败撤回
+            this.$message.error(
+              `${updateData.bugNo} 状态由"${
+                statusOptions.find(({ value }) => value === String(beforeUpdateStatus))
+                  .label
+              }"更新至"${
+                statusOptions.find(({ value }) => value === String(afterUpdateStatus))
+                  .label
+              }"失败`
+            );
+            sourceData[afterUpdateStatus].splice(newIndex, 1);
+            sourceData[beforeUpdateStatus].push(updateData);
+            break;
+        }
+        this.tableData = sourceData;
+      } catch (e) {
         //更新失败撤回
-        this.$message.error(`${updateData.bugNo} 状态由"${statusOptions.find(({value}) => value === String(beforeUpdateStatus)).label}"更新至"${statusOptions.find(({value}) => value === String(afterUpdateStatus)).label}"失败`)
-        sourceData[afterUpdateStatus].splice(newIndex,1)
-        sourceData[beforeUpdateStatus].push(updateData)
-        this.tableData = sourceData
+        this.$message.error(
+          `${updateData.bugNo} 状态由"${
+            statusOptions.find(({ value }) => value === String(beforeUpdateStatus)).label
+          }"更新至"${
+            statusOptions.find(({ value }) => value === String(afterUpdateStatus)).label
+          }"失败`
+        );
+        sourceData[afterUpdateStatus].splice(newIndex, 1);
+        sourceData[beforeUpdateStatus].push(updateData);
+        this.tableData = sourceData;
       }
     },
     // 新建/编辑/详情
@@ -244,29 +318,33 @@ export default {
     setData(dataTransfer) {
       // to avoid Firefox bug
       // Detail see : https://github.com/RubaXa/Sortable/issues/1012
-      dataTransfer.setData('Text', '')
+      dataTransfer.setData("Text", "");
     },
     // 时间
     // 刷新表格
     async searchList(parmValue) {
-      this.loading = true
+      this.loading = true;
       const { code, data, message } = await asyncRequest.list(parmValue);
       if (code === 0) {
         const { list, count } = data;
-        const map = statusOptions.reduce((prev,current) => ({
-          ...prev,
-          [String(current.value)]:[]
-        }),{})
+        const map = statusOptions.reduce(
+          (prev, current) => ({
+            ...prev,
+            [String(current.value)]: [],
+          }),
+          {}
+        );
 
         list.forEach((item) => {
-          const status = String(item.status)
-          if(!map[status]){ map[status] = [] }
-          map[status].push(item)
-        })
-
+          const status = String(item.status);
+          if (!map[status]) {
+            map[status] = [];
+          }
+          map[status].push(item);
+        });
 
-        this.tableData = map
-        this.$emit('getTotal',Number(count))
+        this.tableData = map;
+        this.$emit("getTotal", Number(count));
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
@@ -280,25 +358,26 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.status-warpper{
-  margin-top:10px;
+.status-warpper {
+  margin-top: 10px;
   display: flex;
   overflow: auto;
-  min-height:calc(100vh - 200px);
+  min-height: calc(100vh - 200px);
 
-.status-item{
-    min-width: 220px;
+  .status-item {
+    min-width: 200px;
     display: flex;
+    flex: 1;
     flex-direction: column;
-    margin-right:10px;
+    margin-right: 8px;
 
-    &.last{
+    &.last {
       margin-right: 0px;
     }
 
-    &__header{
+    &__header {
       box-sizing: border-box;
-      padding-left:5px ;
+      padding-left: 5px;
       // padding-right: 15px;
       font-size: 16px;
       display: flex;
@@ -306,31 +385,42 @@ export default {
     }
   }
 
-  .drag-item{
-    width:100%;
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  .drag-item {
+    width: 100%;
+    box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.07);
     background: #ffffff;
-    margin-top: 10px;
+    margin-top: 8px;
     border-radius: 5px;
     font-size: 12px;
     padding: 10px;
     cursor: pointer;
-      color:#aeb0b6;
+    color: #aeb0b6;
 
-    &__header{
+    &__header {
       display: flex;
       justify-content: space-between;
 
-      .tag{
-        color: #fff;
-        background: #6a81f0;
+      .tag {
+        color: #409EFF;
+        background: #ecf5ff;
         display: inline-block;
-        padding:3px;
-        border-radius: 3px;
+        // border: 1px solid #409EFF;
+        width: 32px;
+        height: 20px;
+        line-height: 19px;
+        text-align: center;
+        // padding: 2px 3px;
+        font-size: 12px;
+        border-radius: 5px;
+      }
+      .bugNo {
+        display: inline-block;
+        // width: 130px;
+        line-height: 20px;
       }
     }
 
-    &__footer{
+    &__footer {
       display: flex;
       justify-content: space-between;
 
@@ -344,21 +434,22 @@ export default {
   }
 }
 
-.board-column-content{
-    // border: 10px solid transparent;
-    height:calc(100vh - 240px);
-    max-height: calc(100vh - 240px);
-    overflow: auto;
-    display: flex;
-    justify-content: flex-start;
-    flex-direction: column;
-    align-items: center;
+.board-column-content {
+  // border: 10px solid transparent;
+  height: calc(100vh - 240px);
+  max-height: calc(100vh - 240px);
+  overflow: auto;
+  display: flex;
+  justify-content: flex-start;
+  flex-direction: column;
+  align-items: center;
 
-    span{
-      display: inline-block;
-      width:100%;
-      height:100%;
-    }
+  span {
+    display: inline-block;
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+  }
 }
 
 .flip-list-move {

src/views/demand/components/SwitchMode.vue

@@ -54,7 +54,7 @@ export default {
 
     &.active{
       background: #fff;
-      box-shadow: 0 2px 14px 0 rgba(0,0,0,.1);
+      box-shadow: 0 2px 6px 0 rgba(0,0,0,.07);
     }
   }
 }

src/views/demand/detail.vue

@@ -476,7 +476,11 @@ export default {
 .adjustDetail {
   width: 100%;
   padding: 16px;
+  position: relative;
+  height: calc(100vh - 50px);
+  min-height: calc(100vh - 50px);
   box-sizing: border-box;
+  background: #fff;
   /deep/ .notshow {
     .el-textarea__inner {
       border-color: transparent !important;

src/views/login.vue

@@ -73,7 +73,7 @@
           >登&nbsp;&nbsp;&nbsp;&nbsp;录</el-button
         >
 
-        <div style="position: relative; padding: 12px 0 0 0">
+        <!-- <div style="position: relative; padding: 12px 0 0 0">
           <div class="tips" style="float: left">
             <el-popover
               placement="top"
@@ -90,14 +90,14 @@
               <span>忘记密码</span>
             </div>
           </router-link>
-        </div>
+        </div> -->
       </el-form>
     </div>
-    <div class="beian">
+    <!-- <div class="beian">
       <span>万宇恒通</span>
       <a target="_blank" href="https://beian.miit.gov.cn/">京ICP备2020033956号-1</a>
       <span> </span>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -341,7 +341,7 @@ $light_gray: #f2f2f2;
       left: 380px;
       z-index: 3;
       max-width: 100%;
-      padding: 60px 28px 20px 28px;
+      padding: 60px 28px 60px 28px;
       margin: 0 auto;
       overflow: hidden;
       background: #fff;

src/views/pucColumns.js

@@ -9,20 +9,20 @@ const seachStatus = [
   },
   {
     value: "2",
-    label: "已解决",
+    label: "待测试",
   },
   {
     value: "3",
     label: "测试中",
   },
-  {
-    value: "4",
-    label: "已拒绝",
-  },
   {
     value: "5",
     label: "已关闭",
   },
+  {
+    value: "4",
+    label: "已拒绝",
+  },
   {
     value: "6",
     label: "延后处理",
@@ -55,20 +55,20 @@ const statusOptions = [
   },
   {
     value: "2",
-    label: "已解决",
+    label: "待测试",
   },
   {
     value: "3",
     label: "测试中",
   },
-  {
-    value: "4",
-    label: "已拒绝",
-  },
   {
     value: "5",
     label: "已关闭",
   },
+  {
+    value: "4",
+    label: "已拒绝",
+  },
   {
     value: "6",
     label: "延后处理",