1

package-lock.json

@@ -15,6 +15,7 @@
         "nprogress": "^0.2.0",
         "pinia": "^2.3.1",
         "vue": "^3.5.13",
+        "vue-draggable-plus": "^0.6.0",
         "vue-echarts": "^7.0.3",
         "vue-router": "^4.5.0"
       },
@@ -1794,6 +1795,12 @@
         "@types/lodash": "*"
       }
     },
+    "node_modules/@types/sortablejs": {
+      "version": "1.15.8",
+      "resolved": "https://registry.npmmirror.com/@types/sortablejs/-/sortablejs-1.15.8.tgz",
+      "integrity": "sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg==",
+      "license": "MIT"
+    },
     "node_modules/@types/web-bluetooth": {
       "version": "0.0.16",
       "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz",
@@ -5590,6 +5597,23 @@
         }
       }
     },
+    "node_modules/vue-draggable-plus": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmmirror.com/vue-draggable-plus/-/vue-draggable-plus-0.6.0.tgz",
+      "integrity": "sha512-G5TSfHrt9tX9EjdG49InoFJbt2NYk0h3kgjgKxkFWr3ulIUays0oFObr5KZ8qzD4+QnhtALiRwIqY6qul4egqw==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/sortablejs": "^1.15.8"
+      },
+      "peerDependencies": {
+        "@types/sortablejs": "^1.15.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/vue-echarts": {
       "version": "7.0.3",
       "resolved": "https://registry.npmmirror.com/vue-echarts/-/vue-echarts-7.0.3.tgz",

package.json

@@ -18,6 +18,7 @@
     "nprogress": "^0.2.0",
     "pinia": "^2.3.1",
     "vue": "^3.5.13",
+    "vue-draggable-plus": "^0.6.0",
     "vue-echarts": "^7.0.3",
     "vue-router": "^4.5.0"
   },

src/views/BusinessManage/HandleDialog.vue

@@ -0,0 +1,97 @@
+<script setup>
+import RPC from '@/utils/rpc';
+const props = defineProps({
+  type: {
+    type: String,
+    required: true,
+  },
+  row: [Object],
+})
+import { VueDraggable } from 'vue-draggable-plus'
+const list = ref([
+  {
+    name: 'Joao',
+    id: 1
+  },
+  {
+    name: 'Jean',
+    id: 2
+  },
+  {
+    name: 'Johanna',
+    id: 3
+  },
+  {
+    name: 'Juan',
+    id: 4
+  }
+])
+
+const emit = defineEmits(['closed', 'onSuccess'])
+
+const dialogVisible = ref(false)
+
+const isAdd = computed(() => props.type === 'add')
+
+onMounted(() => {
+  dialogVisible.value = true
+})
+
+const formRef = ref(null)
+const formField = ref({
+  color_component: []
+})
+const formRules = reactive({
+
+})
+
+const loading = ref(false)
+
+function closed() {
+  emit('closed')
+}
+
+const submitForm = () => {
+
+}
+
+const detailData = ref([])
+if (!isAdd.value) {
+  // formField.value = props.row
+}
+
+
+const add = () => {
+  formField.value.color_component.push({ num: calcId(formField.value.color_component), color_paste_id: '', remark: '', ratio: 0.01 })
+}
+
+const handleDelete = row => {
+  formField.value.color_component = formField.value.color_component.filter(item => item.num !== row.num)
+}
+
+</script>
+
+<template>
+  <el-dialog align-center :title="isAdd ? '新增' : '修改'" width="774px" v-model="dialogVisible" @closed="closed" :close-on-click-modal="false">
+    <el-form ref="formRef" label-position="right" label-suffix=":" :model="formField" :rules="formRules" v-loading="loading">
+         <VueDraggable ref="el" v-model="list">
+      <div v-for="item in list" :key="item.id">
+        {{ item.name }}
+      </div>
+    </VueDraggable>
+    </el-form>
+
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="closed">
+          取 消
+        </el-button>
+        <el-button type="primary" :loading="loading" @click="submitForm">
+          确 定
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped></style>

src/views/BusinessManage/index.vue

@@ -45,6 +45,8 @@
         </div>
 
         <pagination v-show="total > 0" :total="total" v-model:limit="queryParams.limit" v-model:page="queryParams.page" @pagination="getList" />
+
+        <HandleDialog v-if="isShowDialog" :type="rowType" :colorPasteList="colorPasteList" :row="currentRow" @closed="isShowDialog = false" @on-success="getList" />
     </div>
 </template>
 
@@ -52,6 +54,7 @@
 import { useTableRPC } from '@/utils/hook';
 import dayjs from 'dayjs';
 import RPC from '@/utils/rpc';
+import HandleDialog from './HandleDialog.vue'
 
 const rowType = ref('')
 const currentRow = ref(null)
@@ -70,9 +73,9 @@ const edit = (row) => {
 const { loading, tableData, tableRef, searchFormRef, total, queryParams, getList, handleQuery, resetQuery, handleDelete, isShowDialog, maxHeight, tableContainerEl } = useTableRPC({
     queryParams: {
     },
-    remoteDataFn: '/underpainting/list',
+    remoteDataFn: '/store/list',
     deleteConfig: {
-        remote: '/underpainting/delete',
+        remote: '/store/delete',
         key: 'id',
         message(row) {
             return `确认删除 “${row.underpainting_name}”`

vite.config.js

@@ -59,15 +59,7 @@ export default defineConfig({
     proxy: {
       // https://cn.vitejs.dev/config/#server-proxy
       '/jsonrpc': {
-        target: 'http://10.21.77.100:5000',
+        target: 'https://lift-dev.ruixininfo.com/',
-        changeOrigin: true,
-      },
-      '/dataset': {
-        target: 'http://10.21.77.100:5000',
-        changeOrigin: true,
-      },
-      '/formulaCalculation': {
-        target: 'http://10.21.77.100:5000',
         changeOrigin: true,
       },
     },